@codingame/monaco-vscode-chat-service-override 10.1.3 → 11.0.0

package/vscode/src/vs/workbench/contrib/chat/common/tools/languageModelToolsParametersSchema.js

@@ -0,0 +1,250 @@
+import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+
+const toolsParametersSchemaSchemaId = 'vscode://schemas/toolsParameters';
+const toolsParametersSchemaSchema = {
+    definitions: {
+        schemaArray: {
+            type: 'array',
+            minItems: 1,
+            items: {
+                $ref: '#'
+            }
+        },
+        nonNegativeInteger: {
+            type: 'integer',
+            minimum: 0
+        },
+        nonNegativeIntegerDefault0: {
+            allOf: [
+                {
+                    $ref: '#/definitions/nonNegativeInteger'
+                },
+                {
+                    default: 0
+                }
+            ]
+        },
+        simpleTypes: {
+            enum: [
+                'array',
+                'boolean',
+                'integer',
+                'null',
+                'number',
+                'object',
+                'string'
+            ]
+        },
+        stringArray: {
+            type: 'array',
+            items: {
+                type: 'string'
+            },
+            uniqueItems: true,
+            default: []
+        }
+    },
+    type: ['object'],
+    properties: {
+        $id: {
+            type: 'string',
+            format: 'uri-reference'
+        },
+        $schema: {
+            type: 'string',
+            format: 'uri'
+        },
+        $ref: {
+            type: 'string',
+            format: 'uri-reference'
+        },
+        $comment: {
+            type: 'string'
+        },
+        title: {
+            type: 'string'
+        },
+        description: {
+            type: 'string'
+        },
+        readOnly: {
+            type: 'boolean',
+            default: false
+        },
+        writeOnly: {
+            type: 'boolean',
+            default: false
+        },
+        multipleOf: {
+            type: 'number',
+            exclusiveMinimum: 0
+        },
+        maximum: {
+            type: 'number'
+        },
+        exclusiveMaximum: {
+            type: 'number'
+        },
+        minimum: {
+            type: 'number'
+        },
+        exclusiveMinimum: {
+            type: 'number'
+        },
+        maxLength: {
+            $ref: '#/definitions/nonNegativeInteger'
+        },
+        minLength: {
+            $ref: '#/definitions/nonNegativeIntegerDefault0'
+        },
+        pattern: {
+            type: 'string',
+            format: 'regex'
+        },
+        additionalItems: {
+            $ref: '#'
+        },
+        items: {
+            anyOf: [
+                {
+                    $ref: '#'
+                },
+                {
+                    $ref: '#/definitions/schemaArray'
+                }
+            ],
+            default: true
+        },
+        maxItems: {
+            $ref: '#/definitions/nonNegativeInteger'
+        },
+        minItems: {
+            $ref: '#/definitions/nonNegativeIntegerDefault0'
+        },
+        uniqueItems: {
+            type: 'boolean',
+            default: false
+        },
+        contains: {
+            $ref: '#'
+        },
+        maxProperties: {
+            $ref: '#/definitions/nonNegativeInteger'
+        },
+        minProperties: {
+            $ref: '#/definitions/nonNegativeIntegerDefault0'
+        },
+        required: {
+            $ref: '#/definitions/stringArray'
+        },
+        additionalProperties: {
+            $ref: '#'
+        },
+        definitions: {
+            type: 'object',
+            additionalProperties: {
+                $ref: '#'
+            },
+            default: {}
+        },
+        properties: {
+            type: 'object',
+            additionalProperties: {
+                $ref: '#'
+            },
+            default: {}
+        },
+        patternProperties: {
+            type: 'object',
+            additionalProperties: {
+                $ref: '#'
+            },
+            propertyNames: {
+                format: 'regex'
+            },
+            default: {}
+        },
+        dependencies: {
+            type: 'object',
+            additionalProperties: {
+                anyOf: [
+                    {
+                        $ref: '#'
+                    },
+                    {
+                        $ref: '#/definitions/stringArray'
+                    }
+                ]
+            }
+        },
+        propertyNames: {
+            $ref: '#'
+        },
+        enum: {
+            type: 'array',
+            minItems: 1,
+            uniqueItems: true
+        },
+        type: {
+            anyOf: [
+                {
+                    $ref: '#/definitions/simpleTypes'
+                },
+                {
+                    type: 'array',
+                    items: {
+                        $ref: '#/definitions/simpleTypes'
+                    },
+                    minItems: 1,
+                    uniqueItems: true
+                }
+            ]
+        },
+        format: {
+            type: 'string'
+        },
+        contentMediaType: {
+            type: 'string'
+        },
+        contentEncoding: {
+            type: 'string'
+        },
+        if: {
+            $ref: '#'
+        },
+        then: {
+            $ref: '#'
+        },
+        else: {
+            $ref: '#'
+        },
+        allOf: {
+            $ref: '#/definitions/schemaArray'
+        },
+        anyOf: {
+            $ref: '#/definitions/schemaArray'
+        },
+        oneOf: {
+            $ref: '#/definitions/schemaArray'
+        },
+        not: {
+            $ref: '#'
+        }
+    },
+    defaultSnippets: [{
+            body: {
+                type: 'object',
+                properties: {
+                    '${1:paramName}': {
+                        type: 'string',
+                        description: '${2:description}'
+                    }
+                }
+            },
+        }],
+};
+const contributionRegistry = ( Registry.as(Extensions.JSONContribution));
+contributionRegistry.registerSchema(toolsParametersSchemaSchemaId, toolsParametersSchemaSchema);
+
+export { toolsParametersSchemaSchemaId };

