@codingame/monaco-vscode-api 10.1.4 → 11.0.1

package/vscode/src/vs/workbench/contrib/format/browser/formatActionsNone.js

@@ -7,6 +7,7 @@ import { INotificationService } from '../../../../platform/notification/common/n
 import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.service.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+
 registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
     constructor() {
         super({

package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js

@@ -13,6 +13,7 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { Progress } from '../../../../platform/progress/common/progress.js';
 import { getOriginalResource } from '../../scm/browser/dirtydiffDecorator.js';
 import { IQuickDiffService } from '../../scm/common/quickDiff.service.js';
+
 registerEditorAction(class FormatModifiedAction extends EditorAction {
     constructor() {
         super({
@@ -68,4 +69,5 @@ async function getModifiedRanges(accessor, modified) {
     }
     return ranges;
 }
+
 export { getModifiedRanges };

package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { clearNode, reset, addDisposableListener } from '../../../../base/browser/dom.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
-import { registerEditorContribution, EditorAction2 } from '../../../../editor/browser/editorExtensions.js';
+import { EditorAction2, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { asCommandLink } from '../../../../editor/contrib/inlayHints/browser/inlayHints.js';
 import { InlayHintsController } from '../../../../editor/contrib/inlayHints/browser/inlayHintsController.js';
@@ -14,13 +14,14 @@ import { RawContextKey } from '../../../../platform/contextkey/common/contextkey
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { Link } from '../../../../platform/opener/browser/link.js';
+
 var InlayHintsAccessibility_1;
 let InlayHintsAccessibility = class InlayHintsAccessibility {
     static { InlayHintsAccessibility_1 = this; }
     static { this.IsReading = ( (new RawContextKey(
         'isReadingLineWithInlayHints',
         false,
-        { type: 'boolean', description: ( localize(668, "Whether the current line and its inlay hints are currently focused")) }
+        { type: 'boolean', description: ( localize(664, "Whether the current line and its inlay hints are currently focused")) }
     ))); }
     static { this.ID = 'editor.contrib.InlayHintsAccessibility'; }
     static get(editor) {
@@ -35,7 +36,7 @@ let InlayHintsAccessibility = class InlayHintsAccessibility {
         this._ariaElement.style.position = 'fixed';
         this._ariaElement.className = 'inlayhint-accessibility-element';
         this._ariaElement.tabIndex = 0;
-        this._ariaElement.setAttribute('aria-description', ( localize(669, "Code with Inlay Hint Information")));
+        this._ariaElement.setAttribute('aria-description', ( localize(665, "Code with Inlay Hint Information")));
         this._ctxIsReading = InlayHintsAccessibility_1.IsReading.bindTo(contextKeyService);
     }
     dispose() {
@@ -135,7 +136,7 @@ registerAction2(class StartReadHints extends EditorAction2 {
     constructor() {
         super({
             id: 'inlayHints.startReadingLineWithHint',
-            title: ( localize2(670, "Read Line With Inline Hints")),
+            title: ( localize2(666, "Read Line With Inline Hints")),
             precondition: EditorContextKeys.hasInlayHintsProvider,
             f1: true
         });
@@ -149,7 +150,7 @@ registerAction2(class StopReadHints extends EditorAction2 {
     constructor() {
         super({
             id: 'inlayHints.stopReadingLineWithHint',
-            title: ( localize2(671, "Stop Inlay Hints Reading")),
+            title: ( localize2(667, "Stop Inlay Hints Reading")),
             precondition: InlayHintsAccessibility.IsReading,
             f1: true,
             keybinding: {
@@ -164,4 +165,5 @@ registerAction2(class StopReadHints extends EditorAction2 {
     }
 });
 registerEditorContribution(InlayHintsAccessibility.ID, InlayHintsAccessibility, 4 );
+
 export { InlayHintsAccessibility };

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

@@ -6,8 +6,8 @@ import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diff
 import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { InlineChatController, InlineChatRunOptions } from './inlineChatController.js';
-import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_POSSIBLE, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDIT_MODE, MENU_INLINE_CHAT_WIDGET_STATUS, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_TYPE, MENU_INLINE_CHAT_ZONE, ACTION_DISCARD_CHANGES, ACTION_REGENERATE_RESPONSE, ACTION_VIEW_IN_CHAT, ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF } from '../common/inlineChat.js';
-import { localize2, localize } from '../../../../nls.js';
+import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_POSSIBLE, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDIT_MODE, MENU_INLINE_CHAT_WIDGET_STATUS, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_TYPE, MENU_INLINE_CHAT_ZONE, ACTION_DISCARD_CHANGES, ACTION_REGENERATE_RESPONSE, ACTION_VIEW_IN_CHAT, ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { localize, localize2 } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import '../../../../platform/instantiation/common/instantiation.js';
@@ -20,14 +20,16 @@ import { IPreferencesService } from '../../../services/preferences/common/prefer
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { IChatService } from '../../chat/common/chatService.service.js';
 import { CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_IN_CHAT_INPUT } from '../../chat/common/chatContextKeys.js';
+import { IChatWidgetService } from '../../chat/browser/chat.service.js';
+
 CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
 CommandsRegistry.registerCommandAlias('interactive.acceptChanges', ACTION_ACCEPT_CHANGES);
-const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( localize(7382, 'Icon which spawns the inline chat from the editor toolbar.')));
+const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( localize(7680, 'Icon which spawns the inline chat from the editor toolbar.')));
 class StartSessionAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.start',
-            title: ( localize2(7383, 'Editor Inline Chat')),
+            title: ( localize2(7681, 'Editor Inline Chat')),
             category: AbstractInlineChatAction.category,
             f1: true,
             precondition: ( (ContextKeyExpr.and(
@@ -66,7 +68,7 @@ class UnstashSessionAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.unstash',
-            title: ( localize2(7384, "Resume Last Dismissed Inline Chat")),
+            title: ( localize2(7682, "Resume Last Dismissed Inline Chat")),
             category: AbstractInlineChatAction.category,
             precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_STASHED_SESSION, EditorContextKeys.writable))),
             keybinding: {
@@ -89,7 +91,7 @@ class UnstashSessionAction extends EditorAction2 {
     }
 }
 class AbstractInlineChatAction extends EditorAction2 {
-    static { this.category = ( localize2(7385, "Inline Chat")); }
+    static { this.category = ( localize2(7683, "Inline Chat")); }
     constructor(desc) {
         super({
             ...desc,
@@ -135,7 +137,7 @@ class ArrowOutUpAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.arrowOutUp',
-            title: ( localize(7386, 'Cursor Up')),
+            title: ( localize(7684, 'Cursor Up')),
             precondition: ( (ContextKeyExpr.and(
                 CTX_INLINE_CHAT_FOCUSED,
                 CTX_INLINE_CHAT_INNER_CURSOR_FIRST,
@@ -156,7 +158,7 @@ class ArrowOutDownAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.arrowOutDown',
-            title: ( localize(7387, 'Cursor Down')),
+            title: ( localize(7685, 'Cursor Down')),
             precondition: ( (ContextKeyExpr.and(
                 CTX_INLINE_CHAT_FOCUSED,
                 CTX_INLINE_CHAT_INNER_CURSOR_LAST,
@@ -177,7 +179,7 @@ class FocusInlineChat extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.focus',
-            title: ( localize2(7388, "Focus Input")),
+            title: ( localize2(7686, "Focus Input")),
             f1: true,
             category: AbstractInlineChatAction.category,
             precondition: ( (ContextKeyExpr.and(
@@ -207,30 +209,12 @@ class FocusInlineChat extends EditorAction2 {
         InlineChatController.get(editor)?.focus();
     }
 }
-class DiscardAction extends AbstractInlineChatAction {
-    constructor() {
-        super({
-            id: 'inlineChat.discard',
-            title: ( localize(7389, 'Discard')),
-            icon: Codicon.discard,
-            precondition: CTX_INLINE_CHAT_VISIBLE,
-            keybinding: {
-                weight: 100  - 1,
-                primary: 9 ,
-                when: ( (CTX_INLINE_CHAT_USER_DID_EDIT.negate()))
-            }
-        });
-    }
-    async runInlineChatCommand(_accessor, ctrl, _editor, ..._args) {
-        await ctrl.cancelSession();
-    }
-}
 class AcceptChanges extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_ACCEPT_CHANGES,
-            title: ( localize2(7390, "Accept Changes")),
-            shortTitle: ( localize(7391, 'Accept')),
+            title: ( localize2(7687, "Accept Changes")),
+            shortTitle: ( localize(7688, 'Accept')),
             icon: Codicon.check,
             f1: true,
             precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE,  (ContextKeyExpr.or(
@@ -265,7 +249,7 @@ class DiscardHunkAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_DISCARD_CHANGES,
-            title: ( localize(7389, 'Discard')),
+            title: ( localize(7689, 'Discard')),
             icon: Codicon.chromeClose,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: [{
@@ -284,7 +268,7 @@ class DiscardHunkAction extends AbstractInlineChatAction {
                     order: 2
                 }],
             keybinding: {
-                weight: 200 ,
+                weight: 100 ,
                 primary: 9 ,
                 when: ( (CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo("messagesAndEdits" )))
             }
@@ -298,8 +282,8 @@ class RerunAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_REGENERATE_RESPONSE,
-            title: ( localize2(7392, "Rerun Request")),
-            shortTitle: ( localize(7393, 'Rerun')),
+            title: ( localize2(7690, "Rerun Request")),
+            shortTitle: ( localize(7691, 'Rerun')),
             f1: false,
             icon: Codicon.refresh,
             precondition: CTX_INLINE_CHAT_VISIBLE,
@@ -321,10 +305,20 @@ class RerunAction extends AbstractInlineChatAction {
     }
     async runInlineChatCommand(accessor, ctrl, _editor, ..._args) {
         const chatService = accessor.get(IChatService);
+        const chatWidgetService = accessor.get(IChatWidgetService);
         const model = ctrl.chatWidget.viewModel?.model;
-        const lastRequest = model?.getRequests().at(-1);
+        if (!model) {
+            return;
+        }
+        const lastRequest = model.getRequests().at(-1);
         if (lastRequest) {
-            await chatService.resendRequest(lastRequest, { noCommandDetection: false, attempt: lastRequest.attempt + 1, location: ctrl.chatWidget.location });
+            const widget = chatWidgetService.getWidgetBySessionId(model.sessionId);
+            await chatService.resendRequest(lastRequest, {
+                noCommandDetection: false,
+                attempt: lastRequest.attempt + 1,
+                location: ctrl.chatWidget.location,
+                userSelectedModelId: widget?.input.currentLanguageModel
+            });
         }
     }
 }
@@ -332,11 +326,11 @@ class CloseAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.close',
-            title: ( localize(7394, 'Close')),
+            title: ( localize(7692, 'Close')),
             icon: Codicon.close,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
-                weight: 200 ,
+                weight: 100  + 1,
                 primary: 9 ,
             },
             menu: [{
@@ -361,7 +355,7 @@ class ConfigureInlineChatAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.configure',
-            title: ( localize2(7395, 'Configure Inline Chat')),
+            title: ( localize2(7693, 'Configure Inline Chat')),
             icon: Codicon.settingsGear,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             f1: true,
@@ -380,7 +374,7 @@ class MoveToNextHunk extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToNextHunk',
-            title: ( localize2(7396, 'Move to Next Change')),
+            title: ( localize2(7694, 'Move to Next Change')),
             precondition: CTX_INLINE_CHAT_VISIBLE,
             f1: true,
             keybinding: {
@@ -397,7 +391,7 @@ class MoveToPreviousHunk extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToPreviousHunk',
-            title: ( localize2(7397, 'Move to Previous Change')),
+            title: ( localize2(7695, 'Move to Previous Change')),
             f1: true,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -414,7 +408,7 @@ class ViewInChatAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_VIEW_IN_CHAT,
-            title: ( localize(7398, 'View in Chat')),
+            title: ( localize(7696, 'View in Chat')),
             icon: Codicon.commentDiscussion,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: [{
@@ -452,7 +446,7 @@ class ToggleDiffForChange extends AbstractInlineChatAction {
                  (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("live" )),
                 CTX_INLINE_CHAT_CHANGE_HAS_DIFF
             ))),
-            title: ( localize2(7399, 'Toggle Changes')),
+            title: ( localize2(7697, 'Toggle Changes')),
             icon: Codicon.diffSingle,
             toggled: {
                 condition: CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF,
@@ -476,4 +470,5 @@ class ToggleDiffForChange extends AbstractInlineChatAction {
         ctrl.toggleDiff(hunkInfo);
     }
 }
-export { AbstractInlineChatAction, AcceptChanges, ArrowOutDownAction, ArrowOutUpAction, CloseAction, ConfigureInlineChatAction, DiscardAction, DiscardHunkAction, FocusInlineChat, MoveToNextHunk, MoveToPreviousHunk, RerunAction, START_INLINE_CHAT, StartSessionAction, ToggleDiffForChange, UnstashSessionAction, ViewInChatAction };
+
+export { AbstractInlineChatAction, AcceptChanges, ArrowOutDownAction, ArrowOutUpAction, CloseAction, ConfigureInlineChatAction, DiscardHunkAction, FocusInlineChat, MoveToNextHunk, MoveToPreviousHunk, RerunAction, START_INLINE_CHAT, StartSessionAction, ToggleDiffForChange, UnstashSessionAction, ViewInChatAction };

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

@@ -27,13 +27,13 @@ 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 { showChatView } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
 import { IChatService } from '../../chat/common/chatService.service.js';
 import { Session } from './inlineChatSession.js';
 import { InlineChatError } from './inlineChatSessionServiceImpl.js';
 import { LiveStrategy, PreviewStrategy } from './inlineChatStrategies.js';
-import { INLINE_CHAT_ID, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS } from '../common/inlineChat.js';
+import { INLINE_CHAT_ID, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { INotebookEditorService } from '../../notebook/browser/services/notebookEditorService.service.js';
 import { SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
@@ -42,6 +42,7 @@ import { IInlineChatSavingService } from './inlineChatSavingService.service.js';
 import { IInlineChatSessionService } from './inlineChatSessionService.service.js';
 import { InlineChatZoneWidget } from './inlineChatZoneWidget.js';
 import { CONTEXT_RESPONSE, CONTEXT_RESPONSE_ERROR } from '../../chat/common/chatContextKeys.js';
+
 var InlineChatController_1;
 class InlineChatRunOptions {
     static isInlineChatRunOptions(options) {
@@ -151,6 +152,16 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
         this._isDisposed = true;
         this._log('DISPOSED controller');
     }
+    saveViewState() {
+        if (!this._ui.rawValue) {
+            return undefined;
+        }
+        const { selectedLanguageModelId } = this._ui.rawValue.widget.chatWidget.getViewState();
+        return { selectedLanguageModelId };
+    }
+    restoreViewState(state) {
+        this._uiInitViewState = state;
+    }
     _log(message, ...more) {
         if (message instanceof Error) {
             this._logService.error(message, ...more);
@@ -216,14 +227,14 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
             delete options.position;
         }
         const widgetPosition = this._showWidget(options.headless ?? session?.headless, true, initPosition);
-        let errorMessage = ( localize(5682, "Failed to start editor chat"));
+        let errorMessage = ( localize(5714, "Failed to start editor chat"));
         if (!session) {
             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._ui.value.widget.updateInfo(( localize(5683, "Getting ready...")));
+                    this._ui.value.widget.updateInfo(( localize(5715, "Getting ready...")));
                 }
                 else {
                     createSessionCts.cancel();
@@ -260,7 +271,7 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
                 break;
             case "live" :
             default:
-                this._strategy = this._instaService.createInstance(LiveStrategy, session, this._editor, this._ui.value, session.headless || this._configurationService.getValue("inlineChat.experimental.enableZoneToolbar" ));
+                this._strategy = this._instaService.createInstance(LiveStrategy, session, this._editor, this._ui.value, session.headless);
                 break;
         }
         this._session = session;
@@ -283,7 +294,8 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
         }));
         this._sessionStore.add(this._session.wholeRange.onDidChange(handleWholeRangeChange));
         handleWholeRangeChange();
-        this._ui.value.widget.setChatModel(this._session.chatModel);
+        this._ui.value.widget.setChatModel(this._session.chatModel, this._uiInitViewState);
+        this._uiInitViewState = undefined;
         this._updatePlaceholder();
         const isModelEmpty = !this._session.chatModel.hasRequests;
         this._ui.value.widget.updateToolbar(true);
@@ -541,7 +553,7 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
         let newPosition;
         if (response.result?.errorDetails) ;
         else if (response.response.value.length === 0) {
-            const status = ( localize(5684, "No results, please refine your input and try again"));
+            const status = ( localize(5716, "No results, please refine your input and try again"));
             this._ui.value.widget.updateStatus(status, { classes: ['warn'] });
         }
         else {
@@ -575,7 +587,7 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
             await this._strategy.apply();
         }
         catch (err) {
-            this._dialogService.error(( localize(5685, "Failed to apply changes.", toErrorMessage(err))));
+            this._dialogService.error(( localize(5717, "Failed to apply changes.", toErrorMessage(err))));
             this._log('FAILED to apply changes');
             this._log(err);
         }
@@ -595,7 +607,7 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
                 undoCancelEdits = this._strategy.cancel();
             }
             catch (err) {
-                this._dialogService.error(( localize(5686, "Failed to discard changes.", toErrorMessage(err))));
+                this._dialogService.error(( localize(5718, "Failed to discard changes.", toErrorMessage(err))));
                 this._log('FAILED to discard changes');
                 this._log(err);
             }
@@ -721,7 +733,7 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
         if (!this._session) {
             return;
         }
-        const status = ( localize(5687, "Accept or discard changes to continue saving."));
+        const status = ( localize(5719, "Accept or discard changes to continue saving."));
         this._ui.value.widget.updateStatus(status, { classes: ['warn'] });
         if (this._ui.value.position) {
             this._editor.revealLineInCenterIfOutsideViewport(this._ui.value.position.lineNumber);
@@ -886,7 +898,7 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
         });
         await Event.toPromise(Event.filter(this._onDidEnterState.event, candidate => candidate === "SHOW_REQUEST" ));
         for await (const chunk of stream) {
-            session.chatModel.acceptResponseProgress(request, { kind: 'textEdit', uri: this._editor.getModel().uri, edits: [chunk] });
+            session.chatModel.acceptResponseProgress(request, { kind: 'textEdit', uri: this._editor.getModel().uri, edits: chunk });
         }
         if (token.isCancellationRequested) {
             session.chatModel.cancelRequest(request);
@@ -894,6 +906,10 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
         else {
             session.chatModel.completeResponse(request);
         }
+        await Event.toPromise(Event.filter(this._onDidEnterState.event, candidate => candidate === "WAIT_FOR_INPUT" ));
+        if (session.hunkData.pending === 0) {
+            this.cancelSession();
+        }
         await run;
         return true;
     }
@@ -922,4 +938,5 @@ async function moveToPanelChat(accessor, model) {
         widget.focusLastMessage();
     }
 }
+
 export { InlineChatController, InlineChatRunOptions };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSavingService.service.js

@@ -1,3 +1,5 @@
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
 const IInlineChatSavingService = ( createDecorator('IInlineChatSavingService	'));
+
 export { IInlineChatSavingService };

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
-import { CTX_INLINE_CHAT_HAS_STASHED_SESSION } from '../common/inlineChat.js';
+import { CTX_INLINE_CHAT_HAS_STASHED_SESSION } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { Range } from '../../../../editor/common/core/range.js';
 import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
 import { EditOperation } from '../../../../editor/common/core/editOperation.js';
@@ -13,6 +13,7 @@ import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+
 var HunkData_1;
 class SessionWholeRange {
     static { this._options = ModelDecorationOptions.register({ description: 'inlineChat/session/wholeRange' }); }
@@ -471,4 +472,5 @@ class RawHunk {
         this.changes = changes;
     }
 }
+
 export { HunkData, Session, SessionWholeRange, StashedSession };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service.js

@@ -1,3 +1,5 @@
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
 const IInlineChatSessionService = ( createDecorator('IInlineChatSessionService'));
+
 export { IInlineChatSessionService };

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

@@ -17,13 +17,14 @@ import { DEFAULT_EDITOR_ASSOCIATION } from '../../../common/editor.js';
 import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
 import { IChatAgentService } from '../../chat/common/chatAgents.service.js';
 import { IChatService } from '../../chat/common/chatService.service.js';
-import { CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_POSSIBLE } from '../common/inlineChat.js';
+import { CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_POSSIBLE } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { UntitledTextEditorInput } from '../../../services/untitled/common/untitledTextEditorInput.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) {
@@ -283,4 +284,5 @@ InlineChatEnabler = ( __decorate([
     ( __param(1, IChatAgentService)),
     ( __param(2, IEditorService))
 ], InlineChatEnabler));
+
 export { InlineChatEnabler, InlineChatError, InlineChatSessionServiceImpl };

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { WindowIntervalTimer, getTotalWidth } from '../../../../base/browser/dom.js';
+import { WindowIntervalTimer } from '../../../../base/browser/dom.js';
 import { coalesceInPlace } from '../../../../base/common/arrays.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
@@ -14,8 +14,8 @@ import { IEditorWorkerService } from '../../../../editor/common/services/editorW
 import { InlineDecoration } from '../../../../editor/common/viewModel.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { Progress } from '../../../../platform/progress/common/progress.js';
-import { countWords } from '../../chat/common/chatWordCounter.js';
-import { CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, overviewRulerInlineChatDiffInserted, minimapInlineChatDiffInserted, MENU_INLINE_CHAT_ZONE, ACTION_TOGGLE_DIFF } from '../common/inlineChat.js';
+import { countWords } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatWordCounter';
+import { CTX_INLINE_CHAT_DOCUMENT_CHANGED, overviewRulerInlineChatDiffInserted, minimapInlineChatDiffInserted, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, MENU_INLINE_CHAT_ZONE, ACTION_TOGGLE_DIFF } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { assertType } from '../../../../base/common/types.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { asProgressiveEdit, performAsyncTextEdit } from './utils.js';
@@ -24,10 +24,8 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { DefaultChatTextEditor } from '../../chat/browser/codeBlockPart.js';
+import { DefaultChatTextEditor } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
 import { isEqual } from '../../../../base/common/resources.js';
-import { generateUuid } from '../../../../base/common/uuid.js';
-import { MenuWorkbenchButtonBar } from '../../../../platform/actions/browser/buttonbar.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { ConflictActionsFactory } from '../../mergeEditor/browser/view/conflictActions.js';
 import { observableValue } from '../../../../base/common/observableInternal/base.js';
@@ -37,6 +35,7 @@ import '../../../../base/common/cancellation.js';
 import '../../../../base/common/observableInternal/utils.js';
 import { MenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
+
 var EditModeStrategy_1;
 let EditModeStrategy = class EditModeStrategy {
     static { EditModeStrategy_1 = this; }
@@ -356,20 +355,15 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                                     const [hunkRange] = hunkData.getRangesN();
                                     viewZoneData.afterLineNumber = hunkRange.startLineNumber - 1;
                                     data.diffViewZoneId = viewZoneAccessor.addZone(viewZoneData);
-                                    overlay?.updateExtraTop(result.heightInLines);
                                 }
                                 else {
                                     viewZoneAccessor.removeZone(data.diffViewZoneId);
-                                    overlay?.updateExtraTop(0);
                                     data.diffViewZoneId = undefined;
                                 }
                             });
                             this._ctxCurrentChangeShowsDiff.set(typeof data?.diffViewZoneId === 'string');
                             scrollState.restore(this._editor);
                         };
-                        const overlay = this._showOverlayToolbar && false
-                            ? this._instaService.createInstance(InlineChangeOverlay, this._editor, hunkData)
-                            : undefined;
                         let lensActions;
                         const lensActionsViewZoneIds = [];
                         if (this._showOverlayToolbar && hunkData.getState() === 0 ) {
@@ -418,7 +412,6 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                                 data.lensActionsViewZoneIds = undefined;
                             });
                             lensActions?.dispose();
-                            overlay?.dispose();
                         };
                         const move = (next) => {
                             const keys = Array.from(( this._hunkDisplayData.keys()));
@@ -524,62 +517,5 @@ function changeDecorationsAndViewZones(editor, callback) {
         });
     });
 }
-let InlineChangeOverlay = class InlineChangeOverlay {
-    constructor(_editor, _hunkInfo, _instaService) {
-        this._editor = _editor;
-        this._hunkInfo = _hunkInfo;
-        this._instaService = _instaService;
-        this.allowEditorOverflow = false;
-        this._id = `inline-chat-diff-overlay-` + generateUuid();
-        this._domNode = document.createElement('div');
-        this._store = ( new DisposableStore());
-        this._extraTopLines = 0;
-        this._domNode.classList.add('inline-chat-diff-overlay');
-        if (_hunkInfo.getState() === 0 ) {
-            const menuBar = this._store.add(this._instaService.createInstance(MenuWorkbenchButtonBar, this._domNode, MENU_INLINE_CHAT_ZONE, {
-                menuOptions: { arg: _hunkInfo },
-                telemetrySource: 'inlineChat-changesZone',
-                buttonConfigProvider: (_action, idx) => {
-                    return {
-                        isSecondary: idx > 0,
-                        showIcon: true,
-                        showLabel: false
-                    };
-                },
-            }));
-            this._store.add(menuBar.onDidChange(() => this._editor.layoutOverlayWidget(this)));
-        }
-        this._editor.addOverlayWidget(this);
-        this._store.add(Event.any(this._editor.onDidLayoutChange, this._editor.onDidScrollChange)(() => this._editor.layoutOverlayWidget(this)));
-        queueMicrotask(() => this._editor.layoutOverlayWidget(this));
-    }
-    dispose() {
-        this._editor.removeOverlayWidget(this);
-        this._store.dispose();
-    }
-    getId() {
-        return this._id;
-    }
-    getDomNode() {
-        return this._domNode;
-    }
-    getPosition() {
-        const line = this._hunkInfo.getRangesN()[0].startLineNumber;
-        const info = this._editor.getLayoutInfo();
-        const top = this._editor.getTopForLineNumber(line) - this._editor.getScrollTop();
-        const left = info.contentLeft + info.contentWidth - info.verticalScrollbarWidth;
-        const extraTop = this._editor.getOption(69 ) * this._extraTopLines;
-        const width = getTotalWidth(this._domNode);
-        return { preference: { top: top - extraTop, left: left - width } };
-    }
-    updateExtraTop(value) {
-        if (this._extraTopLines !== value) {
-            this._extraTopLines = value;
-            this._editor.layoutOverlayWidget(this);
-        }
-    }
-};
-InlineChangeOverlay = ( __decorate([
-    ( __param(2, IInstantiationService))
-], InlineChangeOverlay));
+
 export { EditModeStrategy, LiveStrategy, PreviewStrategy };