@codingame/monaco-vscode-chat-service-override 19.1.3 → 20.0.0

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

@@ -3,6 +3,7 @@ import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/
 import { IObservable } 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 { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.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";
@@ -13,12 +14,12 @@ import { IDecorationsService } from "@codingame/monaco-vscode-api/vscode/vs/work
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
-import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
+import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/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-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 export declare class ChatEditingService extends Disposable implements IChatEditingService {
     private readonly _instantiationService;
@@ -27,12 +28,13 @@ export declare class ChatEditingService extends Disposable implements IChatEditi
     private readonly _fileService;
     private readonly lifecycleService;
     private readonly notebookService;
+    private readonly _configurationService;
     _serviceBrand: undefined;
     private readonly _sessionsObs;
     readonly editingSessionsObs: IObservable<readonly IChatEditingSession[]>;
     private _restoringEditingSession;
     private _chatRelatedFilesProviders;
-    constructor(_instantiationService: IInstantiationService, multiDiffSourceResolverService: IMultiDiffSourceResolverService, textModelService: ITextModelService, contextKeyService: IContextKeyService, _chatService: IChatService, _editorService: IEditorService, decorationsService: IDecorationsService, _fileService: IFileService, lifecycleService: ILifecycleService, storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, productService: IProductService, notebookService: INotebookService);
+    constructor(_instantiationService: IInstantiationService, multiDiffSourceResolverService: IMultiDiffSourceResolverService, textModelService: ITextModelService, contextKeyService: IContextKeyService, _chatService: IChatService, _editorService: IEditorService, decorationsService: IDecorationsService, _fileService: IFileService, lifecycleService: ILifecycleService, storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, productService: IProductService, notebookService: INotebookService, _configurationService: IConfigurationService);
     dispose(): void;
     startOrContinueGlobalEditingSession(chatModel: ChatModel, waitForRestore?: boolean): Promise<IChatEditingSession>;
     private _lookupEntry;

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

@@ -16,6 +16,7 @@ import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/t
 import { TextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.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';
@@ -26,16 +27,16 @@ import { IDecorationsService } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
-import { MultiDiffEditorItem } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
+import { MultiDiffEditorItem } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
 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 { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { chatEditingSnapshotScheme, 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 { isCellTextEditOperation } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { isCellTextEditOperation } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ChatEditorInput } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingSession } from './chatEditingSession.js';
 import { ChatEditingTextModelContentProvider, ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
@@ -45,7 +46,7 @@ import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/
 import { ValueWithChangeEventFromObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/valueWithChangeEvent';
 
 let ChatEditingService = class ChatEditingService extends Disposable {
-    constructor(_instantiationService, multiDiffSourceResolverService, textModelService, contextKeyService, _chatService, _editorService, decorationsService, _fileService, lifecycleService, storageService, logService, extensionService, productService, notebookService) {
+    constructor(_instantiationService, multiDiffSourceResolverService, textModelService, contextKeyService, _chatService, _editorService, decorationsService, _fileService, lifecycleService, storageService, logService, extensionService, productService, notebookService, _configurationService) {
         super();
         this._instantiationService = _instantiationService;
         this._chatService = _chatService;
@@ -53,6 +54,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
         this._fileService = _fileService;
         this.lifecycleService = lifecycleService;
         this.notebookService = notebookService;
+        this._configurationService = _configurationService;
         this._sessionsObs = observableValueOpts({ equalsFn: (a, b) => false }, ( new LinkedList()));
         this.editingSessionsObs = derived(r => {
             const result = Array.from(this._sessionsObs.read(r));
@@ -95,7 +97,7 @@ let ChatEditingService = class ChatEditingService extends Disposable {
             }
             e.join(storageTask, {
                 id: 'join.chatEditingSession',
-                label: ( localize(4879, "Saving chat edits history"))
+                label: ( localize(4958, "Saving chat edits history"))
             });
         }));
     }
@@ -185,7 +187,9 @@ let ChatEditingService = class ChatEditingService extends Disposable {
                 const inactive = editorDidChange
                     || this._editorService.activeEditorPane?.input instanceof ChatEditorInput && this._editorService.activeEditorPane.input.sessionId === session.chatSessionId
                     || Boolean(activeUri && session.entries.get().find(entry => isEqual(activeUri, entry.modifiedURI)));
-                this._editorService.openEditor({ resource: uri, options: { inactive, preserveFocus: true, pinned: true } });
+                if (this._configurationService.getValue('accessibility.openChatEditedFiles')) {
+                    this._editorService.openEditor({ resource: uri, options: { inactive, preserveFocus: true, pinned: true } });
+                }
             }));
         };
         const onResponseComplete = () => {
@@ -307,7 +311,8 @@ ChatEditingService = ( __decorate([
     ( __param(10, ILogService)),
     ( __param(11, IExtensionService)),
     ( __param(12, IProductService)),
-    ( __param(13, INotebookService))
+    ( __param(13, INotebookService)),
+    ( __param(14, IConfigurationService))
 ], ChatEditingService));
 function observeArrayChanges(obs, compare, store) {
     const emitter = store.add(( new Emitter()));
@@ -323,7 +328,7 @@ let ChatDecorationsProvider = class ChatDecorationsProvider extends Disposable {
         super();
         this._sessions = _sessions;
         this._chatAgentService = _chatAgentService;
-        this.label = ( localize(4880, "Chat Editing"));
+        this.label = ( localize(4959, "Chat Editing"));
         this._currentEntries = derived(this, (r) => {
             const sessions = this._sessions.read(r);
             if (!sessions) {
@@ -363,7 +368,7 @@ let ChatDecorationsProvider = class ChatDecorationsProvider extends Disposable {
             return {
                 weight: 1000,
                 letter: Codicon.diffModified,
-                tooltip: defaultAgentName ? ( localize(4881, "Pending changes from {0}", defaultAgentName)) : ( localize(4882, "Pending changes from chat")),
+                tooltip: defaultAgentName ? ( localize(4960, "Pending changes from {0}", defaultAgentName)) : ( localize(4961, "Pending changes from chat")),
                 bubble: true
             };
         }
@@ -407,12 +412,12 @@ class ChatEditingMultiDiffSource {
                     const entryDiffObs = currentSession.getEntryDiffBetweenStops(entry.modifiedURI, undefined, undefined);
                     const entryDiff = entryDiffObs?.read(reader);
                     if (entryDiff) {
-                        return ( new MultiDiffEditorItem(entryDiff.originalURI, entryDiff.modifiedURI, undefined, {
+                        return ( new MultiDiffEditorItem(entryDiff.originalURI, entryDiff.modifiedURI, undefined, undefined, {
                             [chatEditingResourceContextKey.key]: entry.entryId,
                         }));
                     }
                 }
-                return ( new MultiDiffEditorItem(entry.originalURI, entry.modifiedURI, undefined, {
+                return ( new MultiDiffEditorItem(entry.originalURI, entry.modifiedURI, undefined, undefined, {
                     [chatEditingResourceContextKey.key]: entry.entryId,
                 }));
             }));

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

@@ -4,17 +4,15 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IBulkEditService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service";
 import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
-import { IEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service";
 import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 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, ISnapshotEntry, IStreamingEdits } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatResponseModel } from "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatEditingSessionState, IChatEditingSession, IModifiedFileEntry, ISnapshotEntry, IStreamingEdits } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 import { AbstractChatEditingModifiedFileEntry } from "./chatEditingModifiedFileEntry.js";
 export declare class ChatEditingSession extends Disposable implements IChatEditingSession {
@@ -30,38 +28,27 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     private readonly _editorService;
     private readonly _chatService;
     private readonly _notebookService;
-    private readonly _editorWorkerService;
-    private readonly _configurationService;
     private readonly _accessibilitySignalService;
     private readonly _state;
-    private readonly _linearHistory;
-    private readonly _linearHistoryIndex;
+    private readonly _timeline;
     private readonly _initialFileContents;
     private readonly _entriesObs;
     get entries(): IObservable<readonly IModifiedFileEntry[]>;
     private _editorPane;
     get state(): IObservable<ChatEditingSessionState>;
-    readonly canUndo: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservableWithChange<boolean, void>;
-    readonly canRedo: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservableWithChange<boolean, void>;
+    readonly canUndo: IObservable<boolean>;
+    readonly canRedo: IObservable<boolean>;
     private readonly _onDidDispose;
     get onDidDispose(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
-    constructor(chatSessionId: string, isGlobalEditingSession: boolean, _lookupExternalEntry: (uri: URI) => AbstractChatEditingModifiedFileEntry | undefined, _instantiationService: IInstantiationService, _modelService: IModelService, _languageService: ILanguageService, _textModelService: ITextModelService, _bulkEditService: IBulkEditService, _editorGroupsService: IEditorGroupsService, _editorService: IEditorService, _chatService: IChatService, _notebookService: INotebookService, _editorWorkerService: IEditorWorkerService, _configurationService: IConfigurationService, _accessibilitySignalService: IAccessibilitySignalService);
+    constructor(chatSessionId: string, isGlobalEditingSession: boolean, _lookupExternalEntry: (uri: URI) => AbstractChatEditingModifiedFileEntry | undefined, _instantiationService: IInstantiationService, _modelService: IModelService, _languageService: ILanguageService, _textModelService: ITextModelService, _bulkEditService: IBulkEditService, _editorGroupsService: IEditorGroupsService, _editorService: IEditorService, _chatService: IChatService, _notebookService: INotebookService, _accessibilitySignalService: IAccessibilitySignalService);
     init(): Promise<void>;
     private _getEntry;
     getEntry(uri: URI): IModifiedFileEntry | undefined;
     readEntry(uri: URI, reader: IReader | undefined): IModifiedFileEntry | undefined;
     storeState(): Promise<void>;
-    private _findSnapshot;
-    private _findEditStop;
     private _ensurePendingSnapshot;
-    private _diffsBetweenStops;
-    private _fullDiffs;
-    private readonly _ignoreTrimWhitespaceObservable;
-    private _entryDiffBetweenTextStops;
-    private _createDiffBetweenStopsObservable;
-    getEntryDiffBetweenStops(uri: URI, requestId: string | undefined, stopId: string | undefined): IObservable<IEditSessionEntryDiff | undefined>;
+    getEntryDiffBetweenStops(uri: URI, requestId: string | undefined, stopId: string | undefined): IObservable<import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService").IEditSessionEntryDiff | undefined>;
     createSnapshot(requestId: string, undoStop: string | undefined, makeEmpty?: boolean): void;
-    private _createEmptySnapshot;
     private _createSnapshot;
     getSnapshot(requestId: string, undoStop: string | undefined, snapshotUri: URI): ISnapshotEntry | undefined;
     getSnapshotModel(requestId: string, undoStop: string | undefined, snapshotUri: URI): Promise<ITextModel | null>;
@@ -80,12 +67,9 @@ export declare class ChatEditingSession extends Disposable implements IChatEditi
     private _streamingEditLocks;
     private get isDisposed();
     startStreamingEdits(resource: URI, responseModel: IChatResponseModel, inUndoStop: string | undefined): IStreamingEdits;
-    private _getHistoryEntryByLinearIndex;
     undoInteraction(): Promise<void>;
     redoInteraction(): Promise<void>;
-    private _updateRequestHiddenState;
     private _acceptStreamingEditsStart;
-    private ensureEditInUndoStopMatches;
     private _acceptEdits;
     private _getTelemetryInfoForModel;
     private _resolve;