@codingame/monaco-vscode-chat-service-override 15.0.2 → 16.0.0

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

@@ -0,0 +1,216 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable, DisposableMap, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { clamp } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+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 { 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 { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
+import { registerColor, transparent } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
+import { editorBackground } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/menuColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/minimapColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
+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 { WorkingSetEntryState, 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 { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+
+var AbstractChatEditingModifiedFileEntry_1;
+class AutoAcceptControl {
+    constructor(total, remaining, cancel) {
+        this.total = total;
+        this.remaining = remaining;
+        this.cancel = cancel;
+    }
+}
+const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight', ( transparent(editorBackground, 0.6)), ( localize(4687, "Color of pending edit regions in the minimap")));
+let AbstractChatEditingModifiedFileEntry = class AbstractChatEditingModifiedFileEntry extends Disposable {
+    static { AbstractChatEditingModifiedFileEntry_1 = this; }
+    static { this.scheme = 'modified-file-entry'; }
+    static { this.lastEntryId = 0; }
+    get telemetryInfo() {
+        return this._telemetryInfo;
+    }
+    get lastModifyingRequestId() {
+        return this._telemetryInfo.requestId;
+    }
+    constructor(modifiedURI, _telemetryInfo, kind, configService, _fileConfigService, _chatService, _fileService, _undoRedoService, _instantiationService) {
+        super();
+        this.modifiedURI = modifiedURI;
+        this._telemetryInfo = _telemetryInfo;
+        this._fileConfigService = _fileConfigService;
+        this._chatService = _chatService;
+        this._fileService = _fileService;
+        this._undoRedoService = _undoRedoService;
+        this._instantiationService = _instantiationService;
+        this.entryId = `${AbstractChatEditingModifiedFileEntry_1.scheme}::${++AbstractChatEditingModifiedFileEntry_1.lastEntryId}`;
+        this._onDidDelete = this._register(( new Emitter()));
+        this.onDidDelete = this._onDidDelete.event;
+        this._stateObs = observableValue(this, WorkingSetEntryState.Attached);
+        this.state = this._stateObs;
+        this._isCurrentlyBeingModifiedByObs = observableValue(this, undefined);
+        this.isCurrentlyBeingModifiedBy = this._isCurrentlyBeingModifiedByObs;
+        this._rewriteRatioObs = observableValue(this, 0);
+        this.rewriteRatio = this._rewriteRatioObs;
+        this._reviewModeTempObs = observableValue(this, undefined);
+        this._autoAcceptCtrl = observableValue(this, undefined);
+        this.autoAcceptController = this._autoAcceptCtrl;
+        this._refCounter = 1;
+        this._editorIntegrations = this._register(( new DisposableMap()));
+        if (kind === ChatEditKind.Created) {
+            this.createdInRequestId = this._telemetryInfo.requestId;
+        }
+        if (this.modifiedURI.scheme !== Schemas.untitled && this.modifiedURI.scheme !== Schemas.vscodeNotebookCell) {
+            this._register(this._fileService.watch(this.modifiedURI));
+            this._register(this._fileService.onDidFilesChange(e => {
+                if (e.affects(this.modifiedURI) && kind === ChatEditKind.Created && e.gotDeleted()) {
+                    this._onDidDelete.fire();
+                }
+            }));
+        }
+        const autoAcceptRaw = observableConfigValue('chat.editing.autoAcceptDelay', 0, configService);
+        this._autoAcceptTimeout = derived(r => {
+            const value = autoAcceptRaw.read(r);
+            return clamp(value, 0, 100);
+        });
+        this.reviewMode = derived(r => {
+            const configuredValue = this._autoAcceptTimeout.read(r);
+            const tempValue = this._reviewModeTempObs.read(r);
+            return tempValue ?? configuredValue === 0;
+        });
+        const autoSaveOff = this._store.add(( new MutableDisposable()));
+        this._store.add(autorun(r => {
+            if (this.isCurrentlyBeingModifiedBy.read(r)) {
+                autoSaveOff.value = _fileConfigService.disableAutoSave(this.modifiedURI);
+            }
+            else {
+                autoSaveOff.clear();
+            }
+        }));
+    }
+    dispose() {
+        if (--this._refCounter === 0) {
+            super.dispose();
+        }
+    }
+    acquire() {
+        this._refCounter++;
+        return this;
+    }
+    enableReviewModeUntilSettled() {
+        this._reviewModeTempObs.set(true, undefined);
+        const cleanup = autorun(r => {
+            const resetConfig = this.state.read(r) !== WorkingSetEntryState.Modified;
+            if (resetConfig) {
+                this._store.delete(cleanup);
+                this._reviewModeTempObs.set(undefined, undefined);
+            }
+        });
+        this._store.add(cleanup);
+    }
+    updateTelemetryInfo(telemetryInfo) {
+        this._telemetryInfo = telemetryInfo;
+    }
+    async accept(tx) {
+        if (this._stateObs.get() !== WorkingSetEntryState.Modified) {
+            return;
+        }
+        await this._doAccept(tx);
+        this._stateObs.set(WorkingSetEntryState.Accepted, tx);
+        this._autoAcceptCtrl.set(undefined, tx);
+        this._notifyAction('accepted');
+    }
+    async reject(tx) {
+        if (this._stateObs.get() !== WorkingSetEntryState.Modified) {
+            return;
+        }
+        await this._doReject(tx);
+        this._stateObs.set(WorkingSetEntryState.Rejected, tx);
+        this._autoAcceptCtrl.set(undefined, tx);
+        this._notifyAction('rejected');
+    }
+    _notifyAction(outcome) {
+        this._chatService.notifyUserAction({
+            action: { kind: 'chatEditingSessionAction', uri: this.modifiedURI, hasRemainingEdits: false, outcome },
+            agentId: this._telemetryInfo.agentId,
+            command: this._telemetryInfo.command,
+            sessionId: this._telemetryInfo.sessionId,
+            requestId: this._telemetryInfo.requestId,
+            result: this._telemetryInfo.result
+        });
+    }
+    getEditorIntegration(pane) {
+        let value = this._editorIntegrations.get(pane);
+        if (!value) {
+            value = this._createEditorIntegration(pane);
+            this._editorIntegrations.set(pane, value);
+        }
+        return value;
+    }
+    acceptStreamingEditsStart(responseModel, tx) {
+        this._resetEditsState(tx);
+        this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
+        this._autoAcceptCtrl.get()?.cancel();
+        const undoRedoElement = this._createUndoRedoElement(responseModel);
+        if (undoRedoElement) {
+            this._undoRedoService.pushElement(undoRedoElement);
+        }
+    }
+    async acceptStreamingEditsEnd(tx) {
+        this._resetEditsState(tx);
+        if (await this._areOriginalAndModifiedIdentical()) {
+            this.accept(tx);
+        }
+        else if (!this.reviewMode.get() && !this._autoAcceptCtrl.get()) {
+            const acceptTimeout = this._autoAcceptTimeout.get() * 1000;
+            const future = Date.now() + acceptTimeout;
+            const update = () => {
+                const reviewMode = this.reviewMode.get();
+                if (reviewMode) {
+                    this._autoAcceptCtrl.set(undefined, undefined);
+                    return;
+                }
+                const remain = Math.round(future - Date.now());
+                if (remain <= 0) {
+                    this.accept(undefined);
+                }
+                else {
+                    const handle = setTimeout(update, 100);
+                    this._autoAcceptCtrl.set(( new AutoAcceptControl(acceptTimeout, remain, () => {
+                        clearTimeout(handle);
+                        this._autoAcceptCtrl.set(undefined, undefined);
+                    })), undefined);
+                }
+            };
+            update();
+        }
+    }
+    _resetEditsState(tx) {
+        this._isCurrentlyBeingModifiedByObs.set(undefined, tx);
+        this._rewriteRatioObs.set(0, tx);
+    }
+};
+AbstractChatEditingModifiedFileEntry = AbstractChatEditingModifiedFileEntry_1 = ( __decorate([
+    ( __param(3, IConfigurationService)),
+    ( __param(4, IFilesConfigurationService)),
+    ( __param(5, IChatService)),
+    ( __param(6, IFileService)),
+    ( __param(7, IUndoRedoService)),
+    ( __param(8, IInstantiationService))
+], AbstractChatEditingModifiedFileEntry));
+
+export { AbstractChatEditingModifiedFileEntry, pendingRewriteMinimap };

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

@@ -0,0 +1,97 @@
+import { IReference } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ITransaction, IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+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 { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
+import { 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 { 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 { IUndoRedoElement } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo";
+import { IUndoRedoService } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service";
+import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
+import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
+import { CellDiffInfo } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { ICellEditOperation, IResolvedNotebookEditorModel, NotebookTextModelChangedEvent, TransientOptions } 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 { 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, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IChatResponseModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-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, IModifiedEntryTelemetryInfo, ISnapshotEntry } from "./chatEditingModifiedFileEntry.js";
+import { ChatEditingNotebookCellEntry } from "./notebook/chatEditingNotebookCellEntry.js";
+import { ICellDiffInfo } from "./notebook/notebookCellChanges.js";
+export declare class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifiedFileEntry {
+    private readonly modifiedResourceRef;
+    private readonly _multiDiffEntryDelegate;
+    private readonly transientOptions;
+    private readonly configurationService;
+    private readonly textModelService;
+    private readonly modelService;
+    private readonly notebookEditorWorkerService;
+    private readonly loggingService;
+    private readonly notebookResolver;
+    static NewModelCounter: number;
+    private readonly modifiedModel;
+    private readonly originalModel;
+    originalURI: URI;
+    initialContent: string;
+    private _isProcessingResponse;
+    get isProcessingResponse(): IObservable<boolean>;
+    private _isEditFromUs;
+    private _allEditsAreFromUs;
+    private readonly _changesCount;
+    changesCount: IObservable<number>;
+    private readonly cellEntryMap;
+    private modifiedToOriginalCell;
+    private readonly _cellsDiffInfo;
+    get cellsDiffInfo(): IObservable<ICellDiffInfo[]>;
+    private readonly editedCells;
+    static create(uri: URI, _multiDiffEntryDelegate: {
+        collapse: (transaction: ITransaction | undefined) => void;
+    }, telemetryInfo: IModifiedEntryTelemetryInfo, chatKind: ChatEditKind, initialContent: string | undefined, instantiationService: IInstantiationService): Promise<AbstractChatEditingModifiedFileEntry>;
+    static canHandleSnapshotContent(initialContent: string | undefined): boolean;
+    static canHandleSnapshot(snapshot: ISnapshotEntry): boolean;
+    private readonly initialContentComparer;
+    constructor(modifiedResourceRef: IReference<IResolvedNotebookEditorModel>, originalResourceRef: IReference<IResolvedNotebookEditorModel>, _multiDiffEntryDelegate: {
+        collapse: (transaction: ITransaction | undefined) => void;
+    }, transientOptions: TransientOptions | undefined, telemetryInfo: IModifiedEntryTelemetryInfo, kind: ChatEditKind, initialContent: string, configurationService: IConfigurationService, fileConfigService: IFilesConfigurationService, chatService: IChatService, fileService: IFileService, instantiationService: IInstantiationService, textModelService: ITextModelService, modelService: IModelService, undoRedoService: IUndoRedoService, notebookEditorWorkerService: INotebookEditorWorkerService, loggingService: INotebookLoggingService, notebookResolver: INotebookEditorModelResolverService);
+    initializeModelsFromDiffImpl(cellsDiffInfo: CellDiffInfo[]): void;
+    private computeRequestId;
+    initializeModelsFromDiff(): Promise<void>;
+    updateCellDiffInfo(cellsDiffInfo: ICellDiffInfo[], transcation: ITransaction | undefined): void;
+    mirrorNotebookEdits(e: NotebookTextModelChangedEvent): void;
+    protected _doAccept(tx: ITransaction | undefined): Promise<void>;
+    protected _doReject(tx: ITransaction | undefined): Promise<void>;
+    private _collapse;
+    protected _createEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration;
+    protected _resetEditsState(tx: ITransaction): void;
+    protected _createUndoRedoElement(response: IChatResponseModel): IUndoRedoElement | undefined;
+    protected _areOriginalAndModifiedIdentical(): Promise<boolean>;
+    private _areOriginalAndModifiedIdenticalImpl;
+    private newNotebookEditGenerator?;
+    acceptAgentEdits(resource: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void>;
+    private disposeDeletedCellEntries;
+    acceptNotebookEdit(edit: ICellEditOperation): void;
+    private computeStateAfterAcceptingRejectingChanges;
+    createModifiedCellDiffInfo(modifiedCellIndex: number, originalCellIndex: number): ICellDiffInfo;
+    createInsertedCellDiffInfo(modifiedCellIndex: number): ICellDiffInfo;
+    createDeleteCellDiffInfo(originalCellIndex: number): ICellDiffInfo;
+    private undoPreviouslyInsertedCell;
+    private keepPreviouslyInsertedCell;
+    private undoPreviouslyDeletedCell;
+    private keepPreviouslyDeletedCell;
+    private _applyEdits;
+    private _applyEditsSync;
+    createSnapshot(requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry;
+    equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean;
+    restoreFromSnapshot(snapshot: ISnapshotEntry, restoreToDisk?: boolean): void;
+    resetToInitialContent(): void;
+    private restoreSnapshotInModifiedModel;
+    private readonly cellTextModelMap;
+    private resolveCellModel;
+    getOrCreateModifiedTextFileEntryForCell(cell: NotebookCellTextModel, modifiedCellModel: ITextModel, originalCellModel: ITextModel): ChatEditingNotebookCellEntry | undefined;
+}