package/vscode/src/vs/workbench/contrib/chat/common/voiceChatService.js

@@ -6,7 +6,7 @@ import { rtrim } from 'vscode/vscode/vs/base/common/strings';
 import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { chatAgentLeader, chatSubcommandLeader } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { SpeechToTextStatus } from 'vscode/vscode/vs/workbench/contrib/speech/common/speechService';
 import { ISpeechService } from 'vscode/vscode/vs/workbench/contrib/speech/common/speechService.service';
 
@@ -20,7 +20,7 @@ var PhraseTextType;
 const VoiceChatInProgress = ( (new RawContextKey(
     'voiceChatInProgress',
     false,
-    { type: 'boolean', description: ( localize(7265, "A speech-to-text session is in progress for chat.")) }
+    { type: 'boolean', description: ( localize(7493, "A speech-to-text session is in progress for chat.")) }
 )));
 let VoiceChatService = class VoiceChatService extends Disposable {
     static { VoiceChatService_1 = this; }

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

@@ -1,8 +1,8 @@
 import { registerEditorContribution } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { registerAction2, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { StartSessionAction, CloseAction, ConfigureInlineChatAction, UnstashSessionAction, DiscardHunkAction, DiscardAction, RerunAction, MoveToNextHunk, MoveToPreviousHunk, ArrowOutUpAction, ArrowOutDownAction, FocusInlineChat, ViewInChatAction, ToggleDiffForChange, AcceptChanges } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
-import { INLINE_CHAT_ID, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_EDITING, MENU_INLINE_CHAT_WIDGET_STATUS } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { StartSessionAction, CloseAction, ConfigureInlineChatAction, UnstashSessionAction, DiscardHunkAction, RerunAction, MoveToNextHunk, MoveToPreviousHunk, ArrowOutUpAction, ArrowOutDownAction, FocusInlineChat, ViewInChatAction, ToggleDiffForChange, AcceptChanges } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
+import { INLINE_CHAT_ID, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_EDITING, MENU_INLINE_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { InlineChatNotebookContribution } from './inlineChatNotebook.js';
 import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
@@ -11,7 +11,7 @@ import { InlineChatAccessibleView } from './inlineChatAccessibleView.js';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { InlineChatEnabler } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
 import { AccessibleViewRegistry } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
-import { SubmitAction, CancelAction } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
+import { SubmitAction, CancelAction } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
 import { localize } from 'vscode/vscode/vs/nls';
 import { CONTEXT_CHAT_INPUT_HAS_TEXT } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -26,7 +26,7 @@ const editActionMenuItem = {
     order: 0,
     command: {
         id: SubmitAction.ID,
-        title: ( localize(3181, "Edit Code")),
+        title: ( localize(2729, "Edit Code")),
     },
     when: ( (ContextKeyExpr.and(
         CONTEXT_CHAT_INPUT_HAS_TEXT,
@@ -39,7 +39,7 @@ const generateActionMenuItem = {
     order: 0,
     command: {
         id: SubmitAction.ID,
-        title: ( localize(3182, "Generate")),
+        title: ( localize(2730, "Generate")),
     },
     when: ( (ContextKeyExpr.and(
         CONTEXT_CHAT_INPUT_HAS_TEXT,
@@ -54,8 +54,8 @@ const cancelActionMenuItem = {
     order: 0,
     command: {
         id: CancelAction.ID,
-        title: ( localize(3183, "Cancel Request")),
-        shortTitle: ( localize(3184, "Cancel")),
+        title: ( localize(2731, "Cancel Request")),
+        shortTitle: ( localize(2732, "Cancel")),
     },
     when: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS))),
 };
@@ -65,7 +65,6 @@ registerAction2(CloseAction);
 registerAction2(ConfigureInlineChatAction);
 registerAction2(UnstashSessionAction);
 registerAction2(DiscardHunkAction);
-registerAction2(DiscardAction);
 registerAction2(RerunAction);
 registerAction2(MoveToNextHunk);
 registerAction2(MoveToPreviousHunk);

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

@@ -2,7 +2,7 @@ import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/cod
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { getChatAccessibilityHelpProvider } from '../../chat/browser/actions/chatAccessibilityHelp.js';
 import { CONTEXT_CHAT_INPUT_HAS_FOCUS } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { CTX_INLINE_CHAT_RESPONSE_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 
 class InlineChatAccessibilityHelp {
     constructor() {

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

@@ -1,5 +1,5 @@
 import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { AccessibleContentProvider } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';

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

@@ -5,7 +5,7 @@ import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/context
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_HAS_AGENT } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_HAS_AGENT } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { EditorAction2 } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
@@ -14,7 +14,7 @@ import { AbstractInlineChatAction } from 'vscode/vscode/vs/workbench/contrib/inl
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 
 const CTX_INLINE_CHAT_EXPANSION = ( (new RawContextKey('inlineChatExpansion', false, ( localize(
-    7400,
+    7662,
     "Whether the inline chat expansion is enabled when at the end of a just-typed line"
 )))));
 let InlineChatExansionContextKey = class InlineChatExansionContextKey {
@@ -84,7 +84,7 @@ class InlineChatExpandLineAction extends EditorAction2 {
         super({
             id: 'inlineChat.startWithCurrentLine',
             category: AbstractInlineChatAction.category,
-            title: ( localize2(7401, "Start in Editor with Current Line")),
+            title: ( localize2(7663, "Start in Editor with Current Line")),
             f1: true,
             precondition: ( (ContextKeyExpr.and(
                  (CTX_INLINE_CHAT_VISIBLE.negate()),

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

@@ -8,8 +8,8 @@ import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/in
 import { INotebookEditorService } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { NotebookTextDiffEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
-import { NotebookMultiTextDiffEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor';
+import { NotebookTextDiffEditor } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
+import { NotebookMultiTextDiffEditor } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor';
 
 let InlineChatNotebookContribution = class InlineChatNotebookContribution {
     constructor(sessionService, editorService, notebookEditorService) {

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

@@ -1,46 +1,55 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { Queue, raceCancellation } from 'vscode/vscode/vs/base/common/async';
+import { Queue } from 'vscode/vscode/vs/base/common/async';
 import { DisposableStore, MutableDisposable, dispose, combinedDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { localize } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { compare } from 'vscode/vscode/vs/base/common/strings';
 import { IWorkingCopyFileService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { Event } from 'vscode/vscode/vs/base/common/event';
-import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
+import { CancellationError } from 'vscode/vscode/vs/base/common/errors';
 
+const key = 'chat.editing.alwaysSaveWithGeneratedChanges';
 let InlineChatSavingServiceImpl = class InlineChatSavingServiceImpl {
-    constructor(_fileConfigService, _editorGroupService, _textFileService, _editorService, _inlineChatSessionService, _configService, _workingCopyFileService, _logService) {
+    constructor(_fileConfigService, _editorGroupService, _textFileService, _inlineChatSessionService, _configService, _workingCopyFileService, _dialogService, _labelService) {
         this._fileConfigService = _fileConfigService;
         this._editorGroupService = _editorGroupService;
         this._textFileService = _textFileService;
-        this._editorService = _editorService;
-        this._inlineChatSessionService = _inlineChatSessionService;
         this._configService = _configService;
         this._workingCopyFileService = _workingCopyFileService;
-        this._logService = _logService;
+        this._dialogService = _dialogService;
+        this._labelService = _labelService;
         this._store = ( (new DisposableStore()));
         this._saveParticipant = this._store.add(( (new MutableDisposable())));
         this._sessionData = ( (new Map()));
         this._store.add(Event.any(_inlineChatSessionService.onDidEndSession, _inlineChatSessionService.onDidStashSession)(e => {
             this._sessionData.get(e.session)?.dispose();
         }));
+        this._store.add(_configService.onDidChangeConfiguration(e => {
+            if (!e.affectsConfiguration(key) && !e.affectsConfiguration("inlineChat.acceptedOrDiscardBeforeSave" )) {
+                return;
+            }
+            if (this._isDisabled()) {
+                dispose(( (this._sessionData.values())));
+                this._sessionData.clear();
+            }
+        }));
     }
     dispose() {
         this._store.dispose();
         dispose(( (this._sessionData.values())));
     }
     markChanged(session) {
+        if (this._isDisabled()) {
+            return;
+        }
         if (!( (this._sessionData.has(session)))) {
             let uri = session.targetUri;
             if (uri.scheme === Schemas.vscodeNotebookCell) {
@@ -86,7 +95,7 @@ let InlineChatSavingServiceImpl = class InlineChatSavingServiceImpl {
         if (reason !== 1 ) {
             return;
         }
-        if (!this._configService.getValue("inlineChat.acceptedOrDiscardBeforeSave" )) {
+        if (this._isDisabled()) {
             return;
         }
         const sessions = ( (new Map()));
@@ -98,134 +107,62 @@ let InlineChatSavingServiceImpl = class InlineChatSavingServiceImpl {
         if (sessions.size === 0) {
             return;
         }
-        progress.report({
-            message: sessions.size === 1
-                ? ( localize(3162, "Waiting for Inline Chat changes to be Accepted or Discarded..."))
-                : ( localize(
-                3163,
-                "Waiting for Inline Chat changes in {0} editors to be Accepted or Discarded...",
-                sessions.size
-            ))
-        });
-        const { groups, orphans } = this._getGroupsAndOrphans(( (sessions.values())));
-        const editorsOpenedAndSessionsEnded = this._openAndWait(groups, token).then(() => {
-            if (token.isCancellationRequested) {
-                return;
-            }
-            return this._openAndWait(( (Iterable.map(orphans, s => [this._editorGroupService.activeGroup, s]))), token);
-        });
-        const allSessionsEnded = this._whenSessionsEnded(Iterable.concat(( (groups.map(tuple => tuple[1]))), orphans), token);
-        await Promise.race([allSessionsEnded, editorsOpenedAndSessionsEnded]);
-    }
-    _getGroupsAndOrphans(sessions) {
-        const groupByEditor = ( (new Map()));
-        for (const group of this._editorGroupService.getGroups(1 )) {
-            const candidate = group.activeEditorPane?.getControl();
-            if (isCodeEditor(candidate)) {
-                groupByEditor.set(candidate, group);
-            }
+        let message;
+        if (sessions.size === 1) {
+            const session = Iterable.first(( (sessions.values()))).session;
+            const agentName = session.agent.fullName;
+            const filelabel = this._labelService.getUriBasenameLabel(session.textModelN.uri);
+            message = ( localize(
+                2706,
+                "Do you want to save the changes {0} made in {1}?",
+                agentName,
+                filelabel
+            ));
         }
-        const groups = [];
-        const orphans = ( (new Set()));
-        for (const data of sessions) {
-            const editor = this._inlineChatSessionService.getCodeEditor(data.session);
-            const group = groupByEditor.get(editor);
-            if (group) {
-                groups.push([group, data]);
-            }
-            else if (this._editorGroupService.groups.includes(data.groupCandidate)) {
-                groups.push([data.groupCandidate, data]);
-            }
-            else {
-                orphans.add(data);
-            }
+        else {
+            const labels = Array.from(( (Iterable.map(
+                 (sessions.values()),
+                i => this._labelService.getUriBasenameLabel(i.session.textModelN.uri)
+            ))));
+            message = ( localize(
+                2707,
+                "Do you want to save the changes inline chat made in {0}?",
+                labels.join(', ')
+            ));
         }
-        return { groups, orphans };
-    }
-    async _openAndWait(groups, token) {
-        const dataByGroup = ( (new Map()));
-        for (const [group, data] of groups) {
-            let array = dataByGroup.get(group);
-            if (!array) {
-                array = [];
-                dataByGroup.set(group, array);
+        const result = await this._dialogService.confirm({
+            message,
+            detail: ( localize(
+                2708,
+                "AI-generated changes may be incorrect and should be reviewed before saving."
+            )),
+            primaryButton: ( localize(2709, "Save")),
+            cancelButton: ( localize(2710, "Cancel")),
+            checkbox: {
+                label: ( localize(2711, "Always save with AI-generated changes without asking")),
+                checked: false
             }
-            array.push(data);
+        });
+        if (!result.confirmed) {
+            throw ( (new CancellationError()));
         }
-        for (const [group, array] of dataByGroup) {
-            if (token.isCancellationRequested) {
-                break;
-            }
-            array.sort((a, b) => compare(( (a.session.targetUri.toString())), ( (b.session.targetUri.toString()))));
-            for (const data of array) {
-                const input = { resource: data.resourceUri };
-                const pane = await this._editorService.openEditor(input, group);
-                let editor;
-                if (data.session.targetUri.scheme === Schemas.vscodeNotebookCell) {
-                    const notebookEditor = getNotebookEditorFromEditorPane(pane);
-                    const uriData = CellUri.parse(data.session.targetUri);
-                    if (notebookEditor && notebookEditor.hasModel() && uriData) {
-                        const cell = notebookEditor.getCellByHandle(uriData.handle);
-                        if (cell) {
-                            await notebookEditor.revealRangeInCenterIfOutsideViewportAsync(cell, data.session.wholeRange.value);
-                        }
-                        const tuple = notebookEditor.codeEditors.find(tuple => tuple[1].getModel()?.uri.toString() === ( (data.session.targetUri.toString())));
-                        editor = tuple?.[1];
-                    }
-                }
-                else {
-                    if (isCodeEditor(pane?.getControl())) {
-                        editor = pane.getControl();
-                    }
-                }
-                if (!editor) {
-                    break;
-                }
-                this._inlineChatSessionService.moveSession(data.session, editor);
-                InlineChatController.get(editor)?.showSaveHint();
-                this._logService.info('WAIT for session to end', editor.getId(), ( (data.session.targetUri.toString())));
-                await this._whenSessionsEnded(Iterable.single(data), token);
-            }
+        if (result.checkboxChecked) {
+            this._configService.updateValue(key, true);
         }
     }
-    async _whenSessionsEnded(iterable, token) {
-        const sessions = ( (new Map()));
-        for (const item of iterable) {
-            sessions.set(item.session, item);
-        }
-        if (sessions.size === 0) {
-            return;
-        }
-        let listener;
-        const whenEnded = ( (new Promise(resolve => {
-            listener = Event.any(this._inlineChatSessionService.onDidEndSession, this._inlineChatSessionService.onDidStashSession)(e => {
-                const data = sessions.get(e.session);
-                if (data) {
-                    data.dispose();
-                    sessions.delete(e.session);
-                    if (sessions.size === 0) {
-                        resolve();
-                    }
-                }
-            });
-        })));
-        try {
-            await raceCancellation(whenEnded, token);
-        }
-        finally {
-            listener?.dispose();
-        }
+    _isDisabled() {
+        return this._configService.getValue("inlineChat.acceptedOrDiscardBeforeSave" ) === true || this._configService.getValue(key);
     }
 };
 InlineChatSavingServiceImpl = ( (__decorate([
     ( (__param(0, IFilesConfigurationService))),
     ( (__param(1, IEditorGroupsService))),
     ( (__param(2, ITextFileService))),
-    ( (__param(3, IEditorService))),
-    ( (__param(4, IInlineChatSessionService))),
-    ( (__param(5, IConfigurationService))),
-    ( (__param(6, IWorkingCopyFileService))),
-    ( (__param(7, ILogService)))
+    ( (__param(3, IInlineChatSessionService))),
+    ( (__param(4, IConfigurationService))),
+    ( (__param(5, IWorkingCopyFileService))),
+    ( (__param(6, IDialogService))),
+    ( (__param(7, ILabelService)))
 ], InlineChatSavingServiceImpl)));
 
 export { InlineChatSavingServiceImpl };