@codingame/monaco-vscode-chat-service-override 24.2.0 → 25.0.0

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

@@ -1,4 +1,4 @@
 import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IModifiedFileEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IModifiedFileEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
 export declare function isTextDiffEditorForEntry(accessor: ServicesAccessor, entry: IModifiedFileEntry, editor: ICodeEditor): boolean;

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

@@ -2,8 +2,8 @@ import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buf
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable, IReader, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IEditSessionDiffStats, IEditSessionEntryDiff } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatRequestDisablement } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IEditSessionDiffStats, IEditSessionEntryDiff } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IChatRequestDisablement } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { FileOperation, IChatEditingTimelineState, IFileBaseline } from "./chatEditingOperations.js";
 /**
  * Interface for the new checkpoint-based timeline system

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

@@ -8,8 +8,8 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { INotebookEditorModelResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
-import { IEditSessionDiffStats, IEditSessionEntryDiff, IModifiedEntryTelemetryInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatRequestDisablement } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IEditSessionDiffStats, IEditSessionEntryDiff, IModifiedEntryTelemetryInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IChatRequestDisablement } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { IChatEditingCheckpointTimeline } from "./chatEditingCheckpointTimeline.js";
 import { FileOperation, IChatEditingTimelineState, IFileBaseline } from "./chatEditingOperations.js";
 /**

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

@@ -22,7 +22,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { CellUri, CellEditType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookEditorModelResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
-import { emptySessionEntryDiff } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { emptySessionEntryDiff } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
 import { FileOperationType } from './chatEditingOperations.js';
 import { ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 import { restoreSnapshot, createSnapshot } from './notebook/chatEditingModifiedNotebookSnapshot.js';
@@ -574,7 +574,7 @@ let ChatEditingCheckpointTimelineImpl = class ChatEditingCheckpointTimelineImpl
             }
             else {
                 end = checkpoints.find(c => c.requestId === stopRequestId)
-                    || findFirst(checkpoints, c => c.requestId !== startRequestId, startIndex)
+                    || findFirst(checkpoints, c => c.requestId !== startRequestId, startIndex + 1)
                     || checkpoints[checkpoints.length - 1];
             }
             return { start, end };

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

@@ -6,7 +6,7 @@ import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common
 import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
-import { IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 export interface IDocumentDiff2 extends IDocumentDiff {
     originalModel: ITextModel;

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

@@ -1,7 +1,7 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import * as chatEditorController from '../media/chatEditorController.css';
+import * as chatEditorController from './media/chatEditorController.css';
 import { createElement, getTotalWidth } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { dispose, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -31,7 +31,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { EditorsOrder, isDiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { overviewRulerModifiedForeground, minimapGutterModifiedBackground, overviewRulerAddedForeground, minimapGutterAddedBackground, overviewRulerDeletedForeground, minimapGutterDeletedBackground } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff';
-import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
 import { isTextDiffEditorForEntry } from './chatEditing.js';
 import { ActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -553,7 +553,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 original: { resource: this._entry.originalURI },
                 modified: { resource: this._entry.modifiedURI },
                 options: { selection },
-                label: ( localize(5218, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
+                label: ( localize(5129, '{0} (changes from chat)', basename(this._entry.modifiedURI)))
             });
             if (diffEditor && diffEditor.input) {
                 diffEditor.getControl()?.setSelection(selection);

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

@@ -1,7 +1,7 @@
 import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
-import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
+import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service";
 export declare class ChatEditingEditorAccessibility implements IWorkbenchContribution {
     static readonly ID = "chat.edits.accessibilty";
     private readonly _store;

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

@@ -5,7 +5,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/in
 import { AccessibilitySignal } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
+import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 

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

@@ -1,6 +1,6 @@
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
 import { Action2, IAction2Options } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
-import { IChatEditingSession, IModifiedFileEntry, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IChatEditingSession, IModifiedFileEntry, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
 declare abstract class ChatEditingEditorAction extends Action2 {
     constructor(desc: Readonly<IAction2Options>);
     run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void>;

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

@@ -16,9 +16,9 @@ import { ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/s
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { MultiDiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
 import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_FOCUSED } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ModifiedFileEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, parseChatMultiDiffUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { ModifiedFileEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, parseChatMultiDiffUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ctxReviewModeEnabled, ctxHasEditorModification, ctxIsGlobalEditingSession, ctxIsCurrentlyBeingModified, ctxCursorInChangeRange } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
 
@@ -54,8 +54,8 @@ class NavigateAction extends ChatEditingEditorAction {
                 ? 'chatEditor.action.navigateNext'
                 : 'chatEditor.action.navigatePrevious',
             title: next
-                ? ( localize2(5219, 'Go to Next Chat Edit'))
-                : ( localize2(5220, 'Go to Previous Chat Edit')),
+                ? ( localize2(5130, 'Go to Next Chat Edit'))
+                : ( localize2(5131, 'Go to Previous Chat Edit')),
             icon: next ? Codicon.arrowDown : Codicon.arrowUp,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ctxHasEditorModification)),
             keybinding: {
@@ -127,14 +127,14 @@ class KeepOrUndoAction extends ChatEditingEditorAction {
         super({
             id,
             title: _keep
-                ? ( localize2(5221, 'Keep Chat Edits'))
-                : ( localize2(5222, 'Undo Chat Edits')),
+                ? ( localize2(5132, 'Keep Chat Edits'))
+                : ( localize2(5133, 'Undo Chat Edits')),
             shortTitle: _keep
-                ? ( localize2(5223, 'Keep'))
-                : ( localize2(5224, 'Undo')),
+                ? ( localize2(5134, 'Keep'))
+                : ( localize2(5135, 'Undo')),
             tooltip: _keep
-                ? ( localize2(5225, 'Keep Chat Edits in this File'))
-                : ( localize2(5226, 'Undo Chat Edits in this File')),
+                ? ( localize2(5136, 'Keep Chat Edits in this File'))
+                : ( localize2(5137, 'Undo Chat Edits in this File')),
             precondition: ( ContextKeyExpr.and(ctxIsGlobalEditingSession, ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: _keep
                 ? Codicon.check
@@ -185,8 +185,8 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
     constructor(_accept) {
         super({
             id: _accept ? acceptHunkId : undoHunkId,
-            title: _accept ? ( localize2(5227, 'Keep this Change')) : ( localize2(5228, 'Undo this Change')),
-            shortTitle: _accept ? ( localize2(5229, 'Keep')) : ( localize2(5230, 'Undo')),
+            title: _accept ? ( localize2(5138, 'Keep this Change')) : ( localize2(5139, 'Undo this Change')),
+            shortTitle: _accept ? ( localize2(5140, 'Keep')) : ( localize2(5141, 'Undo')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             f1: true,
             keybinding: {
@@ -232,7 +232,7 @@ class ToggleDiffAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.toggleDiff',
-            title: ( localize2(5231, 'Toggle Diff Editor for Chat Edits')),
+            title: ( localize2(5142, 'Toggle Diff Editor for Chat Edits')),
             category: CHAT_CATEGORY,
             toggled: {
                 condition: ( ContextKeyExpr.or(EditorContextKeys.inDiffEditor, ( ActiveEditorContext.isEqualTo(TEXT_DIFF_EDITOR_ID)))),
@@ -264,7 +264,7 @@ class ToggleAccessibleDiffViewAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.showAccessibleDiffView',
-            title: ( localize2(5232, 'Show Accessible Diff View for Chat Edits')),
+            title: ( localize2(5143, 'Show Accessible Diff View for Chat Edits')),
             f1: true,
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             keybinding: {
@@ -282,7 +282,7 @@ class ReviewChangesAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: 'chatEditor.action.reviewChanges',
-            title: ( localize2(5233, "Review")),
+            title: ( localize2(5144, "Review")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             menu: [{
                     id: MenuId.ChatEditingEditorContent,
@@ -301,8 +301,8 @@ class AcceptAllEditsAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: AcceptAllEditsAction.ID,
-            title: ( localize2(5234, 'Keep All Chat Edits')),
-            tooltip: ( localize2(5235, 'Keep All Chat Edits in this Session')),
+            title: ( localize2(5145, 'Keep All Chat Edits')),
+            tooltip: ( localize2(5146, 'Keep All Chat Edits in this Session')),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: Codicon.checkAll,
             f1: true,
@@ -321,7 +321,7 @@ class MultiDiffAcceptDiscardAction extends Action2 {
     constructor(accept) {
         super({
             id: accept ? 'chatEditing.multidiff.acceptAllFiles' : 'chatEditing.multidiff.discardAllFiles',
-            title: accept ? ( localize(5236, 'Keep All Edits')) : ( localize(5237, 'Undo All Edits')),
+            title: accept ? ( localize(5147, 'Keep All Edits')) : ( localize(5148, 'Undo All Edits')),
             icon: accept ? Codicon.check : Codicon.discard,
             menu: {
                 when: ( ContextKeyExpr.equals('resourceScheme', CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)),
@@ -383,7 +383,7 @@ function registerChatEditorActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatEditingEditorContent, {
         command: {
             id: navigationBearingFakeActionId,
-            title: ( localize(5238, "Navigation Status")),
+            title: ( localize(5149, "Navigation Status")),
             precondition: ( ContextKeyExpr.false()),
         },
         group: 'navigate',

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

@@ -1,20 +1,20 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import * as chatEditingEditorOverlay from '../media/chatEditingEditorOverlay.css';
+import * as chatEditingEditorOverlay from './media/chatEditingEditorOverlay.css';
 import { Disposable, DisposableStore, toDisposable, MutableDisposable, DisposableMap, combinedDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { MenuWorkbenchToolBar, HiddenItemStrategy } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
+import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { createElement, append, $, addDisposableGenericMouseMoveListener } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { navigationBearingFakeActionId, AcceptAction, RejectAction } from './chatEditingEditorActions.js';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { EditorGroupView } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorGroupView';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
@@ -64,7 +64,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
             }
             const response = this._entry.read(r)?.lastModifyingResponse.read(r);
             if (!response) {
-                return { message: ( localize(5246, "Working...")) };
+                return { message: ( localize(5157, "Working...")) };
             }
             const lastPart = observableFromEventOpts({ equalsFn: equals }, response.onDidChange, () => response.response.value)
                 .read(r)
@@ -77,7 +77,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                 return { message: lastPart.content };
             }
             else {
-                return { message: ( localize(5246, "Working...")) };
+                return { message: ( localize(5157, "Working...")) };
             }
         });
         const progressNode = createElement('div');
@@ -154,10 +154,10 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                                 const { changeCount, activeIdx } = that._navigationBearings.read(r);
                                 if (changeCount > 0) {
                                     const n = activeIdx === -1 ? '1' : `${activeIdx + 1}`;
-                                    this.label.innerText = ( localize(5247, "{0} of {1}", n, changeCount));
+                                    this.label.innerText = ( localize(5158, "{0} of {1}", n, changeCount));
                                 }
                                 else {
-                                    this.label.innerText = ( localize(5248, "—"));
+                                    this.label.innerText = ( localize(5159, "—"));
                                 }
                                 this.updateTooltip();
                             }));
@@ -169,21 +169,21 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                             }
                             let result;
                             if (changeCount === 1 && entriesCount === 1) {
-                                result = ( localize(5249, "1 change in 1 file"));
+                                result = ( localize(5160, "1 change in 1 file"));
                             }
                             else if (changeCount === 1) {
-                                result = ( localize(5250, "1 change in {0} files", entriesCount));
+                                result = ( localize(5161, "1 change in {0} files", entriesCount));
                             }
                             else if (entriesCount === 1) {
-                                result = ( localize(5251, "{0} changes in 1 file", changeCount));
+                                result = ( localize(5162, "{0} changes in 1 file", changeCount));
                             }
                             else {
-                                result = ( localize(5252, "{0} changes in {1} files", changeCount, entriesCount));
+                                result = ( localize(5163, "{0} changes in {1} files", changeCount, entriesCount));
                             }
                             if (!that._isBusy.get()) {
                                 return result;
                             }
-                            return localize(5253, "{0} - Working...", result);
+                            return localize(5164, "{0} - Working...", result);
                         }
                     });
                 }
@@ -232,7 +232,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                             if (!kb) {
                                 return value;
                             }
-                            return localize(5254, "{0} ({1})", value, kb.getLabel());
+                            return localize(5165, "{0} ({1})", value, kb.getLabel());
                         }
                     });
                 }

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

@@ -20,9 +20,9 @@ import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/
 import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service";
 import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
-import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry } 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";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { AbstractChatEditingModifiedFileEntry } from "./chatEditingModifiedFileEntry.js";
 interface IMultiDiffEntryDelegate {
     collapse: (transaction: ITransaction | undefined) => void;

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

@@ -24,8 +24,8 @@ import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/
 import { stringToSnapshot, isTextFileEditorModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles';
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
-import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ChatEditingCodeEditorIntegration } from './chatEditingCodeEditorIntegration.js';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingTextModelChangeService } from './chatEditingTextModelChangeService.js';
@@ -103,7 +103,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
             if (inProgress) {
                 const res = this._lastModifyingResponseObs.read(r);
                 const req = res && res.session.getRequests().find(value => value.id === res.requestId);
-                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(5255, "Chat Edits")));
+                resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || ( localize(5166, "Chat Edits")));
             }
             else {
                 resourceFilter.clear();
@@ -154,7 +154,7 @@ let ChatEditingModifiedDocumentEntry = class ChatEditingModifiedDocumentEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(5256, "Chat Edit: '{0}'", request.message.text)) : ( localize(5257, "Chat Edit"));
+        const label = request?.message.text ? ( localize(5167, "Chat Edit: '{0}'", request.message.text)) : ( localize(5168, "Chat Edit"));
         return ( new SingleModelEditStackElement(label, 'chat.edit', this.modifiedModel, null));
     }
     async acceptAgentEdits(resource, textEdits, isLastEdits, responseModel) {

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

@@ -13,10 +13,10 @@ import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/co
 import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
 import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
-import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry, ModifiedFileEntryState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { ChatUserAction } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry, ModifiedFileEntryState } 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";
+import { ChatUserAction } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 declare class AutoAcceptControl {
     readonly total: number;
     readonly remaining: number;

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

@@ -26,8 +26,8 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/sear
 import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
 import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
-import { ModifiedFileEntryState, ChatEditKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { ModifiedFileEntryState, ChatEditKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -42,7 +42,7 @@ class AutoAcceptControl {
         this.cancel = cancel;
     }
 }
-const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(5258, "Color of pending edit regions in the minimap")));
+const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(5169, "Color of pending edit regions in the minimap")));
 let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFileEntry extends Disposable {
     static { AbstractChatEditingModifiedFileEntry_1 = this; }
     static { this.scheme = 'modified-file-entry'; }

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

@@ -18,9 +18,9 @@ import { ICellEditOperation, IResolvedNotebookEditorModel, NotebookTextModelChan
 import { INotebookEditorModelResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service";
 import { INotebookLoggingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service";
 import { INotebookEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/services/notebookWorkerService.service";
-import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntryEditorIntegration, ISnapshotEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntryEditorIntegration, ISnapshotEntry } 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";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { AbstractChatEditingModifiedFileEntry } from "./chatEditingModifiedFileEntry.js";
 import { ChatEditingNotebookCellEntry } from "./notebook/chatEditingNotebookCellEntry.js";
 import { ICellDiffInfo } from "./notebook/notebookCellChanges.js";

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

@@ -34,8 +34,8 @@ import { INotebookEditorModelResolverService } from '@codingame/monaco-vscode-ap
 import { INotebookLoggingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { INotebookEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/services/notebookWorkerService.service';
-import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { getNotebookSnapshotFileURI, restoreSnapshot, createSnapshot, deserializeSnapshot, SnapshotComparer } from './notebook/chatEditingModifiedNotebookSnapshot.js';
 import { ChatEditingNewNotebookContentEdits } from './notebook/chatEditingNewNotebookContentEdits.js';
@@ -396,7 +396,7 @@ let ChatEditingModifiedNotebookEntry = class ChatEditingModifiedNotebookEntry ex
     }
     _createUndoRedoElement(response) {
         const request = response.session.getRequests().find(req => req.id === response.requestId);
-        const label = request?.message.text ? ( localize(5259, "Chat Edit: '{0}'", request.message.text)) : ( localize(5260, "Chat Edit"));
+        const label = request?.message.text ? ( localize(5170, "Chat Edit: '{0}'", request.message.text)) : ( localize(5171, "Chat Edit"));
         const transientOptions = this.transientOptions;
         const outputSizeLimit = this.configurationService.getValue(NotebookSetting.outputBackupSizeLimit) * 1024;
         let initial = createSnapshot(this.modifiedModel, transientOptions, outputSizeLimit);

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

@@ -1,7 +1,7 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
-import { IModifiedEntryTelemetryInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IModifiedEntryTelemetryInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
 export declare enum FileOperationType {
     Create = "create",
     Delete = "delete",

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

@@ -1,6 +1,6 @@
 
 import { StringSHA1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
-import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 
 var FileOperationType;
 (function (FileOperationType) {

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

@@ -17,10 +17,10 @@ import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbe
 import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
 import { IMultiDiffSourceResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
-import { IChatEditingSession, IChatRelatedFile, IChatRelatedFilesProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
-import { ChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IChatEditingSession, IChatRelatedFile, IChatRelatedFilesProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service";
+import { ChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 export declare class ChatEditingService extends Disposable implements IChatEditingService {
     private readonly _instantiationService;
     private readonly _chatService;

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

@@ -33,10 +33,10 @@ import { MultiDiffEditorItem } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { IMultiDiffSourceResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service';
 import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
-import { chatEditingAgentSupportsReadonlyReferencesContextKey, ChatEditingSessionState, ModifiedFileEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, parseChatMultiDiffUri, chatEditingResourceContextKey, inChatEditingSessionContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { isCellTextEditOperationArray } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { chatEditingAgentSupportsReadonlyReferencesContextKey, ChatEditingSessionState, ModifiedFileEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, parseChatMultiDiffUri, chatEditingResourceContextKey, inChatEditingSessionContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { isCellTextEditOperationArray } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingSession } from './chatEditingSession.js';
 import { ChatEditingTextModelContentProvider, ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
@@ -67,7 +67,9 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         this._register(textModelService.registerTextModelContentProvider(Schemas.chatEditingSnapshotScheme, _instantiationService.createInstance(ChatEditingSnapshotTextModelContentProvider, this)));
         this._register(this._chatService.onDidDisposeSession((e) => {
             if (e.reason === 'cleared') {
-                this.getEditingSession(e.sessionResource)?.stop();
+                for (const resource of e.sessionResource) {
+                    this.getEditingSession(resource)?.stop();
+                }
             }
         }));
         const readonlyEnabledContextKey = chatEditingAgentSupportsReadonlyReferencesContextKey.bindTo(contextKeyService);
@@ -97,7 +99,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             }
             e.join(storageTask, {
                 id: 'join.chatEditingSession',
-                label: ( localize(5261, "Saving chat edits history"))
+                label: ( localize(5172, "Saving chat edits history"))
             });
         }));
     }
@@ -323,7 +325,7 @@ class ChatDecorationsProvider extends Disposable {
     constructor(_sessions) {
         super();
         this._sessions = _sessions;
-        this.label = ( localize(5262, "Chat Editing"));
+        this.label = ( localize(5173, "Chat Editing"));
         this._currentEntries = derived(this, (r) => {
             const sessions = this._sessions.read(r);
             if (!sessions) {
@@ -362,7 +364,7 @@ class ChatDecorationsProvider extends Disposable {
             return {
                 weight: 1000,
                 letter: Codicon.diffModified,
-                tooltip: ( localize(5263, "Pending changes from chat")),
+                tooltip: ( localize(5174, "Pending changes from chat")),
                 bubble: true
             };
         }

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

@@ -14,9 +14,9 @@ import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
-import { ChatEditingSessionState, IChatEditingSession, IEditSessionEntryDiff, IModifiedFileEntry, IStreamingEdits } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { ChatEditingSessionState, IChatEditingSession, IEditSessionEntryDiff, IModifiedFileEntry, IStreamingEdits } 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";
+import { IChatProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { AbstractChatEditingModifiedFileEntry } from "./chatEditingModifiedFileEntry.js";
 export declare class ChatEditingSession extends Disposable implements IChatEditingSession {
     readonly chatSessionResource: URI;
@@ -52,7 +52,7 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     get state(): IObservable<ChatEditingSessionState>;
     readonly canUndo: IObservable<boolean>;
     readonly canRedo: IObservable<boolean>;
-    get requestDisablement(): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel").IChatRequestDisablement[]>;
+    get requestDisablement(): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel").IChatRequestDisablement[]>;
     private readonly _onDidDispose;
     get onDidDispose(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     constructor(chatSessionResource: URI, isGlobalEditingSession: boolean, _lookupExternalEntry: (uri: URI) => AbstractChatEditingModifiedFileEntry | undefined, transferFrom: IChatEditingSession | undefined, _instantiationService: IInstantiationService, _modelService: IModelService, _languageService: ILanguageService, _textModelService: ITextModelService, _bulkEditService: IBulkEditService, _editorGroupsService: IEditorGroupsService, _editorService: IEditorService, _notebookService: INotebookService, _accessibilitySignalService: IAccessibilitySignalService, _logService: ILogService, configurationService: IConfigurationService);
@@ -66,7 +66,7 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     getEntryDiffBetweenStops(uri: URI, requestId: string | undefined, stopId: string | undefined): IObservable<IEditSessionEntryDiff | undefined> | undefined;
     getEntryDiffBetweenRequests(uri: URI, startRequestId: string, stopRequestId: string): IObservable<IEditSessionEntryDiff | undefined>;
     getDiffsForFilesInSession(): IObservable<readonly IEditSessionEntryDiff[]>;
-    getDiffForSession(): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService").IEditSessionDiffStats>;
+    getDiffForSession(): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService").IEditSessionDiffStats>;
     getDiffsForFilesInRequest(requestId: string): IObservable<readonly IEditSessionEntryDiff[]>;
     hasEditsInRequest(requestId: string, reader?: IReader): boolean;
     createSnapshot(requestId: string, undoStop: string | undefined): void;