@codingame/monaco-vscode-api 4.5.2 → 5.0.1

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

@@ -10,7 +10,6 @@ import { DisposableStore, MutableDisposable, toDisposable } from '../../../../ba
 import { MovingAverage } from '../../../../base/common/numbers.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { assertType } from '../../../../base/common/types.js';
-import { IBulkEditService } from '../../../../editor/browser/services/bulkEditService.js';
 import { Position } from '../../../../editor/common/core/position.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { Selection } from '../../../../editor/common/core/selection.js';
@@ -23,13 +22,14 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
+import { showChatView } from '../../chat/browser/chat.js';
 import { IChatWidgetService } from '../../chat/browser/chat.service.js';
 import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
 import { IChatAgentService } from '../../chat/common/chatAgents.service.js';
 import { ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, chatAgentLeader } from '../../chat/common/chatParserTypes.js';
 import { IChatService } from '../../chat/common/chatService.service.js';
 import { IInlineChatSavingService } from './inlineChatSavingService.service.js';
-import { SessionPrompt, ReplyResponse, EmptyResponse, ErrorResponse, Session } from './inlineChatSession.js';
+import { ReplyResponse, SessionPrompt, EmptyResponse, ErrorResponse, Session } from './inlineChatSession.js';
 import { IInlineChatSessionService } from './inlineChatSessionService.service.js';
 import { LiveStrategy, PreviewStrategy } from './inlineChatStrategies.js';
 import { InlineChatZoneWidget } from './inlineChatZoneWidget.js';
