@codingame/monaco-vscode-api 8.0.4 → 9.0.0

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

@@ -4,15 +4,8 @@ import { TrackedRangeStickiness } from '../../../../editor/common/model.js';
 import { CTX_INLINE_CHAT_HAS_STASHED_SESSION } from '../common/inlineChat.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
-import { toErrorMessage } from '../../../../base/common/errorMessage.js';
-import { isCancellationError } from '../../../../base/common/errors.js';
 import { EditOperation } from '../../../../editor/common/core/editOperation.js';
 import { DetailedLineRangeMapping } from '../../../../editor/common/diff/rangeMapping.js';
-import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
-import { ILanguageService } from '../../../../editor/common/languages/language.js';
-import { ResourceMap } from '../../../../base/common/map.js';
-import { Schemas } from '../../../../base/common/network.js';
-import { isEqual } from '../../../../base/common/resources.js';
 import { IInlineChatSessionService } from './inlineChatSessionService.service.js';
 import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
 import { coalesceInPlace } from '../../../../base/common/arrays.js';
@@ -81,11 +74,12 @@ class SessionWholeRange {
     }
 }
 class Session {
-    constructor(editMode,
+    constructor(editMode, headless,
     targetUri,
     textModel0,
-    textModelN, agent, wholeRange, hunkData, chatModel) {
+    textModelN, agent, wholeRange, hunkData, chatModel, versionsByRequest) {
         this.editMode = editMode;
+        this.headless = headless;
         this.targetUri = targetUri;
         this.textModel0 = textModel0;
         this.textModelN = textModelN;
@@ -94,9 +88,8 @@ class Session {
         this.hunkData = hunkData;
         this.chatModel = chatModel;
         this._isUnstashed = false;
-        this._exchanges = [];
         this._startTime = ( new Date());
-        this.textModelNAltVersion = textModelN.getAlternativeVersionId();
+        this._versionByRequest = ( new Map());
         this._teldata = {
             extension: ExtensionIdentifier.toKey(agent.extensionId),
             startTime: this._startTime.toISOString(),
@@ -111,12 +104,9 @@ class Session {
             discardedHunks: 0,
             responseTypes: ''
         };
-    }
-    addInput(input) {
-        this._lastInput = input;
-    }
-    get lastInput() {
-        return this._lastInput;
+        if (versionsByRequest) {
+            this._versionByRequest = ( new Map(versionsByRequest));
+        }
     }
     get isUnstashed() {
         return this._isUnstashed;
@@ -125,22 +115,19 @@ class Session {
         this._teldata.unstashed += 1;
         this._isUnstashed = true;
     }
-    addExchange(exchange) {
-        this._isUnstashed = false;
-        const newLen = this._exchanges.push(exchange);
-        this._teldata.rounds += `${newLen}|`;
+    markModelVersion(request) {
+        this._versionByRequest.set(request.id, this.textModelN.getAlternativeVersionId());
     }
-    get lastExchange() {
-        return this._exchanges[this._exchanges.length - 1];
+    get versionsByRequest() {
+        return Array.from(this._versionByRequest);
     }
     async undoChangesUntil(requestId) {
-        const idx = this._exchanges.findIndex(candidate => candidate.prompt.request.id === requestId);
-        if (idx < 0) {
+        const targetAltVersion = this._versionByRequest.get(requestId);
+        if (targetAltVersion === undefined) {
             return false;
         }
         this.hunkData.ignoreTextModelNChanges = true;
         try {
-            const targetAltVersion = this._exchanges[idx].prompt.modelAltVersionId;
             while (targetAltVersion < this.textModelN.getAlternativeVersionId() && this.textModelN.canUndo()) {
                 await this.textModelN.undo();
             }
@@ -183,86 +170,7 @@ class Session {
         this._teldata.endTime = ( new Date()).toISOString();
         return this._teldata;
     }
-    asRecording() {
-        const result = {
-            session: this.chatModel.sessionId,
-            when: this._startTime,
-            exchanges: []
-        };
-        for (const exchange of this._exchanges) {
-            const response = exchange.response;
-            if (response instanceof ReplyResponse) {
-                result.exchanges.push({ prompt: exchange.prompt.value, res: response.chatResponse });
-            }
-        }
-        return result;
-    }
 }
-class SessionPrompt {
-    constructor(request, modelAltVersionId) {
-        this.request = request;
-        this.modelAltVersionId = modelAltVersionId;
-        this.value = request.message.text;
-    }
-}
-class SessionExchange {
-    constructor(prompt, response) {
-        this.prompt = prompt;
-        this.response = response;
-    }
-}
-class EmptyResponse {
-}
-class ErrorResponse {
-    constructor(error) {
-        this.error = error;
-        this.message = toErrorMessage(error, false);
-        this.isCancellation = isCancellationError(error);
-    }
-}
-let ReplyResponse = class ReplyResponse {
-    constructor(localUri, chatRequest, chatResponse, _textFileService, _languageService) {
-        this.chatRequest = chatRequest;
-        this.chatResponse = chatResponse;
-        this._textFileService = _textFileService;
-        this._languageService = _languageService;
-        const editsMap = ( new ResourceMap());
-        for (const item of chatResponse.response.value) {
-            if (item.kind === 'textEditGroup') {
-                const array = editsMap.get(item.uri);
-                for (const group of item.edits) {
-                    if (array) {
-                        array.push(group);
-                    }
-                    else {
-                        editsMap.set(item.uri, [group]);
-                    }
-                }
-            }
-        }
-        for (const [uri, edits] of editsMap) {
-            const flatEdits = edits.flat();
-            if (flatEdits.length === 0) {
-                editsMap.delete(uri);
-                continue;
-            }
-            const isLocalUri = isEqual(uri, localUri);
-            if (uri.scheme === Schemas.untitled && !isLocalUri && !this.untitledTextModel) {
-                const langSelection = this._languageService.createByFilepathOrFirstLine(uri, undefined);
-                const untitledTextModel = this._textFileService.untitled.create({
-                    associatedResource: uri,
-                    languageId: langSelection.languageId
-                });
-                this.untitledTextModel = untitledTextModel;
-                untitledTextModel.resolve();
-            }
-        }
-    }
-};
-ReplyResponse = ( __decorate([
-    ( __param(3, ITextFileService)),
-    ( __param(4, ILanguageService))
-], ReplyResponse));
 let StashedSession = class StashedSession {
     constructor(editor, session, _undoCancelEdits, contextKeyService, _sessionService, _logService) {
         this._undoCancelEdits = _undoCancelEdits;
@@ -271,7 +179,7 @@ let StashedSession = class StashedSession {
         this._ctxHasStashedSession = CTX_INLINE_CHAT_HAS_STASHED_SESSION.bindTo(contextKeyService);
         this._session = session;
         this._ctxHasStashedSession.set(true);
-        this._listener = Event.once(Event.any(editor.onDidChangeCursorSelection, editor.onDidChangeModelContent, editor.onDidChangeModel))(() => {
+        this._listener = Event.once(Event.any(editor.onDidChangeCursorSelection, editor.onDidChangeModelContent, editor.onDidChangeModel, editor.onDidBlurEditorWidget))(() => {
             this._session = undefined;
             this._sessionService.releaseSession(session);
             this._ctxHasStashedSession.reset();
@@ -366,19 +274,22 @@ let HunkData = class HunkData {
     _mirrorChanges(event) {
         const hunkRanges = [];
         const ranges0 = [];
-        for (const { textModelNDecorations, textModel0Decorations, state } of ( this._data.values())) {
-            if (state === HunkState.Pending) {
-                for (let i = 1; i < textModelNDecorations.length; i++) {
-                    const rangeN = this._textModelN.getDecorationRange(textModelNDecorations[i]);
-                    const range0 = this._textModel0.getDecorationRange(textModel0Decorations[i]);
+        for (const entry of ( this._data.values())) {
+            if (entry.state === HunkState.Pending) {
+                for (let i = 1; i < entry.textModelNDecorations.length; i++) {
+                    const rangeN = this._textModelN.getDecorationRange(entry.textModelNDecorations[i]);
+                    const range0 = this._textModel0.getDecorationRange(entry.textModel0Decorations[i]);
                     if (rangeN && range0) {
-                        hunkRanges.push({ rangeN, range0 });
+                        hunkRanges.push({
+                            rangeN, range0,
+                            markAccepted: () => entry.state = HunkState.Accepted
+                        });
                     }
                 }
             }
-            else if (state === HunkState.Accepted) {
-                for (let i = 1; i < textModel0Decorations.length; i++) {
-                    const range = this._textModel0.getDecorationRange(textModel0Decorations[i]);
+            else if (entry.state === HunkState.Accepted) {
+                for (let i = 1; i < entry.textModel0Decorations.length; i++) {
+                    const range = this._textModel0.getDecorationRange(entry.textModel0Decorations[i]);
                     if (range) {
                         ranges0.push(range);
                     }
@@ -391,12 +302,13 @@ let HunkData = class HunkData {
         for (const change of event.changes) {
             let isOverlapping = false;
             let pendingChangesLen = 0;
-            for (const { rangeN, range0 } of hunkRanges) {
-                if (rangeN.getEndPosition().isBefore(Range.getStartPosition(change.range))) {
-                    pendingChangesLen += this._textModelN.getValueLengthInRange(rangeN);
-                    pendingChangesLen -= this._textModel0.getValueLengthInRange(range0);
+            for (const entry of hunkRanges) {
+                if (entry.rangeN.getEndPosition().isBefore(Range.getStartPosition(change.range))) {
+                    pendingChangesLen += this._textModelN.getValueLengthInRange(entry.rangeN);
+                    pendingChangesLen -= this._textModel0.getValueLengthInRange(entry.range0);
                 }
-                else if (Range.areIntersectingOrTouching(rangeN, change.range)) {
+                else if (Range.areIntersectingOrTouching(entry.rangeN, change.range)) {
+                    entry.markAccepted();
                     isOverlapping = true;
                     break;
                 }
@@ -423,25 +335,26 @@ let HunkData = class HunkData {
     }
     async recompute(editState, diff) {
         diff ??= await this._editorWorkerService.computeDiff(this._textModel0.uri, this._textModelN.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, computeMoves: false }, 'advanced');
-        if (!diff || diff.changes.length === 0) {
-            return;
-        }
-        const mergedChanges = [diff.changes[0]];
-        for (let i = 1; i < diff.changes.length; i++) {
-            const lastChange = mergedChanges[mergedChanges.length - 1];
-            const thisChange = diff.changes[i];
-            if (thisChange.modified.startLineNumber - lastChange.modified.endLineNumberExclusive <= HunkData_1._HUNK_THRESHOLD) {
-                mergedChanges[mergedChanges.length - 1] = ( new DetailedLineRangeMapping(
-                    lastChange.original.join(thisChange.original),
-                    lastChange.modified.join(thisChange.modified),
-                    (lastChange.innerChanges ?? []).concat(thisChange.innerChanges ?? [])
-                ));
-            }
-            else {
-                mergedChanges.push(thisChange);
+        let mergedChanges = [];
+        if (diff && diff.changes.length > 0) {
+            mergedChanges = [diff.changes[0]];
+            for (let i = 1; i < diff.changes.length; i++) {
+                const lastChange = mergedChanges[mergedChanges.length - 1];
+                const thisChange = diff.changes[i];
+                if (thisChange.modified.startLineNumber - lastChange.modified.endLineNumberExclusive <= HunkData_1._HUNK_THRESHOLD) {
+                    mergedChanges[mergedChanges.length - 1] = ( new DetailedLineRangeMapping(
+                        lastChange.original.join(thisChange.original),
+                        lastChange.modified.join(thisChange.modified),
+                        (lastChange.innerChanges ?? []).concat(thisChange.innerChanges ?? [])
+                    ));
+                }
+                else {
+                    mergedChanges.push(thisChange);
+                }
             }
         }
         const hunks = ( mergedChanges.map(change => ( new RawHunk(change.original, change.modified, change.innerChanges ?? []))));
+        editState.applied = hunks.length;
         this._textModelN.changeDecorations(accessorN => {
             this._textModel0.changeDecorations(accessor0 => {
                 for (const { textModelNDecorations, textModel0Decorations } of ( this._data.values())) {
@@ -524,6 +437,9 @@ let HunkData = class HunkData {
                         const edits = this._discardEdits(item);
                         this._textModelN.pushEditOperations(null, edits, () => null);
                         data.state = HunkState.Rejected;
+                        if (data.editState.applied > 0) {
+                            data.editState.applied -= 1;
+                        }
                     }
                 },
                 acceptChanges: () => {
@@ -538,7 +454,6 @@ let HunkData = class HunkData {
                         }
                         this._textModel0.pushEditOperations(null, edits, () => null);
                         data.state = HunkState.Accepted;
-                        data.editState.applied += 1;
                     }
                 }
             };
@@ -563,4 +478,4 @@ var HunkState;
     HunkState[HunkState["Accepted"] = 1] = "Accepted";
     HunkState[HunkState["Rejected"] = 2] = "Rejected";
 })(HunkState || (HunkState = {})));
-export { EmptyResponse, ErrorResponse, HunkData, HunkState, ReplyResponse, Session, SessionExchange, SessionPrompt, SessionWholeRange, StashedSession };
+export { HunkData, HunkState, Session, SessionWholeRange, StashedSession };

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

@@ -1,5 +1,4 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { CancellationError } from '../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { DisposableStore, toDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../base/common/network.js';
@@ -9,6 +8,7 @@ import { createTextBufferFactoryFromSnapshot } from '../../../../editor/common/m
 import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
@@ -19,8 +19,10 @@ import { IChatService } from '../../chat/common/chatService.service.js';
 import { CTX_INLINE_CHAT_HAS_AGENT } from '../common/inlineChat.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { UntitledTextEditorInput } from '../../../services/untitled/common/untitledTextEditorInput.js';
-import { ReplyResponse, SessionExchange, Session, SessionWholeRange, HunkData, StashedSession, ErrorResponse, EmptyResponse } from './inlineChatSession.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { Session, SessionWholeRange, HunkData, StashedSession } from './inlineChatSession.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
 class InlineChatError extends Error {
     static { this.code = 'InlineChatError'; }
     constructor(message) {
@@ -29,7 +31,7 @@ class InlineChatError extends Error {
     }
 }
 let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
-    constructor(_telemetryService, _modelService, _textModelService, _editorWorkerService, _logService, _instaService, _editorService, _chatService, _chatAgentService) {
+    constructor(_telemetryService, _modelService, _textModelService, _editorWorkerService, _logService, _instaService, _editorService, _textFileService, _languageService, _chatService, _chatAgentService) {
         this._telemetryService = _telemetryService;
         this._modelService = _modelService;
         this._textModelService = _textModelService;
@@ -37,6 +39,8 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
         this._logService = _logService;
         this._instaService = _instaService;
         this._editorService = _editorService;
+        this._textFileService = _textFileService;
+        this._languageService = _languageService;
         this._chatService = _chatService;
         this._chatAgentService = _chatAgentService;
         this._store = ( new DisposableStore());
@@ -50,7 +54,6 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
         this.onDidStashSession = this._onDidStashSession.event;
         this._sessions = ( new Map());
         this._keyComputers = ( new Map());
-        this._recordings = [];
     }
     dispose() {
         this._store.dispose();
@@ -68,14 +71,17 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
         const selection = editor.getSelection();
         const store = ( new DisposableStore());
         this._logService.trace(`[IE] creating NEW session for ${editor.getId()}, ${agent.extensionId}`);
-        const chatModel = this._chatService.startSession(ChatAgentLocation.Editor, token);
+        const chatModel = options.session?.chatModel ?? this._chatService.startSession(ChatAgentLocation.Editor, token);
         if (!chatModel) {
             this._logService.trace('[IE] NO chatModel found');
             return undefined;
         }
         store.add(toDisposable(() => {
-            this._chatService.clearSession(chatModel.sessionId);
-            chatModel.dispose();
+            const doesOtherSessionUseChatModel = ( [...( this._sessions.values())].some(data => data.session !== session && data.session.chatModel === chatModel));
+            if (!doesOtherSessionUseChatModel) {
+                this._chatService.clearSession(chatModel.sessionId);
+                chatModel.dispose();
+            }
         }));
         const lastResponseListener = store.add(( new MutableDisposable()));
         store.add(chatModel.onDidChange(e => {
@@ -83,27 +89,23 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
                 return;
             }
             const { response } = e.request;
+            session.markModelVersion(e.request);
             lastResponseListener.value = response.onDidChange(() => {
                 if (!response.isComplete) {
                     return;
                 }
                 lastResponseListener.clear();
-                let inlineResponse;
-                if (response.isCanceled) {
-                    inlineResponse = ( new ErrorResponse(( new CancellationError())));
-                }
-                else if (response.result?.errorDetails) {
-                    inlineResponse = ( new ErrorResponse(( new Error(response.result.errorDetails.message))));
-                }
-                else if (response.response.value.length === 0) {
-                    inlineResponse = ( new EmptyResponse());
-                }
-                else {
-                    inlineResponse = this._instaService.createInstance(ReplyResponse, session.textModelN.uri, e.request, response);
-                }
-                session.addExchange(( new SessionExchange(session.lastInput, inlineResponse)));
-                if (inlineResponse instanceof ReplyResponse && inlineResponse.untitledTextModel) {
-                    this._textModelService.createModelReference(inlineResponse.untitledTextModel.resource).then(ref => {
+                for (const part of response.response.value) {
+                    if (part.kind !== 'textEditGroup' || part.uri.scheme !== Schemas.untitled || isEqual(part.uri, session.textModelN.uri)) {
+                        continue;
+                    }
+                    const langSelection = this._languageService.createByFilepathOrFirstLine(part.uri, undefined);
+                    const untitledTextModel = this._textFileService.untitled.create({
+                        associatedResource: part.uri,
+                        languageId: langSelection.languageId
+                    });
+                    untitledTextModel.resolve();
+                    this._textModelService.createModelReference(part.uri).then(ref => {
                         store.add(ref);
                     });
                 }
@@ -142,13 +144,15 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
         }
         const session = ( new Session(
             options.editMode,
+            options.headless ?? false,
             targetUri,
             textModel0,
             textModelN,
             agent,
             store.add(( new SessionWholeRange(textModelN, wholeRange))),
             store.add(( new HunkData(this._editorWorkerService, textModel0, textModelN))),
-            chatModel
+            chatModel,
+            options.session?.versionsByRequest
         ));
         const key = this._key(editor, session.targetUri);
         if (( this._sessions.has(key))) {
@@ -198,7 +202,6 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
         if (!tuple) {
             return;
         }
-        this._keepRecording(session);
         this._telemetryService.publicLog2('interactiveEditor/session', session.asTelemetryData());
         const [key, value] = tuple;
         this._sessions.delete(key);
@@ -207,7 +210,6 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
         value.store.dispose();
     }
     stashSession(session, editor, undoCancelEdits) {
-        this._keepRecording(session);
         const result = this._instaService.createInstance(StashedSession, editor, session, undoCancelEdits);
         this._onDidStashSession.fire({ editor, session });
         this._logService.trace(`[IE] did STASH session for ${editor.getId()}, ${session.agent.extensionId}`);
@@ -235,15 +237,6 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
         this._keyComputers.set(scheme, value);
         return toDisposable(() => this._keyComputers.delete(scheme));
     }
-    _keepRecording(session) {
-        const newLen = this._recordings.unshift(session.asRecording());
-        if (newLen > 5) {
-            this._recordings.pop();
-        }
-    }
-    recordings() {
-        return this._recordings;
-    }
 };
 InlineChatSessionServiceImpl = ( __decorate([
     ( __param(0, ITelemetryService)),
@@ -253,8 +246,10 @@ InlineChatSessionServiceImpl = ( __decorate([
     ( __param(4, ILogService)),
     ( __param(5, IInstantiationService)),
     ( __param(6, IEditorService)),
-    ( __param(7, IChatService)),
-    ( __param(8, IChatAgentService))
+    ( __param(7, ITextFileService)),
+    ( __param(8, ILanguageService)),
+    ( __param(9, IChatService)),
+    ( __param(10, IChatAgentService))
 ], InlineChatSessionServiceImpl));
 let InlineChatEnabler = class InlineChatEnabler {
     static { this.Id = 'inlineChat.enabler'; }