@codingame/monaco-vscode-chat-service-override 26.2.2 → 28.0.0

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

@@ -7,13 +7,12 @@ import { EmbeddedDiffEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs
 import { EmbeddedCodeEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
 import { InlineChatController, InlineChatRunOptions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_V1_ENABLED, CTX_INLINE_CHAT_V2_ENABLED, CTX_INLINE_CHAT_POSSIBLE, ACTION_START, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_FOCUSED, CTX_HOVER_MODE } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_V1_ENABLED, CTX_INLINE_CHAT_V2_ENABLED, CTX_INLINE_CHAT_POSSIBLE, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, ACTION_START, InlineChatConfigKeys, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_FOCUSED, CTX_FIX_DIAGNOSTICS_ENABLED, CTX_HOVER_MODE, CTX_INLINE_CHAT_PENDING_CONFIRMATION, CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, CTX_INLINE_CHAT_INPUT_HAS_TEXT, ACTION_ASK_IN_CHAT, CTX_INLINE_CHAT_AFFORDANCE_VISIBLE } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { ctxHasRequestInProgress, ctxHasEditorModification } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Action2, MenuId, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 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 '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
@@ -22,20 +21,24 @@ import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { ChatRequestQueueKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 
 CommandsRegistry.registerCommandAlias("interactiveEditor.start", "inlineChat.start");
 CommandsRegistry.registerCommandAlias("interactive.acceptChanges", ACTION_ACCEPT_CHANGES);
-const START_INLINE_CHAT = registerIcon("start-inline-chat", Codicon.sparkle, ( localize(8811, "Icon which spawns the inline chat from the editor toolbar.")));
+const START_INLINE_CHAT = registerIcon("start-inline-chat", Codicon.sparkle, ( localize(9638, "Icon which spawns the inline chat from the editor toolbar.")));
 const inlineChatContextKey = ( ContextKeyExpr.and(( ContextKeyExpr.or(CTX_INLINE_CHAT_V1_ENABLED, CTX_INLINE_CHAT_V2_ENABLED)), CTX_INLINE_CHAT_POSSIBLE, EditorContextKeys.writable, ( EditorContextKeys.editorSimpleInput.negate())));
 class StartSessionAction extends Action2 {
     constructor() {
         super({
             id: ACTION_START,
-            title: ( localize2(8812, "Open Inline Chat")),
-            shortTitle: ( localize2(8813, "Inline Chat")),
+            title: ( localize2(9639, "Open Inline Chat")),
+            shortTitle: ( localize2(9640, "Inline Chat")),
             category: AbstractInlineChatAction.category,
             f1: true,
-            precondition: inlineChatContextKey,
+            precondition: ( ContextKeyExpr.and(inlineChatContextKey, ( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()))),
             keybinding: {
                 when: EditorContextKeys.focus,
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -51,15 +54,6 @@ class StartSessionAction extends Action2 {
                 id: MenuId.ChatTitleBarMenu,
                 group: "a_open",
                 order: 3
-            }, {
-                id: MenuId.ChatEditorInlineGutter,
-                group: "1_chat",
-                order: 1
-            }, {
-                id: MenuId.InlineChatEditorAffordance,
-                group: "1_chat",
-                order: 1,
-                when: EditorContextKeys.hasNonEmptySelection
             }]
         });
     }
@@ -85,6 +79,7 @@ class StartSessionAction extends Action2 {
         });
     }
     async _runEditorCommand(accessor, editor, ...args) {
+        const configServce = accessor.get(IConfigurationService);
         const ctrl = InlineChatController.get(editor);
         if (!ctrl) {
             return;
@@ -94,16 +89,37 @@ class StartSessionAction extends Action2 {
         if (arg && InlineChatRunOptions.isInlineChatRunOptions(arg)) {
             options = arg;
         }
-        await InlineChatController.get(editor)?.run({
+        if (!options?.message && configServce.getValue(InlineChatConfigKeys.RenderMode) === "hover") {
+            const selection = editor.getSelection();
+            const placeholder = selection && !selection.isEmpty() ? ( localize(9641, "Describe how to change this")) : ( localize(9642, "Describe what to generate"));
+            await ctrl.inputOverlayWidget.showMenuAtSelection(placeholder);
+            return;
+        }
+        await ctrl?.run({
             ...options
         });
     }
 }
+MenuRegistry.appendMenuItem(MenuId.InlineChatEditorAffordance, {
+    group: "0_chat",
+    order: 1,
+    when: ( ContextKeyExpr.and(
+        EditorContextKeys.writable,
+        EditorContextKeys.hasNonEmptySelection,
+        ( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate())
+    )),
+    command: {
+        id: ACTION_START,
+        title: ( localize(9643, "Ask for Edits")),
+        shortTitle: ( localize(9644, "Ask for Edits")),
+        icon: Codicon.sparkle
+    }
+});
 class FocusInlineChat extends EditorAction2 {
     constructor() {
         super({
             id: "inlineChat.focus",
-            title: ( localize2(8814, "Focus Input")),
+            title: ( localize2(9645, "Focus Input")),
             f1: true,
             category: AbstractInlineChatAction.category,
             precondition: ( ContextKeyExpr.and(EditorContextKeys.editorTextFocus, CTX_INLINE_CHAT_VISIBLE, ( CTX_INLINE_CHAT_FOCUSED.negate()), ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()))),
@@ -124,7 +140,7 @@ class FocusInlineChat extends EditorAction2 {
 }
 class AbstractInlineChatAction extends EditorAction2 {
     static {
-        this.category = ( localize2(8815, "Inline Chat"));
+        this.category = ( localize2(9646, "Inline Chat"));
     }
     constructor(desc) {
         const massageMenu = menu => {
@@ -186,6 +202,46 @@ class AbstractInlineChatAction extends EditorAction2 {
         this.runInlineChatCommand(accessor, ctrl, editor, ..._args);
     }
 }
+class FixDiagnosticsAction extends AbstractInlineChatAction {
+    constructor() {
+        super({
+            id: "inlineChat.fixDiagnostics",
+            title: ( localize2(9647, "Fix")),
+            icon: Codicon.editSparkle,
+            precondition: ( ContextKeyExpr.and(
+                CTX_FIX_DIAGNOSTICS_ENABLED,
+                EditorContextKeys.selectionHasDiagnostics,
+                ( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate())
+            )),
+            menu: [{
+                id: MenuId.InlineChatEditorAffordance,
+                group: "1_quickfix",
+                order: 100,
+                when: ( ContextKeyExpr.and(
+                    CTX_FIX_DIAGNOSTICS_ENABLED,
+                    EditorContextKeys.selectionHasDiagnostics,
+                    ( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate())
+                ))
+            }, {
+                id: MenuId.ChatEditorInlineMenu,
+                group: "2_chat",
+                order: 1,
+                when: ( ContextKeyExpr.and(
+                    CTX_FIX_DIAGNOSTICS_ENABLED,
+                    EditorContextKeys.selectionHasDiagnostics,
+                    ( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate())
+                ))
+            }]
+        });
+    }
+    runInlineChatCommand(_accessor, ctrl, _editor, ..._args) {
+        ctrl.inputWidget.hide();
+        ctrl.run({
+            autoSend: true,
+            attachDiagnostics: true
+        });
+    }
+}
 class KeepOrUndoSessionAction extends AbstractInlineChatAction {
     constructor(_keep, desc) {
         super(desc);
@@ -206,7 +262,7 @@ class KeepSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(true, {
             id: "inlineChat2.keep",
-            title: ( localize2(8816, "Keep")),
+            title: ( localize2(9648, "Keep")),
             f1: true,
             icon: Codicon.check,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( ctxHasRequestInProgress.negate()), ctxHasEditorModification)),
@@ -231,7 +287,7 @@ class UndoSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(false, {
             id: "inlineChat2.undo",
-            title: ( localize2(8817, "Undo")),
+            title: ( localize2(9649, "Undo")),
             f1: true,
             icon: Codicon.discard,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_HOVER_MODE)),
@@ -253,10 +309,10 @@ class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(false, {
             id: "inlineChat2.close",
-            title: ( localize2(8818, "Close")),
+            title: ( localize2(9650, "Close")),
             f1: true,
             icon: Codicon.close,
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( CTX_HOVER_MODE.negate()))),
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE)),
             keybinding: [{
                 when: ( ContextKeyExpr.or(( ContextKeyExpr.and(EditorContextKeys.focus, ( ctxHasEditorModification.negate()))), ChatContextKeys.inputHasFocus)),
                 weight: KeybindingWeight.WorkbenchContrib + 1,
@@ -266,10 +322,194 @@ class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction {
                 id: MenuId.ChatEditorInlineExecute,
                 group: "navigation",
                 order: 100,
-                when: ( ContextKeyExpr.or(( CTX_HOVER_MODE.negate()), ( ContextKeyExpr.and(CTX_HOVER_MODE, ( ctxHasEditorModification.negate()), ( ctxHasRequestInProgress.negate())))))
+                when: ( ContextKeyExpr.or(( CTX_HOVER_MODE.negate()), ( ContextKeyExpr.and(CTX_HOVER_MODE, ( ctxHasEditorModification.negate()), ( ctxHasRequestInProgress.negate()))), ( ContextKeyExpr.and(CTX_HOVER_MODE, CTX_INLINE_CHAT_PENDING_CONFIRMATION))))
             }]
         });
     }
 }
+class CancelSessionAction extends KeepOrUndoSessionAction {
+    constructor() {
+        super(false, {
+            id: "inlineChat2.cancel",
+            title: ( localize2(9651, "Cancel")),
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ctxHasRequestInProgress)),
+            keybinding: [{
+                when: ( ContextKeyExpr.or(EditorContextKeys.focus, ChatContextKeys.inputHasFocus)),
+                weight: KeybindingWeight.WorkbenchContrib + 1,
+                primary: KeyCode.Escape
+            }],
+            menu: [{
+                id: MenuId.ChatEditorInlineExecute,
+                group: "navigation",
+                order: 100,
+                when: ( ContextKeyExpr.and(CTX_HOVER_MODE, ctxHasRequestInProgress))
+            }]
+        });
+    }
+}
+class SubmitInlineChatInputAction extends AbstractInlineChatAction {
+    constructor() {
+        super({
+            id: "inlineChat.submitInput",
+            title: ( localize2(9652, "Send")),
+            icon: Codicon.send,
+            precondition: ( ContextKeyExpr.and(
+                CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED,
+                CTX_INLINE_CHAT_INPUT_HAS_TEXT,
+                ( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate())
+            )),
+            keybinding: {
+                when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, ( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()))),
+                weight: KeybindingWeight.EditorCore + 10,
+                primary: KeyCode.Enter
+            },
+            menu: [{
+                id: MenuId.InlineChatInput,
+                group: "0_main",
+                order: 1,
+                when: ( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate())
+            }]
+        });
+    }
+    runInlineChatCommand(_accessor, ctrl, _editor, ..._args) {
+        const value = ctrl.inputWidget.value;
+        if (value) {
+            ctrl.inputWidget.hide();
+            ctrl.run({
+                message: value,
+                autoSend: true
+            });
+        }
+    }
+}
+class HideInlineChatInputAction extends AbstractInlineChatAction {
+    constructor() {
+        super({
+            id: "inlineChat.hideInput",
+            title: ( localize2(9653, "Hide Input")),
+            precondition: CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED,
+            keybinding: {
+                when: CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED,
+                weight: KeybindingWeight.EditorCore + 10,
+                primary: KeyCode.Escape
+            }
+        });
+    }
+    runInlineChatCommand(_accessor, ctrl, _editor, ..._args) {
+        ctrl.inputWidget.hide();
+    }
+}
+class AskInChatAction extends EditorAction2 {
+    constructor() {
+        super({
+            id: ACTION_ASK_IN_CHAT,
+            title: ( localize2(9654, "Ask in Chat")),
+            category: AbstractInlineChatAction.category,
+            f1: true,
+            precondition: ( ContextKeyExpr.and(inlineChatContextKey, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT)),
+            keybinding: {
+                when: EditorContextKeys.focus,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.CtrlCmd | KeyCode.KeyI
+            },
+            icon: Codicon.chatSparkle,
+            menu: [{
+                id: MenuId.EditorContext,
+                group: "1_chat",
+                order: 3,
+                when: ( ContextKeyExpr.and(inlineChatContextKey, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT))
+            }, {
+                id: MenuId.InlineChatEditorAffordance,
+                group: "0_chat",
+                order: 1,
+                when: ( ContextKeyExpr.and(
+                    EditorContextKeys.hasNonEmptySelection,
+                    CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT
+                ))
+            }]
+        });
+    }
+    async runEditorCommand(accessor, editor) {
+        const chatEditingService = accessor.get(IChatEditingService);
+        const ctrl = InlineChatController.get(editor);
+        if (!ctrl || !editor.hasModel()) {
+            return;
+        }
+        const entry = chatEditingService.editingSessionsObs.get().find(value => value.getEntry(editor.getModel().uri));
+        if (entry) {
+            ctrl.inputOverlayWidget.showMenuAtSelection(( localize(9655, "Describe how to proceed in Chat")));
+        }
+    }
+}
+class DismissEditorAffordanceAction extends EditorAction2 {
+    constructor() {
+        super({
+            id: "inlineChat.dismissEditorAffordance",
+            title: ( localize2(9656, "Dismiss Editor Affordance")),
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_AFFORDANCE_VISIBLE, ( ContextKeyExpr.equals("config.inlineChat.affordance", "editor")))),
+            keybinding: {
+                when: EditorContextKeys.editorTextFocus,
+                weight: KeybindingWeight.EditorContrib,
+                primary: KeyCode.Escape
+            }
+        });
+    }
+    runEditorCommand(_accessor, editor) {
+        InlineChatController.get(editor)?.inputOverlayWidget.dismiss();
+    }
+}
+class QueueInChatAction extends AbstractInlineChatAction {
+    constructor() {
+        super({
+            id: "inlineChat.queueInChat",
+            title: ( localize2(9657, "Queue in Chat")),
+            icon: Codicon.arrowUp,
+            precondition: ( ContextKeyExpr.and(
+                CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED,
+                CTX_INLINE_CHAT_INPUT_HAS_TEXT,
+                CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT
+            )),
+            keybinding: {
+                when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT)),
+                weight: KeybindingWeight.EditorCore + 10,
+                primary: KeyCode.Enter
+            },
+            menu: [{
+                id: MenuId.InlineChatInput,
+                group: "0_main",
+                order: 1,
+                when: CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT
+            }]
+        });
+    }
+    async runInlineChatCommand(accessor, ctrl, editor) {
+        const chatEditingService = accessor.get(IChatEditingService);
+        const chatWidgetService = accessor.get(IChatWidgetService);
+        if (!editor.hasModel()) {
+            return;
+        }
+        const value = ctrl.inputWidget.value;
+        ctrl.inputWidget.hide();
+        if (!value) {
+            return;
+        }
+        const session = chatEditingService.editingSessionsObs.get().find(s => s.getEntry(editor.getModel().uri));
+        if (!session) {
+            return;
+        }
+        const widget = await chatWidgetService.openSession(session.chatSessionResource);
+        if (!widget) {
+            return;
+        }
+        const selection = editor.getSelection();
+        if (selection && !selection.isEmpty()) {
+            await widget.attachmentModel.addFile(editor.getModel().uri, selection);
+        }
+        await widget.acceptInput(value, {
+            alwaysQueue: true,
+            queue: ChatRequestQueueKind.Queued
+        });
+    }
+}
 