@@ -42,6 +42,8 @@ import { InlineChatError } from './inlineChatSessionServiceImpl.js';
 import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
 import { ChatInputPart } from '../../chat/browser/chatInputPart.js';
 import { OffsetRange } from '../../../../editor/common/core/offsetRange.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { IViewsService } from '../../../services/views/common/viewsService.service.js';
 const _moduleId = "vs/workbench/contrib/inlineChat/browser/inlineChatController";
 class InlineChatRunOptions {
     static isInteractiveEditorOptions(options) {
@@ -61,7 +63,7 @@ let InlineChatController = class InlineChatController {
     static get(editor) {
         return editor.getContribution(INLINE_CHAT_ID);
     }
-    constructor(_editor, _instaService, _inlineChatSessionService, _inlineChatSavingService, _editorWorkerService, _logService, _configurationService, _dialogService, contextKeyService, _chatAgentService, _chatService, _bulkEditService, _commandService, _languageFeatureService, _chatWidgetService) {
+    constructor(_editor, _instaService, _inlineChatSessionService, _inlineChatSavingService, _editorWorkerService, _logService, _configurationService, _dialogService, contextKeyService, _chatAgentService, _chatService, _commandService, _languageFeatureService, _chatWidgetService) {
         this._editor = _editor;
         this._instaService = _instaService;
         this._inlineChatSessionService = _inlineChatSessionService;
@@ -72,7 +74,6 @@ let InlineChatController = class InlineChatController {
         this._dialogService = _dialogService;
         this._chatAgentService = _chatAgentService;
         this._chatService = _chatService;
-        this._bulkEditService = _bulkEditService;
         this._commandService = _commandService;
         this._languageFeatureService = _languageFeatureService;
         this._chatWidgetService = _chatWidgetService;
@@ -85,8 +86,6 @@ let InlineChatController = class InlineChatController {
         this.onDidCancelInput = Event.filter(this._messages.event, m => m === 16  || m === 2 , this._store);
         this._sessionStore = this._store.add(( (new DisposableStore())));
         this._stashedSession = this._store.add(( (new MutableDisposable())));
-        this._nextAttempt = 0;
-        this._nextWithIntentDetection = true;
         this._forcedPlaceholder = undefined;
         this._ctxVisible = CTX_INLINE_CHAT_VISIBLE.bindTo(contextKeyService);
         this._ctxDidEdit = CTX_INLINE_CHAT_DID_EDIT.bindTo(contextKeyService);
@@ -130,7 +129,9 @@ let InlineChatController = class InlineChatController {
     }
     dispose() {
         if (this._currentRun) {
-            this._messages.fire(((this._session?.lastExchange ? 4  : 2) ));
+            this._messages.fire(this._session?.chatModel.hasRequests
+                ? 4
+                : 2 );
         }
         this._store.dispose();
         this._isDisposed = true;
@@ -236,6 +237,7 @@ let InlineChatController = class InlineChatController {
             this._log('Failed to start editor chat');
             return "CANCEL" ;
         }
+        await session.chatModel.waitForInitialization();
         switch (session.editMode) {
             case "preview" :
                 this._strategy = this._instaService.createInstance(PreviewStrategy, session, this._editor, this._zone.value);
@@ -245,9 +247,6 @@ let InlineChatController = class InlineChatController {
                 this._strategy = this._instaService.createInstance(LiveStrategy, session, this._editor, this._zone.value);
                 break;
         }
-        if (session.session.input) {
-            options.message = session.session.input;
-        }
         this._session = session;
         return "INIT_UI" ;
     }
@@ -269,9 +268,9 @@ let InlineChatController = class InlineChatController {
         this._updatePlaceholder();
         const message = this._session.session.message ?? ( localizeWithPath(_moduleId, 2, "AI-generated code may be incorrect"));
         this._zone.value.widget.updateInfo(message);
-        this._showWidget(!this._session.lastExchange);
+        this._showWidget(!this._session.chatModel.hasRequests);
         this._sessionStore.add(this._editor.onDidChangeModel((e) => {
-            const msg = this._session?.lastExchange
+            const msg = this._session?.chatModel.hasRequests
                 ? 4
                 : 2 ;
             this._log('model changed, pause or cancel session', msg, e);
@@ -298,7 +297,7 @@ let InlineChatController = class InlineChatController {
                 this.finishExistingSession();
             }
         }));
-        this._sessionStore.add(this._session.chatModel.onDidChange(e => {
+        this._sessionStore.add(this._session.chatModel.onDidChange(async (e) => {
             if (e.kind === 'addRequest' && e.request.response) {
                 this._zone.value.widget.updateProgress(true);
                 const listener = e.request.response.onDidChange(() => {
@@ -308,6 +307,17 @@ let InlineChatController = class InlineChatController {
                     }
                 });
             }
+            else if (e.kind === 'removeRequest') {
+                if (this._session.lastExchange?.response instanceof ReplyResponse) {
+                    try {
+                        this._session.hunkData.ignoreTextModelNChanges = true;
+                        await this._strategy.undoChanges(this._session.lastExchange.response.modelAltVersionId);
+                    }
+                    finally {
+                        this._session.hunkData.ignoreTextModelNChanges = false;
+                    }
+                }
+            }
         }));
         this._ctxSupportIssueReporting.set(this._session.provider.supportIssueReporting ?? false);
         this._sessionStore.add(this._languageFeatureService.completionProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, hasAccessToAllModels: true }, {
@@ -381,12 +391,12 @@ let InlineChatController = class InlineChatController {
             inputDecorations.clear();
             zoneDecorations.clear();
         }));
-        if (!this._session.lastExchange) {
+        if (!this._session.chatModel.hasRequests) {
             return "WAIT_FOR_INPUT" ;
         }
         else if (options.isUnstashed) {
             delete options.isUnstashed;
-            return "APPLY_RESPONSE" ;
+            return "SHOW_RESPONSE" ;
         }
         else {
             return "SHOW_RESPONSE" ;
@@ -477,14 +487,12 @@ let InlineChatController = class InlineChatController {
             await this._instaService.invokeFunction(sendRequest, massagedInput);
             return "DONE" ;
         }
-        this._session.addInput(( (new SessionPrompt(input, this._nextAttempt, this._nextWithIntentDetection))));
-        this._nextAttempt = 0;
-        this._nextWithIntentDetection = true;
+        this._session.addInput(( (new SessionPrompt(input))));
         return "SHOW_REQUEST" ;
     }
-    async ["SHOW_REQUEST" ](options) {
+    async ["SHOW_REQUEST" ]() {
         assertType(this._session);
-        assertType(this._session.lastInput);
+        assertType(this._session.chatModel.requestInProgress);
         const request = tail(this._session.chatModel.getRequests());
         assertType(request);
         assertType(request.response);
@@ -519,7 +527,14 @@ let InlineChatController = class InlineChatController {
                 responsePromise.complete();
                 return;
             }
-            const edits = response.edits.get(this._session.textModelN.uri) ?? [];
+            const edits = ( (response.response.value.map(part => {
+                if (part.kind === 'textEditGroup' && isEqual(part.uri, this._session?.textModelN.uri)) {
+                    return part.edits;
+                }
+                else {
+                    return [];
+                }
+            }))).flat();
             const newEdits = edits.slice(lastLength);
             if (newEdits.length === 0) {
                 return;
@@ -529,7 +544,9 @@ let InlineChatController = class InlineChatController {
             progressiveEditsClock.reset();
             progressiveEditsQueue.queue(async () => {
                 const startThen = this._session.wholeRange.value.getStartPosition();
-                await this._makeChanges(newEdits, { duration: progressiveEditsAvgDuration.value, token: progressiveEditsCts.token });
+                for (const edits of newEdits) {
+                    await this._makeChanges(edits, { duration: progressiveEditsAvgDuration.value, token: progressiveEditsCts.token });
+                }
                 const startNow = this._session.wholeRange.value.getStartPosition();
                 if (!startNow.equals(startThen) || !this._zone.value.position?.equals(startNow)) {
                     this._showWidget(false, startNow.delta(-1));
@@ -553,28 +570,19 @@ let InlineChatController = class InlineChatController {
             return "DONE" ;
         }
         else {
-            return "APPLY_RESPONSE" ;
-        }
-    }
-    async ["APPLY_RESPONSE" ]() {
-        assertType(this._session);
-        assertType(this._strategy);
-        const { response } = this._session.lastExchange;
-        if (response instanceof ReplyResponse && response.workspaceEdit) {
-            this._bulkEditService.apply(response.workspaceEdit, { showPreview: true });
-            return "CANCEL" ;
+            return "SHOW_RESPONSE" ;
         }
-        return "SHOW_RESPONSE" ;
     }
     async ["SHOW_RESPONSE" ]() {
         assertType(this._session);
         assertType(this._strategy);
         const { response } = this._session.lastExchange;
         let responseTypes;
-        for (const { response } of this._session.exchanges) {
-            const thisType = response instanceof ReplyResponse
-                ? response.responseType
-                : undefined;
+        for (const request of this._session.chatModel.getRequests()) {
+            if (!request.response) {
+                continue;
+            }
+            const thisType = asInlineChatResponseType(request.response.response);
             if (responseTypes === undefined) {
                 responseTypes = thisType;
             }
@@ -594,6 +602,7 @@ let InlineChatController = class InlineChatController {
         else if (response instanceof ErrorResponse) {
             if (!response.isCancellation) {
                 this._zone.value.widget.updateStatus(response.message, { classes: ['error'] });
+                this._strategy?.cancel();
             }
         }
         else if (response instanceof ReplyResponse) {
@@ -710,7 +719,7 @@ let InlineChatController = class InlineChatController {
         else {
             this._input.value.hide();
             this._zone.value.show(widgetPosition);
-            if (this._session && this._zone.value.widget.chatWidget.viewModel?.model !== this._session.chatModel) {
+            if (this._session) {
                 this._zone.value.widget.setChatModel(this._session.chatModel);
             }
         }
@@ -797,32 +806,6 @@ let InlineChatController = class InlineChatController {
             ? this._input.value.value
             : this._zone.value.widget.value;
     }
-    async rerun(opts) {
-        if (this._session?.lastExchange && this._strategy) {
-            const { lastExchange } = this._session;
-            const request = tail(this._session.chatModel.getRequests());
-            if (!request || !request.response?.isComplete) {
-                return;
-            }
-            this._session.chatModel.removeRequest(request.id);
-            if (lastExchange.response instanceof ReplyResponse) {
-                try {
-                    this._session.hunkData.ignoreTextModelNChanges = true;
-                    await this._strategy.undoChanges(lastExchange.response.modelAltVersionId);
-                }
-                finally {
-                    this._session.hunkData.ignoreTextModelNChanges = false;
-                }
-            }
-            if (opts.retry) {
-                this._nextAttempt = lastExchange.prompt.attempt + 1;
-            }
-            if (opts.withoutIntentDetection) {
-                this._nextWithIntentDetection = false;
-            }
-            this._zone.value.widget.chatWidget.acceptInput(request.message.text);
-        }
-    }
     cancelCurrentRequest() {
         this._messages.fire(16  | 8 );
     }
@@ -853,28 +836,24 @@ let InlineChatController = class InlineChatController {
     toggleDiff() {
         this._strategy?.toggleDiff?.();
     }
-    feedbackLast(kind) {
-        if (this._session?.lastExchange && this._session.lastExchange.response instanceof ReplyResponse) {
-            this._session.provider.handleInlineChatResponseFeedback?.(this._session.session, this._session.lastExchange.response.raw, kind);
-            switch (kind) {
-                case 1 :
-                    this._ctxLastFeedbackKind.set('helpful');
-                    break;
-                case 0 :
-                    this._ctxLastFeedbackKind.set('unhelpful');
-                    break;
-            }
-            this._zone.value.widget.updateStatus('Thank you for your feedback!', { resetAfter: 1250 });
-        }
-    }
     createSnapshot() {
         if (this._session && !this._session.textModel0.equalsTextBuffer(this._session.textModelN.getTextBuffer())) {
             this._session.createSnapshot();
         }
     }
     acceptSession() {
-        if (this._session?.lastExchange && this._session.lastExchange.response instanceof ReplyResponse) {
-            this._session.provider.handleInlineChatResponseFeedback?.(this._session.session, this._session.lastExchange.response.raw, 3 );
+        if (this._session?.lastExchange?.response instanceof ReplyResponse && this._session?.lastExchange?.response.chatResponse) {
+            const response = this._session?.lastExchange?.response.chatResponse;
+            this._chatService.notifyUserAction({
+                sessionId: response.session.sessionId,
+                requestId: response.requestId,
+                agentId: response.agent?.id,
+                result: response.result,
+                action: {
+                    kind: 'inlineChat',
+                    action: 'accepted'
+                }
+            });
         }
         this._messages.fire(1 );
     }
@@ -889,8 +868,18 @@ let InlineChatController = class InlineChatController {
         if (this._session) {
             const diff = await this._editorWorkerService.computeDiff(this._session.textModel0.uri, this._session.textModelN.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: 5000, computeMoves: false }, 'advanced');
             result = this._session.asChangedText(diff?.changes ?? []);
-            if (this._session.lastExchange && this._session.lastExchange.response instanceof ReplyResponse) {
-                this._session.provider.handleInlineChatResponseFeedback?.(this._session.session, this._session.lastExchange.response.raw, 2 );
+            if (this._session.lastExchange?.response instanceof ReplyResponse && this._session?.lastExchange?.response.chatResponse) {
+                const response = this._session?.lastExchange?.response.chatResponse;
+                this._chatService.notifyUserAction({
+                    sessionId: response.session.sessionId,
+                    requestId: response.requestId,
+                    agentId: response.agent?.id,
+                    result: response.result,
+                    action: {
+                        kind: 'inlineChat',
+                        action: 'discarded'
+                    }
+                });
             }
         }
         this._messages.fire(2 );
@@ -930,10 +919,9 @@ InlineChatController = ( (__decorate([
     ( (__param(8, IContextKeyService))),
     ( (__param(9, IChatAgentService))),
     ( (__param(10, IChatService))),
-    ( (__param(11, IBulkEditService))),
-    ( (__param(12, ICommandService))),
-    ( (__param(13, ILanguageFeaturesService))),
-    ( (__param(14, IChatWidgetService)))
+    ( (__param(11, ICommandService))),
+    ( (__param(12, ILanguageFeaturesService))),
+    ( (__param(13, IChatWidgetService)))
 ], InlineChatController)));
 async function showMessageResponse(accessor, query, response) {
     const chatService = accessor.get(IChatService);
@@ -942,25 +930,45 @@ async function showMessageResponse(accessor, query, response) {
     if (!agent) {
         return;
     }
-    const chatWidgetService = accessor.get(IChatWidgetService);
-    const widget = await chatWidgetService.revealViewForProvider(agent.name);
+    const widget = await showChatView(accessor.get(IViewsService));
     if (widget && widget.viewModel) {
-        chatService.addCompleteRequest(widget.viewModel.sessionId, query, undefined, { message: response });
+        chatService.addCompleteRequest(widget.viewModel.sessionId, query, undefined, 0, { message: response });
         widget.focusLastMessage();
     }
 }
 async function sendRequest(accessor, query) {
-    const widgetService = accessor.get(IChatWidgetService);
     const chatAgentService = accessor.get(IChatAgentService);
     const agent = chatAgentService.getActivatedAgents().find(agent => agent.locations.includes(ChatAgentLocation.Panel) && agent.isDefault);
     if (!agent) {
         return;
     }
-    const widget = await widgetService.revealViewForProvider(agent.name);
+    const widget = await showChatView(accessor.get(IViewsService));
     if (!widget) {
         return;
     }
     widget.focusInput();
     widget.acceptInput(query);
 }
+function asInlineChatResponseType(response) {
+    let result;
+    for (const item of response.value) {
+        let thisType;
+        switch (item.kind) {
+            case 'textEditGroup':
+                thisType = "onlyEdits" ;
+                break;
+            case 'markdownContent':
+            default:
+                thisType = "onlyMessages" ;
+                break;
+        }
+        if (result === undefined) {
+            result = thisType;
+        }
+        else if (result !== thisType) {
+            return "mixed" ;
+        }
+    }
+    return result ?? "empty" ;
+}
 export { InlineChatController, InlineChatRunOptions };

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

@@ -14,8 +14,8 @@ 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 { LineRange } from '../../../../editor/common/core/lineRange.js';
 import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
-import { asRange } from './utils.js';
 import { coalesceInPlace } from '../../../../base/common/arrays.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
@@ -145,10 +145,6 @@ class Session {
         this._isUnstashed = false;
         const newLen = this._exchange.push(exchange);
         this._teldata.rounds += `${newLen}|`;
-        this._teldata.responseTypes += `${exchange.response instanceof ReplyResponse ? exchange.response.responseType : "empty" }|`;
-    }
-    get exchanges() {
-        return this._exchange;
     }
     get lastExchange() {
         return this._exchange[this._exchange.length - 1];
@@ -202,10 +198,8 @@ class Session {
     }
 }
 class SessionPrompt {
-    constructor(value, attempt, withIntentDetection) {
+    constructor(value) {
         this.value = value;
-        this.attempt = attempt;
-        this.withIntentDetection = withIntentDetection;
     }
 }
 class SessionExchange {
@@ -224,11 +218,12 @@ class ErrorResponse {
     }
 }
 let ReplyResponse = class ReplyResponse {
-    constructor(raw, mdContent, localUri, modelAltVersionId, progressEdits, requestId, _textFileService, _languageService) {
+    constructor(raw, mdContent, localUri, modelAltVersionId, progressEdits, requestId, chatResponse, _textFileService, _languageService) {
         this.raw = raw;
         this.mdContent = mdContent;
         this.modelAltVersionId = modelAltVersionId;
         this.requestId = requestId;
+        this.chatResponse = chatResponse;
         this._textFileService = _textFileService;
         this._languageService = _languageService;
         this.allLocalEdits = [];
@@ -275,10 +270,7 @@ let ReplyResponse = class ReplyResponse {
                     languageId: langSelection.languageId
                 });
                 this.untitledTextModel = untitledTextModel;
-                untitledTextModel.resolve().then(async () => {
-                    const model = untitledTextModel.textEditorModel;
-                    model.applyEdits(( flatEdits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text))));
-                });
+                untitledTextModel.resolve();
             }
         }
         this.allLocalEdits = editsMap.get(localUri) ?? [];
@@ -291,25 +283,11 @@ let ReplyResponse = class ReplyResponse {
             }
             this.workspaceEdit = { edits: workspaceEdits };
         }
-        const hasEdits = editsMap.size > 0;
-        const hasMessage = mdContent.value.length > 0;
-        if (hasEdits && hasMessage) {
-            this.responseType = "mixed" ;
-        }
-        else if (hasEdits) {
-            this.responseType = "onlyEdits" ;
-        }
-        else if (hasMessage) {
-            this.responseType = "onlyMessages" ;
-        }
-        else {
-            this.responseType = "empty" ;
-        }
     }
 };
 ReplyResponse = ( __decorate([
-    ( __param(6, ITextFileService)),
-    ( __param(7, ILanguageService))
+    ( __param(7, ITextFileService)),
+    ( __param(8, ILanguageService))
 ], ReplyResponse));
 let StashedSession = class StashedSession {
     constructor(editor, session, _undoCancelEdits, contextKeyService, _sessionService, _logService) {
@@ -485,8 +463,8 @@ let HunkData = class HunkData {
                 for (const hunk of hunks) {
                     const textModelNDecorations = [];
                     const textModel0Decorations = [];
-                    textModelNDecorations.push(accessorN.addDecoration(asRange(hunk.modified, this._textModelN), HunkData_1._HUNK_TRACKED_RANGE));
-                    textModel0Decorations.push(accessor0.addDecoration(asRange(hunk.original, this._textModel0), HunkData_1._HUNK_TRACKED_RANGE));
+                    textModelNDecorations.push(accessorN.addDecoration(LineRange.asRange(hunk.modified, this._textModelN), HunkData_1._HUNK_TRACKED_RANGE));
+                    textModel0Decorations.push(accessor0.addDecoration(LineRange.asRange(hunk.original, this._textModel0), HunkData_1._HUNK_TRACKED_RANGE));
                     for (const change of hunk.changes) {
                         textModelNDecorations.push(accessorN.addDecoration(change.modifiedRange, HunkData_1._HUNK_TRACKED_RANGE));
                         textModel0Decorations.push(accessor0.addDecoration(change.originalRange, HunkData_1._HUNK_TRACKED_RANGE));