@codingame/monaco-vscode-katex-common 24.2.0 → 25.0.0

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

@@ -42,35 +42,36 @@ import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ISharedWebContentExtractorService } from '@codingame/monaco-vscode-api/vscode/vs/platform/webContentExtractor/common/webContentExtractor.service';
 import { SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { IChatAttachmentResolveService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatAttachmentResolveService.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { ChatRequestRemovalReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { IChatAttachmentResolveService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { ChatRequestRemovalReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { IDiagnosticVariableEntryFilterData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
-import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { IDiagnosticVariableEntryFilterData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
+import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { isILanguageModelChatSelector } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { isNotebookContainingCellEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookEditor';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
+import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
-import { InlineChatConfigKeys, INLINE_CHAT_ID, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, InlineChatResponseType } from '../common/inlineChat.js';
+import { INLINE_CHAT_ID, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, InlineChatConfigKeys, InlineChatResponseType } from '../common/inlineChat.js';
 import { Session } from './inlineChatSession.js';
 import { moveToPanelChat } from './inlineChatSessionService.js';
 import { IInlineChatSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
 import { InlineChatError } from './inlineChatSessionServiceImpl.js';
 import { LiveStrategy, HunkAction } from './inlineChatStrategies.js';
 import { InlineChatZoneWidget } from './inlineChatZoneWidget.js';
-import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { waitForState } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utilsCancellation';
 
-var InlineChatController_1, InlineChatController1_1, InlineChatController2_1;
+var InlineChatController1_1, InlineChatController2_1;
 var State;
 (function (State) {
     State["CREATE_SESSION"] = "CREATE_SESSION";
@@ -111,50 +112,35 @@ class InlineChatRunOptions {
         return true;
     }
 }
-let InlineChatController = class InlineChatController {
-    static { InlineChatController_1 = this; }
+class InlineChatController {
     static { this.ID = 'editor.contrib.inlineChatController'; }
     static get(editor) {
-        return editor.getContribution(InlineChatController_1.ID);
+        return editor.getContribution(InlineChatController.ID);
     }
-    constructor(editor, configurationService, _notebookEditorService) {
-        this._notebookEditorService = _notebookEditorService;
-        const notebookAgent = observableConfigValue(InlineChatConfigKeys.notebookAgent, false, configurationService);
-        this._delegate = derived(r => {
-            const isNotebookCell = !!this._notebookEditorService.getNotebookForPossibleCell(editor);
-            if (!isNotebookCell || notebookAgent.read(r)) {
-                return InlineChatController2.get(editor);
-            }
-            else {
-                return InlineChatController1.get(editor);
-            }
-        });
+    constructor(editor) {
+        this._delegate = InlineChatController2.get(editor);
     }
     dispose() {
     }
     get isActive() {
-        return this._delegate.get().isActive;
+        return this._delegate.isActive;
     }
     async run(arg) {
-        return this._delegate.get().run(arg);
+        return this._delegate.run(arg);
     }
     focus() {
-        return this._delegate.get().focus();
+        return this._delegate.focus();
     }
     get widget() {
-        return this._delegate.get().widget;
+        return this._delegate.widget;
     }
     getWidgetPosition() {
-        return this._delegate.get().getWidgetPosition();
+        return this._delegate.getWidgetPosition();
     }
     acceptSession() {
-        return this._delegate.get().acceptSession();
+        return this._delegate.acceptSession();
     }
-};
-InlineChatController = InlineChatController_1 = ( __decorate([
-    ( __param(1, IConfigurationService)),
-    ( __param(2, INotebookEditorService))
-], InlineChatController));
+}
 function getEditorId(editor, model) {
     return `${editor.getId()},${model.id}`;
 }
@@ -321,14 +307,14 @@ let InlineChatController1 = InlineChatController1_1 = class InlineChatController
             delete options.position;
         }
         const widgetPosition = this._showWidget(session?.headless, true, initPosition);
-        let errorMessage = ( localize(8300, "Failed to start editor chat"));
+        let errorMessage = ( localize(8330, "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 === Message.ACCEPT_INPUT) {
                     options.autoSend = true;
-                    this._ui.value.widget.updateInfo(( localize(8301, "Getting ready...")));
+                    this._ui.value.widget.updateInfo(( localize(8331, "Getting ready...")));
                 }
                 else {
                     createSessionCts.cancel();
@@ -660,13 +646,13 @@ let InlineChatController1 = InlineChatController1_1 = class InlineChatController
             alert(response.result.errorDetails.message);
         }
         else if (response.response.value.length === 0) {
-            const status = ( localize(8302, "No results, please refine your input and try again"));
+            const status = ( localize(8332, "No results, please refine your input and try again"));
             this._ui.value.widget.updateStatus(status, { classes: ['warn'] });
             alert(status);
         }
         else {
             this._ui.value.widget.updateStatus('');
-            alert(( localize(8303, "Response was empty")));
+            alert(( localize(8333, "Response was empty")));
         }
         const position = await this._strategy.renderChanges();
         if (position) {
@@ -696,7 +682,7 @@ let InlineChatController1 = InlineChatController1_1 = class InlineChatController
             await this._strategy.apply();
         }
         catch (err) {
-            this._dialogService.error(( localize(8304, "Failed to apply changes.", toErrorMessage(err))));
+            this._dialogService.error(( localize(8334, "Failed to apply changes.", toErrorMessage(err))));
             this._log('FAILED to apply changes');
             this._log(err);
         }
@@ -717,7 +703,7 @@ let InlineChatController1 = InlineChatController1_1 = class InlineChatController
                 undoCancelEdits = this._strategy.cancel();
             }
             catch (err) {
-                this._dialogService.error(( localize(8305, "Failed to discard changes.", toErrorMessage(err))));
+                this._dialogService.error(( localize(8335, "Failed to discard changes.", toErrorMessage(err))));
                 this._log('FAILED to discard changes');
                 this._log(err);
             }
@@ -841,7 +827,7 @@ let InlineChatController1 = InlineChatController1_1 = class InlineChatController
         };
     }
     _updatePlaceholder() {
-        this._ui.value.widget.placeholder = this._session?.agent.description ?? ( localize(8306, 'Ask or edit in context'));
+        this._ui.value.widget.placeholder = this._session?.agent.description ?? ( localize(8336, 'Ask or edit in context'));
     }
     _updateInput(text, selectAll = true) {
         this._ui.value.widget.chatWidget.setInput(text);
@@ -1004,7 +990,7 @@ let InlineChatController2 = class InlineChatController2 {
     get isActive() {
         return Boolean(this._currentSession.get());
     }
-    constructor(_editor, _instaService, _notebookEditorService, _inlineChatSessionService, codeEditorService, contextKeyService, _webContentExtractorService, _fileService, _chatAttachmentResolveService, _editorService, _markerDecorationsService, _languageModelService, chatService) {
+    constructor(_editor, _instaService, _notebookEditorService, _inlineChatSessionService, codeEditorService, contextKeyService, configurationService, _webContentExtractorService, _fileService, _chatAttachmentResolveService, _editorService, _markerDecorationsService, _languageModelService, chatService) {
         this._editor = _editor;
         this._instaService = _instaService;
         this._notebookEditorService = _notebookEditorService;
@@ -1018,7 +1004,9 @@ let InlineChatController2 = class InlineChatController2 {
         this._store = ( new DisposableStore());
         this._isActiveController = observableValue(this, false);
         const ctxInlineChatVisible = CTX_INLINE_CHAT_VISIBLE.bindTo(contextKeyService);
+        const notebookAgentConfig = observableConfigValue(InlineChatConfigKeys.notebookAgent, false, configurationService);
         this._zone = ( new Lazy(() => {
+            assertType(this._editor.hasModel(), '[Illegal State] widget should only be created when the editor has a model');
             const location = {
                 location: ChatAgentLocation.EditorInline,
                 resolveData: () => {
@@ -1042,13 +1030,15 @@ let InlineChatController2 = class InlineChatController2 {
             const notebookEditor = this._notebookEditorService.getNotebookForPossibleCell(this._editor);
             if (!!notebookEditor) {
                 location.location = ChatAgentLocation.Notebook;
-                location.resolveData = () => {
-                    assertType(this._editor.hasModel());
-                    return {
-                        type: ChatAgentLocation.Notebook,
-                        sessionInputUri: this._editor.getModel().uri,
+                if (notebookAgentConfig.get()) {
+                    location.resolveData = () => {
+                        assertType(this._editor.hasModel());
+                        return {
+                            type: ChatAgentLocation.Notebook,
+                            sessionInputUri: this._editor.getModel().uri,
+                        };
                     };
-                };
+                }
             }
             const result = this._instaService.createInstance(InlineChatZoneWidget, location, {
                 enableWorkingSet: 'implicit',
@@ -1119,8 +1109,8 @@ let InlineChatController2 = class InlineChatController2 {
         }));
         const defaultPlaceholderObs = ( visibleSessionObs.map((session, r) => {
             return session?.initialSelection.isEmpty()
-                ? ( localize(8307, "Generate code"))
-                : ( localize(8308, "Modify selected code"));
+                ? ( localize(8337, "Generate code"))
+                : ( localize(8338, "Modify selected code"));
         }));
         this._store.add(autorun(r => {
             const session = visibleSessionObs.read(r);
@@ -1146,7 +1136,16 @@ let InlineChatController2 = class InlineChatController2 {
             const session = visibleSessionObs.read(r);
             if (session) {
                 const entries = session.editingSession.entries.read(r);
-                const otherEntries = entries.filter(entry => !isEqual(entry.modifiedURI, session.uri));
+                const sessionCellUri = CellUri.parse(session.uri);
+                const otherEntries = entries.filter(entry => {
+                    if (isEqual(entry.modifiedURI, session.uri)) {
+                        return false;
+                    }
+                    if (!!sessionCellUri && isEqual(sessionCellUri.notebook, entry.modifiedURI)) {
+                        return false;
+                    }
+                    return true;
+                });
                 for (const entry of otherEntries) {
                     this._editorService.openEditor({ resource: entry.modifiedURI }, SIDE_GROUP).catch(onUnexpectedError);
                 }
@@ -1183,7 +1182,7 @@ let InlineChatController2 = class InlineChatController2 {
                 if (lastProgress) {
                     placeholder = renderAsPlaintext(lastProgress.content);
                 }
-                this._zone.rawValue?.widget.chatWidget.setInputPlaceholder(placeholder || ( localize(8309, "Working...")));
+                this._zone.rawValue?.widget.chatWidget.setInputPlaceholder(placeholder || ( localize(8339, "Working...")));
             }
         }));
         this._store.add(autorun(r => {
@@ -1244,8 +1243,8 @@ let InlineChatController2 = class InlineChatController2 {
         if (entries.length > 0) {
             this._zone.value.widget.chatWidget.attachmentModel.addContext(...entries);
             this._zone.value.widget.chatWidget.input.setValue(entries.length > 1
-                ? ( localize(8310, "Fix the attached problems"))
-                : ( localize(8311, "Fix the attached problem")), true);
+                ? ( localize(8340, "Fix the attached problems"))
+                : ( localize(8341, "Fix the attached problem")), true);
             this._zone.value.widget.chatWidget.inputEditor.setSelection(( new Selection(1, 1, Number.MAX_SAFE_INTEGER, 1)));
         }
         if (arg && InlineChatRunOptions.isInlineChatRunOptions(arg)) {
@@ -1326,13 +1325,14 @@ InlineChatController2 = InlineChatController2_1 = ( __decorate([
     ( __param(3, IInlineChatSessionService)),
     ( __param(4, ICodeEditorService)),
     ( __param(5, IContextKeyService)),
-    ( __param(6, ISharedWebContentExtractorService)),
-    ( __param(7, IFileService)),
-    ( __param(8, IChatAttachmentResolveService)),
-    ( __param(9, IEditorService)),
-    ( __param(10, IMarkerDecorationsService)),
-    ( __param(11, ILanguageModelsService)),
-    ( __param(12, IChatService))
+    ( __param(6, IConfigurationService)),
+    ( __param(7, ISharedWebContentExtractorService)),
+    ( __param(8, IFileService)),
+    ( __param(9, IChatAttachmentResolveService)),
+    ( __param(10, IEditorService)),
+    ( __param(11, IMarkerDecorationsService)),
+    ( __param(12, ILanguageModelsService)),
+    ( __param(13, IChatService))
 ], InlineChatController2));
 async function reviewEdits(accessor, editor, stream, token, applyCodeBlockSuggestionId) {
     if (!editor.hasModel()) {

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.d.ts

@@ -8,8 +8,8 @@ import { IEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/edi
 import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { IChatModel, IChatRequestModel, IChatTextEditGroupState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatAgent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatModel, IChatRequestModel, IChatTextEditGroupState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { IChatAgent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents";
 import { IDocumentDiff } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/editor/common/diff/documentDiffProvider";
 export type TelemetryData = {
     extension: string;

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.d.ts

@@ -3,8 +3,8 @@ import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/brows
 import { Position } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position";
 import { Selection } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IChatEditingSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatModel, IChatModelInputState, IChatRequestModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatEditingSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IChatModel, IChatModelInputState, IChatRequestModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { Session } from "./inlineChatSession.js";
 export interface ISessionKeyComputer {
     getComparisonKey(editor: ICodeEditor, uri: URI): string;

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

@@ -1,7 +1,7 @@
 
 import { ChatViewPaneTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 
 async function moveToPanelChat(accessor, model, resend) {

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.d.ts

@@ -20,9 +20,9 @@ import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 import { Session, StashedSession } from "./inlineChatSession.js";
 import { IInlineChatSession2, IInlineChatSessionEndEvent, IInlineChatSessionEvent, ISessionKeyComputer } from "./inlineChatSessionService.js";
 import { IInlineChatSessionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service";
@@ -80,7 +80,6 @@ export declare class InlineChatSessionServiceImpl implements IInlineChatSessionS
 export declare class InlineChatEnabler {
     static Id: string;
     private readonly _ctxHasProvider2;
-    private readonly _ctxHasNotebookInline;
     private readonly _ctxHasNotebookProvider;
     private readonly _ctxPossible;
     private readonly _store;

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

@@ -19,7 +19,6 @@ import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -33,13 +32,14 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { UntitledTextEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
-import { CTX_INLINE_CHAT_HAS_AGENT2, CTX_INLINE_CHAT_HAS_NOTEBOOK_INLINE, CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT, CTX_INLINE_CHAT_POSSIBLE, InlineChatConfigKeys } from '../common/inlineChat.js';
+import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
+import { CTX_INLINE_CHAT_HAS_AGENT2, CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT, CTX_INLINE_CHAT_POSSIBLE, InlineChatConfigKeys } from '../common/inlineChat.js';
 import { Session, SessionWholeRange, HunkData, StashedSession } from './inlineChatSession.js';
 import { askInPanelChat } from './inlineChatSessionService.js';
 import { IInlineChatSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
@@ -365,7 +365,6 @@ let InlineChatEnabler = class InlineChatEnabler {
     constructor(contextKeyService, chatAgentService, editorService, configService) {
         this._store = ( new DisposableStore());
         this._ctxHasProvider2 = CTX_INLINE_CHAT_HAS_AGENT2.bindTo(contextKeyService);
-        this._ctxHasNotebookInline = CTX_INLINE_CHAT_HAS_NOTEBOOK_INLINE.bindTo(contextKeyService);
         this._ctxHasNotebookProvider = CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT.bindTo(contextKeyService);
         this._ctxPossible = CTX_INLINE_CHAT_POSSIBLE.bindTo(contextKeyService);
         const agentObs = observableFromEvent(this, chatAgentService.onDidChangeAgents, () => chatAgentService.getDefaultAgent(ChatAgentLocation.EditorInline));
@@ -381,7 +380,6 @@ let InlineChatEnabler = class InlineChatEnabler {
             }
         }));
         this._store.add(autorun(r => {
-            this._ctxHasNotebookInline.set(!notebookAgentConfigObs.read(r) && !!agentObs.read(r));
             this._ctxHasNotebookProvider.set(notebookAgentConfigObs.read(r) && !!notebookAgentObs.read(r));
         }));
         const updateEditor = () => {
@@ -413,7 +411,7 @@ let InlineChatEscapeToolContribution = class InlineChatEscapeToolContribution ex
         source: ToolDataSource.Internal,
         canBeReferencedInPrompt: false,
         alwaysDisplayInputOutput: false,
-        displayName: ( localize(8312, "Inline Chat to Panel Chat")),
+        displayName: ( localize(8342, "Inline Chat to Panel Chat")),
         modelDescription: 'Moves the inline chat session to the richer panel chat which supports edits across files, creating and deleting files, multi-turn conversations between the user and the assistant, and access to more IDE tools, like retrieve problems, interact with source control, run terminal commands etc.',
     }; }
     constructor(lmTools, inlineChatSessionService, dialogService, codeEditorService, chatService, logService, storageService, instaService) {
@@ -438,15 +436,15 @@ let InlineChatEscapeToolContribution = class InlineChatEscapeToolContribution ex
                 else {
                     result = await dialogService.confirm({
                         type: 'question',
-                        title: ( localize(8313, "Do you want to continue in Chat view?")),
-                        message: ( localize(8314, "Do you want to continue in Chat view?")),
+                        title: ( localize(8343, "Do you want to continue in Chat view?")),
+                        message: ( localize(8344, "Do you want to continue in Chat view?")),
                         detail: ( localize(
-                            8315,
+                            8345,
                             "Inline chat is designed for making single-file code changes. Continue your request in the Chat view or rephrase it for inline chat."
                         )),
-                        primaryButton: ( localize(8316, "Continue in Chat view")),
-                        cancelButton: ( localize(8317, "Cancel")),
-                        checkbox: { label: ( localize(8318, "Don't ask again")), checked: false },
+                        primaryButton: ( localize(8346, "Continue in Chat view")),
+                        cancelButton: ( localize(8347, "Cancel")),
+                        checkbox: { label: ( localize(8348, "Don't ask again")), checked: false },
                     });
                 }
                 const editor = codeEditorService.getFocusedCodeEditor();
@@ -484,8 +482,8 @@ registerAction2(class ResetMoveToPanelChatChoice extends Action2 {
     constructor() {
         super({
             id: 'inlineChat.resetMoveToPanelChatChoice',
-            precondition: ( ( ContextKeyExpr.has('config.chat.disableAIFeatures')).negate()),
-            title: ( localize2(8319, "Reset Choice for 'Move Inline Chat to Panel Chat'")),
+            precondition: ( ChatContextKeys.Setup.hidden.negate()),
+            title: ( localize2(8349, "Reset Choice for 'Move Inline Chat to Panel Chat'")),
             f1: true
         });
     }

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.d.ts

@@ -9,8 +9,6 @@ import { IEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/edi
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { HunkInformation, Session } from "./inlineChatSession.js";
 import { InlineChatZoneWidget } from "./inlineChatZoneWidget.js";
-import { IAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";
@@ -32,8 +30,6 @@ export declare class LiveStrategy {
     protected readonly _zone: InlineChatZoneWidget;
     private readonly _showOverlayToolbar;
     protected readonly _editorWorkerService: IEditorWorkerService;
-    private readonly _accessibilityService;
-    private readonly _configService;
     private readonly _menuService;
     private readonly _contextService;
     private readonly _textFileService;
@@ -51,7 +47,7 @@ export declare class LiveStrategy {
     private readonly _hunkData;
     readonly onDidAccept: Event<void>;
     readonly onDidDiscard: Event<void>;
-    constructor(_session: Session, _editor: ICodeEditor, _zone: InlineChatZoneWidget, _showOverlayToolbar: boolean, contextKeyService: IContextKeyService, _editorWorkerService: IEditorWorkerService, _accessibilityService: IAccessibilityService, _configService: IConfigurationService, _menuService: IMenuService, _contextService: IContextKeyService, _textFileService: ITextFileService, _instaService: IInstantiationService);
+    constructor(_session: Session, _editor: ICodeEditor, _zone: InlineChatZoneWidget, _showOverlayToolbar: boolean, contextKeyService: IContextKeyService, _editorWorkerService: IEditorWorkerService, _menuService: IMenuService, _contextService: IContextKeyService, _textFileService: ITextFileService, _instaService: IInstantiationService);
     dispose(): void;
     private _resetDiff;
     apply(): Promise<void>;

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

@@ -14,17 +14,15 @@ import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/edi
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { Progress } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress';
 import { SaveReason } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
-import { countWords } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatWordCounter';
+import { countWords } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatWordCounter';
 import { HunkState } from './inlineChatSession.js';
-import { minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, MENU_INLINE_CHAT_ZONE, ACTION_TOGGLE_DIFF, InlineChatConfigKeys } from '../common/inlineChat.js';
+import { minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, MENU_INLINE_CHAT_ZONE, ACTION_TOGGLE_DIFF } from '../common/inlineChat.js';
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { asProgressiveEdit, performAsyncTextEdit } from './utils.js';
-import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { DefaultChatTextEditor } from '../../chat/browser/codeBlockPart.js';
+import { DefaultChatTextEditor } from '../../chat/browser/widget/chatContentParts/codeBlockPart.js';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { ConflictActionsFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/view/conflictActions';
@@ -44,14 +42,12 @@ var HunkAction;
     HunkAction[HunkAction["ToggleDiff"] = 4] = "ToggleDiff";
 })(HunkAction || (HunkAction = {}));
 let LiveStrategy = class LiveStrategy {
-    constructor(_session, _editor, _zone, _showOverlayToolbar, contextKeyService, _editorWorkerService, _accessibilityService, _configService, _menuService, _contextService, _textFileService, _instaService) {
+    constructor(_session, _editor, _zone, _showOverlayToolbar, contextKeyService, _editorWorkerService, _menuService, _contextService, _textFileService, _instaService) {
         this._session = _session;
         this._editor = _editor;
         this._zone = _zone;
         this._showOverlayToolbar = _showOverlayToolbar;
         this._editorWorkerService = _editorWorkerService;
-        this._accessibilityService = _accessibilityService;
-        this._configService = _configService;
         this._menuService = _menuService;
         this._contextService = _contextService;
         this._textFileService = _textFileService;
@@ -384,10 +380,6 @@ let LiveStrategy = class LiveStrategy {
             });
             if (widgetData) {
                 this._zone.reveal(widgetData.position);
-                const mode = this._configService.getValue(InlineChatConfigKeys.AccessibleDiffView);
-                if (mode === 'on' || mode === 'auto' && this._accessibilityService.isScreenReaderOptimized()) {
-                    this._zone.widget.showAccessibleHunk(this._session, widgetData.hunk);
-                }
                 this._ctxCurrentChangeHasDiff.set(Boolean(widgetData.toggleDiff));
             }
             else if (this._hunkData.size > 0) {
@@ -446,12 +438,10 @@ let LiveStrategy = class LiveStrategy {
 LiveStrategy = ( __decorate([
     ( __param(4, IContextKeyService)),
     ( __param(5, IEditorWorkerService)),
-    ( __param(6, IAccessibilityService)),
-    ( __param(7, IConfigurationService)),
-    ( __param(8, IMenuService)),
-    ( __param(9, IContextKeyService)),
-    ( __param(10, ITextFileService)),
-    ( __param(11, IInstantiationService))
+    ( __param(6, IMenuService)),
+    ( __param(7, IContextKeyService)),
+    ( __param(8, ITextFileService)),
+    ( __param(9, IInstantiationService))
 ], LiveStrategy));
 function changeDecorationsAndViewZones(editor, callback) {
     editor.changeDecorations(decorationsAccessor => {

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.d.ts

@@ -19,9 +19,9 @@ import { ILayoutService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 import { IChatWidgetViewOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-import { ChatWidget, IChatWidgetLocationOptions } from "../../chat/browser/chatWidget.js";
-import { IChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { ChatWidget, IChatWidgetLocationOptions } from "../../chat/browser/widget/chatWidget.js";
+import { IChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { HunkInformation, Session } from "./inlineChatSession.js";
 export interface InlineChatWidgetViewState {
     editorViewState: ICodeEditorViewState;

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

@@ -48,14 +48,14 @@ import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { AccessibilityCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/common/accessibilityCommands';
 import { MarkUnhelpfulActionId } from '../../chat/browser/actions/chatTitleActions.js';
-import { ChatVoteDownButton } from '../../chat/browser/chatListRenderer.js';
-import { ChatWidget } from '../../chat/browser/chatWidget.js';
-import { chatRequestBackground } from '../../chat/common/chatColors.js';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatVoteDownButton } from '../../chat/browser/widget/chatListRenderer.js';
+import { ChatWidget } from '../../chat/browser/widget/chatWidget.js';
+import { chatRequestBackground } from '../../chat/common/widget/chatColors.js';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
-import { ChatAgentVoteDirection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { ChatAgentVoteDirection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { inlineChatBackground, inlineChatForeground, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_FOCUSED } from '../common/inlineChat.js';
 import * as inlineChat from './media/inlineChat.css';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
@@ -215,7 +215,7 @@ let InlineChatWidget = class InlineChatWidget {
         }));
         this._store.add(this._chatService.onDidPerformUserAction(e => {
             if (isEqual(e.sessionResource, this._chatWidget.viewModel?.model.sessionResource) && e.action.kind === 'vote') {
-                this.updateStatus(( localize(8320, "Thank you for your feedback!")), { resetAfter: 1250 });
+                this.updateStatus(( localize(8350, "Thank you for your feedback!")), { resetAfter: 1250 });
             }
         }));
     }
@@ -227,12 +227,12 @@ let InlineChatWidget = class InlineChatWidget {
                 const kbLabel = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
                 label = kbLabel
                     ? ( localize(
-                    8321,
+                    8351,
                     "Inline Chat Input, Use {0} for Inline Chat Accessibility Help.",
                     kbLabel
                 ))
                     : ( localize(
-                    8322,
+                    8352,
                     "Inline Chat Input, Run the Inline Chat Accessibility Help command for more information."
                 ));
             }
@@ -251,7 +251,7 @@ let InlineChatWidget = class InlineChatWidget {
             this._elements.disclaimerLabel.classList.toggle('hidden', !showDisclaimer);
             if (showDisclaimer) {
                 const renderedMarkdown = disposables.add(this._markdownRendererService.render(( new MarkdownString(( localize(
-                    8323,
+                    8353,
                     "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})",
                     product.defaultChatAgent?.provider?.default?.name ?? '',
                     product.defaultChatAgent?.provider?.default?.name ?? '',
@@ -435,7 +435,7 @@ InlineChatWidget = ( __decorate([
     ( __param(11, IChatEntitlementService)),
     ( __param(12, IMarkdownRendererService))
 ], InlineChatWidget));
-const defaultAriaLabel = ( localize(8324, "Inline Chat Input"));
+const defaultAriaLabel = ( localize(8354, "Inline Chat Input"));
 let EditorBasedInlineChatWidget = class EditorBasedInlineChatWidget extends InlineChatWidget {
     constructor(location, _parentEditor, options, contextKeyService, keybindingService, instantiationService, accessibilityService, configurationService, accessibleViewService, textModelResolverService, chatService, hoverService, layoutService, chatEntitlementService, markdownRendererService) {
         const overflowWidgetsNode = layoutService.getContainer(getWindow(_parentEditor.getContainerDomNode())).appendChild($('.inline-chat-overflow.monaco-editor'));

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.d.ts

@@ -6,7 +6,7 @@ import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IChatWidgetViewOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-import { IChatWidgetLocationOptions } from "../../chat/browser/chatWidget.js";
+import { IChatWidgetLocationOptions } from "../../chat/browser/widget/chatWidget.js";
 import { INotebookEditor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { EditorBasedInlineChatWidget } from "./inlineChatWidget.js";
 export declare class InlineChatZoneWidget extends ZoneWidget {