-export { AbstractInlineChatAction, FocusInlineChat, KeepSessionAction2, START_INLINE_CHAT, StartSessionAction, UndoAndCloseSessionAction2, UndoSessionAction2 };
+export { AbstractInlineChatAction, AskInChatAction, CancelSessionAction, DismissEditorAffordanceAction, FixDiagnosticsAction, FocusInlineChat, HideInlineChatInputAction, KeepSessionAction2, QueueInChatAction, START_INLINE_CHAT, StartSessionAction, SubmitInlineChatInputAction, UndoAndCloseSessionAction2, UndoSessionAction2 };

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

@@ -1,15 +1,10 @@
-import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
-import { InlineChatConfigKeys } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-export declare class InlineChatDefaultModel extends Disposable {
-    private readonly languageModelsService;
-    private readonly logService;
+import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
+import { DefaultModelContribution } from "../../chat/browser/defaultModelContribution.js";
+export declare class InlineChatDefaultModel extends DefaultModelContribution {
     static readonly ID = "workbench.contrib.inlineChatDefaultModel";
-    static readonly configName = InlineChatConfigKeys.DefaultModel;
-    static modelIds: string[];
-    static modelLabels: string[];
-    static modelDescriptions: string[];
+    static readonly modelIds: string[];
+    static readonly modelLabels: string[];
+    static readonly modelDescriptions: string[];
     constructor(languageModelsService: ILanguageModelsService, logService: ILogService);
-    private _updateModelValues;
 }

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

@@ -2,101 +2,37 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { InlineChatConfigKeys } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
-import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { DEFAULT_MODEL_PICKER_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/input/modelPickerWidget';
+import { createDefaultModelArrays, DefaultModelContribution } from '../../chat/browser/defaultModelContribution.js';
 
-var InlineChatDefaultModel_1;
-let InlineChatDefaultModel = class InlineChatDefaultModel extends Disposable {
-    static {
-        InlineChatDefaultModel_1 = this;
-    }
+const arrays = createDefaultModelArrays();
+let InlineChatDefaultModel = class InlineChatDefaultModel extends DefaultModelContribution {
     static {
         this.ID = "workbench.contrib.inlineChatDefaultModel";
     }
     static {
-        this.configName = InlineChatConfigKeys.DefaultModel;
+        this.modelIds = arrays.modelIds;
     }
     static {
-        this.modelIds = [""];
+        this.modelLabels = arrays.modelLabels;
     }
     static {
-        this.modelLabels = [( localize(8824, "Auto (Vendor Default)"))];
-    }
-    static {
-        this.modelDescriptions = [( localize(8825, "Use the vendor's default model"))];
+        this.modelDescriptions = arrays.modelDescriptions;
     }
     constructor(languageModelsService, logService) {
-        super();
-        this.languageModelsService = languageModelsService;
-        this.logService = logService;
-        this._register(
-            languageModelsService.onDidChangeLanguageModels(() => this._updateModelValues())
-        );
-        this._updateModelValues();
-    }
-    _updateModelValues() {
-        try {
-            InlineChatDefaultModel_1.modelIds.length = 0;
-            InlineChatDefaultModel_1.modelLabels.length = 0;
-            InlineChatDefaultModel_1.modelDescriptions.length = 0;
-            InlineChatDefaultModel_1.modelIds.push("");
-            InlineChatDefaultModel_1.modelLabels.push(( localize(8824, "Auto (Vendor Default)")));
-            InlineChatDefaultModel_1.modelDescriptions.push(( localize(8825, "Use the vendor's default model")));
-            const modelIds = this.languageModelsService.getLanguageModelIds();
-            const models = [];
-            for (const modelId of modelIds) {
-                try {
-                    const metadata = this.languageModelsService.lookupLanguageModel(modelId);
-                    if (metadata) {
-                        models.push({
-                            identifier: modelId,
-                            metadata
-                        });
-                    } else {
-                        this.logService.warn(`[InlineChatDefaultModel] No metadata found for model ID: ${modelId}`);
-                    }
-                } catch (e) {
-                    this.logService.error(`[InlineChatDefaultModel] Error looking up model ${modelId}:`, e);
-                }
-            }
-            const supportedModels = models.filter(model => {
-                if (!model.metadata?.isUserSelectable) {
-                    return false;
-                }
-                if (!model.metadata.capabilities?.toolCalling) {
-                    return false;
-                }
-                return true;
-            });
-            supportedModels.sort((a, b) => {
-                const aCategory = a.metadata.modelPickerCategory ?? DEFAULT_MODEL_PICKER_CATEGORY;
-                const bCategory = b.metadata.modelPickerCategory ?? DEFAULT_MODEL_PICKER_CATEGORY;
-                if (aCategory.order !== bCategory.order) {
-                    return aCategory.order - bCategory.order;
-                }
-                return a.metadata.name.localeCompare(b.metadata.name);
-            });
-            for (const model of supportedModels) {
-                try {
-                    const qualifiedName = `${model.metadata.name} (${model.metadata.vendor})`;
-                    InlineChatDefaultModel_1.modelIds.push(qualifiedName);
-                    InlineChatDefaultModel_1.modelLabels.push(model.metadata.name);
-                    InlineChatDefaultModel_1.modelDescriptions.push(model.metadata.tooltip ?? model.metadata.detail ?? "");
-                } catch (e) {
-                    this.logService.error(`[InlineChatDefaultModel] Error adding model ${model.metadata.name}:`, e);
-                }
-            }
-        } catch (e) {
-            this.logService.error("[InlineChatDefaultModel] Error updating model values:", e);
-        }
+        super(arrays, {
+            configKey: InlineChatConfigKeys.DefaultModel,
+            configSectionId: "inlineChat",
+            logPrefix: "[InlineChatDefaultModel]",
+            filter: metadata => !!metadata.capabilities?.toolCalling
+        }, languageModelsService, logService);
     }
 };
-InlineChatDefaultModel = InlineChatDefaultModel_1 = ( __decorate([( __param(0, ILanguageModelsService)), ( __param(1, ILogService))], InlineChatDefaultModel));
+InlineChatDefaultModel = ( __decorate([( __param(0, ILanguageModelsService)), ( __param(1, ILogService))], InlineChatDefaultModel));
 registerWorkbenchContribution2(
     InlineChatDefaultModel.ID,
     InlineChatDefaultModel,
@@ -105,18 +41,19 @@ registerWorkbenchContribution2(
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
     ...{
         id: "inlineChat",
-        title: ( localize(8826, "Inline Chat")),
+        title: ( localize(9663, "Inline Chat")),
         order: 30,
         type: "object"
     },
     properties: {
-        [InlineChatDefaultModel.configName]: {
+        [InlineChatConfigKeys.DefaultModel]: {
             description: ( localize(
-                8827,
+                9664,
                 "Select the default language model to use for inline chat from the available providers. Model names may include the provider in parentheses, for example 'Claude Haiku 4.5 (copilot)'."
             )),
             type: "string",
             default: "",
+            order: 1,
             enum: InlineChatDefaultModel.modelIds,
             enumItemLabels: InlineChatDefaultModel.modelLabels,
             markdownEnumDescriptions: InlineChatDefaultModel.modelDescriptions

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

@@ -1,5 +1,4 @@
 
-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/chatService.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
@@ -10,10 +9,10 @@ async function askInPanelChat(accessor, request, state) {
     if (!request) {
         return;
     }
-    const newModelRef = chatService.startSession(ChatAgentLocation.Chat);
+    const newModelRef = chatService.startNewLocalSession(ChatAgentLocation.Chat);
     const newModel = newModelRef.object;
     newModel.inputModel.setState({ ...state });
-    const widget = await widgetService.openSession(newModelRef.object.sessionResource, ChatViewPaneTarget);
+    const widget = await widgetService.openSession(newModelRef.object.sessionResource);
     newModelRef.dispose();
     widget?.acceptInput(request.message.text);
 }

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

@@ -72,14 +72,14 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
             throw ( new Error("Session already exists"));
         }
         this._onWillStartSession.fire(editor);
-        const chatModelRef = this._chatService.startSession(ChatAgentLocation.EditorInline, {
+        const chatModelRef = this._chatService.startNewLocalSession(ChatAgentLocation.EditorInline, {
             canUseTools: false
         });
         const chatModel = chatModelRef.object;
         chatModel.startEditingSession(false);
         const store = ( new DisposableStore());
         store.add(toDisposable(() => {
-            this._chatService.cancelCurrentRequestForSession(chatModel.sessionResource);
+            this._chatService.cancelCurrentRequestForSession(chatModel.sessionResource, "inlineChatSession");
             chatModel.editingSession?.reject();
             this._sessions.delete(uri);
             this._onDidChangeSessions.fire(this);
@@ -212,7 +212,7 @@ let InlineChatEscapeToolContribution = class InlineChatEscapeToolContribution ex
             source: ToolDataSource.Internal,
             canBeReferencedInPrompt: false,
             alwaysDisplayInputOutput: false,
-            displayName: ( localize(8836, "Inline Chat to Panel Chat")),
+            displayName: ( localize(9671, "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."
         };
     }
@@ -266,16 +266,16 @@ let InlineChatEscapeToolContribution = class InlineChatEscapeToolContribution ex
                 } else {
                     result = await dialogService.confirm({
                         type: "question",
-                        title: ( localize(8837, "Do you want to continue in Chat view?")),
-                        message: ( localize(8838, "Do you want to continue in Chat view?")),
+                        title: ( localize(9672, "Do you want to continue in Chat view?")),
+                        message: ( localize(9673, "Do you want to continue in Chat view?")),
                         detail: ( localize(
-                            8839,
+                            9674,
                             "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(8840, "Continue in Chat view")),
-                        cancelButton: ( localize(8841, "Cancel")),
+                        primaryButton: ( localize(9675, "Continue in Chat view")),
+                        cancelButton: ( localize(9676, "Cancel")),
                         checkbox: {
-                            label: ( localize(8842, "Don't ask again")),
+                            label: ( localize(9677, "Don't ask again")),
                             checked: false
                         }
                     });
@@ -322,7 +322,7 @@ registerAction2(class ResetMoveToPanelChatChoice extends Action2 {
         super({
             id: "inlineChat.resetMoveToPanelChatChoice",
             precondition: ( ChatContextKeys.Setup.hidden.negate()),
-            title: ( localize2(8843, "Reset Choice for 'Move Inline Chat to Panel Chat'")),
+            title: ( localize2(9678, "Reset Choice for 'Move Inline Chat to Panel Chat'")),
             f1: true
         });
     }