@codingame/monaco-vscode-api 4.5.1 → 5.0.0

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,9 @@ 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) {
         const { initialSelection, initialRange, message, autoSend, position, existingSession } = options;
@@ -60,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;
@@ -71,21 +74,18 @@ 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;
         this._isDisposed = false;
-        this._store = ( new DisposableStore());
-        this._messages = this._store.add(( new Emitter()));
-        this._onWillStartSession = this._store.add(( new Emitter()));
+        this._store = ( (new DisposableStore()));
+        this._messages = this._store.add(( (new Emitter())));
+        this._onWillStartSession = this._store.add(( (new Emitter())));
         this.onWillStartSession = this._onWillStartSession.event;
         this.onDidAcceptInput = Event.filter(this._messages.event, m => m === 32 , this._store);
         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._sessionStore = this._store.add(( (new DisposableStore())));
+        this._stashedSession = this._store.add(( (new MutableDisposable())));
         this._forcedPlaceholder = undefined;
         this._ctxVisible = CTX_INLINE_CHAT_VISIBLE.bindTo(contextKeyService);
         this._ctxDidEdit = CTX_INLINE_CHAT_DID_EDIT.bindTo(contextKeyService);
@@ -93,12 +93,12 @@ let InlineChatController = class InlineChatController {
         this._ctxResponseTypes = CTX_INLINE_CHAT_RESPONSE_TYPES.bindTo(contextKeyService);
         this._ctxLastFeedbackKind = CTX_INLINE_CHAT_LAST_FEEDBACK.bindTo(contextKeyService);
         this._ctxSupportIssueReporting = CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING.bindTo(contextKeyService);
-        this._input = ( new Lazy(
+        this._input = ( (new Lazy(
             () => this._store.add(_instaService.createInstance(InlineChatContentWidget, this._editor))
-        ));
-        this._zone = ( new Lazy(
+        )));
+        this._zone = ( (new Lazy(
             () => this._store.add(_instaService.createInstance(InlineChatZoneWidget, this._editor))
-        ));
+        )));
         this._store.add(this._editor.onDidChangeModel(async (e) => {
             if (this._session || !e.newModelUrl) {
                 return;
@@ -129,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;
@@ -197,23 +199,15 @@ let InlineChatController = class InlineChatController {
             delete options.position;
         }
         const widgetPosition = this._showWidget(true, initPosition);
-        let errorMessage = ( localizeWithPath(
-            'vs/workbench/contrib/inlineChat/browser/inlineChatController',
-            'create.fail',
-            "Failed to start editor chat"
-        ));
+        let errorMessage = ( localizeWithPath(_moduleId, 0, "Failed to start editor chat"));
         if (!session) {
-            const createSessionCts = ( new CancellationTokenSource());
+            const createSessionCts = ( (new CancellationTokenSource()));
             const msgListener = Event.once(this._messages.event)(m => {
                 this._log('state=_createSession) message received', m);
                 if (m === 32 ) {
                     options.autoSend = true;
                     this._zone.value.widget.updateProgress(true);
-                    this._zone.value.widget.updateInfo(( localizeWithPath(
-                        'vs/workbench/contrib/inlineChat/browser/inlineChatController',
-                        'welcome.2',
-                        "Getting ready..."
-                    )));
+                    this._zone.value.widget.updateInfo(( localizeWithPath(_moduleId, 1, "Getting ready...")));
                 }
                 else {
                     createSessionCts.cancel();
@@ -243,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);
@@ -252,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" ;
     }
@@ -274,15 +266,11 @@ let InlineChatController = class InlineChatController {
         this._sessionStore.add(this._input.value.onDidBlur(() => this.cancelSession()));
         this._input.value.setSession(this._session);
         this._updatePlaceholder();
-        const message = this._session.session.message ?? ( localizeWithPath(
-            'vs/workbench/contrib/inlineChat/browser/inlineChatController',
-            'welcome.1',
-            "AI-generated code may be incorrect"
-        ));
+        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);
@@ -309,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(() => {
@@ -319,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 }, {
@@ -342,7 +341,7 @@ let InlineChatController = class InlineChatController {
                         label: { label: withSlash, description: command.detail ?? '' },
                         kind: 18 ,
                         insertText: withSlash,
-                        range: Range.fromPositions(( new Position(1, 1)), position),
+                        range: Range.fromPositions(( (new Position(1, 1))), position),
                         command: command.executeImmediately ? { id: 'workbench.action.chat.acceptInput', title: withSlash } : undefined
                     });
                 }
@@ -356,7 +355,7 @@ let InlineChatController = class InlineChatController {
                 const firstLine = model.getLineContent(1);
                 if (firstLine.startsWith(withSlash)) {
                     newDecorations.push({
-                        range: ( new Range(1, 1, 1, withSlash.length + 1)),
+                        range: ( (new Range(1, 1, 1, withSlash.length + 1))),
                         options: {
                             description: 'inline-chat-slash-command',
                             inlineClassName: 'inline-chat-slash-command',
@@ -367,7 +366,7 @@ let InlineChatController = class InlineChatController {
                     });
                     if (firstLine.trim() === `/${command.command}`) {
                         newDecorations.push({
-                            range: ( new Range(1, withSlash.length, 1, withSlash.length)),
+                            range: ( (new Range(1, withSlash.length, 1, withSlash.length))),
                             options: {
                                 description: 'inline-chat-slash-command-detail',
                                 after: {
@@ -392,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" ;
@@ -415,8 +414,8 @@ let InlineChatController = class InlineChatController {
         }
         let message = 0 ;
         let request;
-        const barrier = ( new Barrier());
-        const store = ( new DisposableStore());
+        const barrier = ( (new Barrier()));
+        const store = ( (new DisposableStore()));
         store.add(this._session.chatModel.onDidChange(e => {
             if (e.kind === 'addRequest') {
                 request = e.request;
@@ -460,7 +459,11 @@ let InlineChatController = class InlineChatController {
                     return true;
                 }
                 if (request?.message.text.startsWith(`/${value.command}`)) {
-                    slashCommandLike = ( new ChatRequestSlashCommandPart(( new OffsetRange(0, 1)), ( new Range(1, 1, 1, 1)), { command: value.command, detail: value.detail ?? '' }));
+                    slashCommandLike = ( (new ChatRequestSlashCommandPart(
+                         (new OffsetRange(0, 1)),
+                         (new Range(1, 1, 1, 1)),
+                        { command: value.command, detail: value.detail ?? '' }
+                    )));
                     return true;
                 }
             }
@@ -484,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);
@@ -500,12 +501,12 @@ let InlineChatController = class InlineChatController {
         this._zone.value.widget.selectAll(false);
         this._zone.value.widget.updateInfo('');
         const { response } = request;
-        const responsePromise = ( new DeferredPromise());
-        const store = ( new DisposableStore());
-        const progressiveEditsCts = store.add(( new CancellationTokenSource()));
-        const progressiveEditsAvgDuration = ( new MovingAverage());
+        const responsePromise = ( (new DeferredPromise()));
+        const store = ( (new DisposableStore()));
+        const progressiveEditsCts = store.add(( (new CancellationTokenSource())));
+        const progressiveEditsAvgDuration = ( (new MovingAverage()));
         const progressiveEditsClock = StopWatch.create();
-        const progressiveEditsQueue = ( new Queue());
+        const progressiveEditsQueue = ( (new Queue()));
         let lastLength = 0;
         let message = 0 ;
         store.add(Event.once(this._messages.event)(m => {
@@ -526,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;
@@ -536,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));
@@ -560,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,17 +595,14 @@ let InlineChatController = class InlineChatController {
         this._ctxDidEdit.set(this._session.hasChangedText);
         let newPosition;
         if (response instanceof EmptyResponse) {
-            const status = ( localizeWithPath(
-                'vs/workbench/contrib/inlineChat/browser/inlineChatController',
-                'empty',
-                "No results, please refine your input and try again"
-            ));
+            const status = ( localizeWithPath(_moduleId, 3, "No results, please refine your input and try again"));
             this._zone.value.widget.updateStatus(status, { classes: ['warn'] });
             return "WAIT_FOR_INPUT" ;
         }
         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) {
@@ -612,7 +610,7 @@ let InlineChatController = class InlineChatController {
             this._zone.value.widget.updateToolbar(true);
             newPosition = await this._strategy.renderChanges(response);
             if (this._session.provider.provideFollowups) {
-                const followupCts = ( new CancellationTokenSource());
+                const followupCts = ( (new CancellationTokenSource()));
                 const msgListener = Event.once(this._messages.event)(() => {
                     followupCts.cancel();
                 });
@@ -653,12 +651,7 @@ let InlineChatController = class InlineChatController {
             await this._strategy.apply();
         }
         catch (err) {
-            this._dialogService.error(( localizeWithPath(
-                'vs/workbench/contrib/inlineChat/browser/inlineChatController',
-                'err.apply',
-                "Failed to apply changes.",
-                toErrorMessage(err)
-            )));
+            this._dialogService.error(( localizeWithPath(_moduleId, 4, "Failed to apply changes.", toErrorMessage(err))));
             this._log('FAILED to apply changes');
             this._log(err);
         }
@@ -678,12 +671,7 @@ let InlineChatController = class InlineChatController {
                 undoCancelEdits = this._strategy.cancel();
             }
             catch (err) {
-                this._dialogService.error(( localizeWithPath(
-                    'vs/workbench/contrib/inlineChat/browser/inlineChatController',
-                    'err.discard',
-                    "Failed to discard changes.",
-                    toErrorMessage(err)
-                )));
+                this._dialogService.error(( localizeWithPath(_moduleId, 5, "Failed to discard changes.", toErrorMessage(err))));
                 this._log('FAILED to discard changes');
                 this._log(err);
             }
@@ -731,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);
             }
         }
@@ -763,7 +751,7 @@ let InlineChatController = class InlineChatController {
             return;
         }
         const actualEdits = !opts && moreMinimalEdits ? moreMinimalEdits : edits;
-        const editOperations = ( actualEdits.map(TextEdit.asEditOperation));
+        const editOperations = ( (actualEdits.map(TextEdit.asEditOperation)));
         const editsObserver = {
             start: () => this._session.hunkData.ignoreTextModelNChanges = true,
             stop: () => this._session.hunkData.ignoreTextModelNChanges = false,
@@ -785,11 +773,7 @@ let InlineChatController = class InlineChatController {
         return this._forcedPlaceholder ?? this._session?.session.placeholder ?? '';
     }
     showSaveHint() {
-        const status = ( localizeWithPath(
-            'vs/workbench/contrib/inlineChat/browser/inlineChatController',
-            'savehint',
-            "Accept or discard changes to continue saving"
-        ));
+        const status = ( localizeWithPath(_moduleId, 6, "Accept or discard changes to continue saving"));
         this._zone.value.widget.updateStatus(status, { classes: ['warn'] });
     }
     setPlaceholder(text) {
@@ -812,7 +796,7 @@ let InlineChatController = class InlineChatController {
         this._input.value.chatWidget.setInput(text);
         this._zone.value.widget.chatWidget.setInput(text);
         if (selectAll) {
-            const newSelection = ( new Selection(1, 1, Number.MAX_SAFE_INTEGER, 1));
+            const newSelection = ( (new Selection(1, 1, Number.MAX_SAFE_INTEGER, 1)));
             this._input.value.chatWidget.inputEditor.setSelection(newSelection);
             this._zone.value.widget.chatWidget.inputEditor.setSelection(newSelection);
         }
@@ -822,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 );
     }
@@ -878,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 );
     }
@@ -914,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 );
@@ -944,22 +908,21 @@ let InlineChatController = class InlineChatController {
         return this._currentRun;
     }
 };
-InlineChatController = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IInlineChatSessionService)),
-    ( __param(3, IInlineChatSavingService)),
-    ( __param(4, IEditorWorkerService)),
-    ( __param(5, ILogService)),
-    ( __param(6, IConfigurationService)),
-    ( __param(7, IDialogService)),
-    ( __param(8, IContextKeyService)),
-    ( __param(9, IChatAgentService)),
-    ( __param(10, IChatService)),
-    ( __param(11, IBulkEditService)),
-    ( __param(12, ICommandService)),
-    ( __param(13, ILanguageFeaturesService)),
-    ( __param(14, IChatWidgetService))
-], InlineChatController));
+InlineChatController = ( (__decorate([
+    ( (__param(1, IInstantiationService))),
+    ( (__param(2, IInlineChatSessionService))),
+    ( (__param(3, IInlineChatSavingService))),
+    ( (__param(4, IEditorWorkerService))),
+    ( (__param(5, ILogService))),
+    ( (__param(6, IConfigurationService))),
+    ( (__param(7, IDialogService))),
+    ( (__param(8, IContextKeyService))),
+    ( (__param(9, IChatAgentService))),
+    ( (__param(10, IChatService))),
+    ( (__param(11, ICommandService))),
+    ( (__param(12, ILanguageFeaturesService))),
+    ( (__param(13, IChatWidgetService)))
+], InlineChatController)));
 async function showMessageResponse(accessor, query, response) {
     const chatService = accessor.get(IChatService);
     const chatAgentService = accessor.get(IChatAgentService);
@@ -967,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 };