@codingame/monaco-vscode-chat-service-override 28.4.0 → 29.0.0

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

@@ -0,0 +1,75 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import { Memento } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/memento';
+import { chatSessionResourceToId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import { observableValueOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValueOpts';
+
+let ChatArtifactsStorage = class ChatArtifactsStorage {
+    constructor(storageService) {
+        this._memento = ( new Memento("chat-artifacts", storageService));
+    }
+    getArtifacts(sessionResource) {
+        const storage = this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        return storage[this._toKey(sessionResource)] || [];
+    }
+    setArtifacts(sessionResource, artifacts) {
+        const storage = this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        storage[this._toKey(sessionResource)] = artifacts;
+        this._memento.saveMemento();
+    }
+    migrateArtifacts(oldSessionResource, newSessionResource) {
+        const artifacts = this.getArtifacts(oldSessionResource);
+        if (artifacts.length > 0) {
+            this.setArtifacts(newSessionResource, artifacts);
+            const storage = this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            delete storage[this._toKey(oldSessionResource)];
+            this._memento.saveMemento();
+        }
+    }
+    _toKey(sessionResource) {
+        return chatSessionResourceToId(sessionResource);
+    }
+};
+ChatArtifactsStorage = ( __decorate([( __param(0, IStorageService))], ChatArtifactsStorage));
+let ChatArtifactsService = class ChatArtifactsService extends Disposable {
+    constructor(storageService) {
+        super();
+        this._onDidUpdateArtifacts = this._register(( new Emitter()));
+        this.onDidUpdateArtifacts = this._onDidUpdateArtifacts.event;
+        this._observables = ( new Map());
+        this._storage = ( new ChatArtifactsStorage(storageService));
+    }
+    getArtifacts(sessionResource) {
+        return this._storage.getArtifacts(sessionResource);
+    }
+    setArtifacts(sessionResource, artifacts) {
+        this._storage.setArtifacts(sessionResource, artifacts);
+        const key = chatSessionResourceToId(sessionResource);
+        this._observables.get(key)?.set(artifacts, undefined);
+        this._onDidUpdateArtifacts.fire(sessionResource);
+    }
+    migrateArtifacts(oldSessionResource, newSessionResource) {
+        this._storage.migrateArtifacts(oldSessionResource, newSessionResource);
+        this._onDidUpdateArtifacts.fire(newSessionResource);
+    }
+    artifacts(sessionResource) {
+        const key = chatSessionResourceToId(sessionResource);
+        let obs = this._observables.get(key);
+        if (!obs) {
+            obs = observableValueOpts({
+                owner: this,
+                equalsFn: () => false
+            }, this._storage.getArtifacts(sessionResource));
+            this._observables.set(key, obs);
+        }
+        return obs;
+    }
+};
+ChatArtifactsService = ( __decorate([( __param(0, IStorageService))], ChatArtifactsService));
+
+export { ChatArtifactsService };

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

@@ -20,7 +20,7 @@ var PhraseTextType;
 })(PhraseTextType || (PhraseTextType = {}));
 const VoiceChatInProgress = ( new RawContextKey("voiceChatInProgress", false, {
     type: "boolean",
-    description: ( localize(7406, "A speech-to-text session is in progress for chat."))
+    description: ( localize(7632, "A speech-to-text session is in progress for chat."))
 }));
 let VoiceChatService = class VoiceChatService extends Disposable {
     static {

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

@@ -3,7 +3,7 @@ import './inlineChatDefaultModel.js';
 import { registerEditorContribution, EditorContributionInstantiation } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 import { registerAction2, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { InlineChatController } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { KeepSessionAction2, UndoSessionAction2, UndoAndCloseSessionAction2, CancelSessionAction, StartSessionAction, AskInChatAction, FocusInlineChat, SubmitInlineChatInputAction, QueueInChatAction, HideInlineChatInputAction, FixDiagnosticsAction, DismissEditorAffordanceAction } from './inlineChatActions.js';
+import { KeepSessionAction2, UndoSessionAction2, UndoAndCloseSessionAction2, CancelSessionAction, ContinueInlineChatInChatViewAction, RephraseInlineChatSessionAction, StartSessionAction, AskInChatAction, FocusInlineChat, SubmitInlineChatInputAction, QueueInChatAction, HideInlineChatInputAction, FixDiagnosticsAction, DismissEditorAffordanceAction } from './inlineChatActions.js';
 import { CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_V1_ENABLED, MENU_INLINE_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
@@ -12,6 +12,7 @@ import { InlineChatNotebookContribution } from './inlineChatNotebook.js';
 import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { InlineChatEnabler, InlineChatEscapeToolContribution } from './inlineChatSessionServiceImpl.js';
+import './inlineChatHistoryService.js';
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { ChatSubmitAction, CancelAction } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -28,12 +29,14 @@ registerAction2(KeepSessionAction2);
 registerAction2(UndoSessionAction2);
 registerAction2(UndoAndCloseSessionAction2);
 registerAction2(CancelSessionAction);
+registerAction2(ContinueInlineChatInChatViewAction);
+registerAction2(RephraseInlineChatSessionAction);
 const editActionMenuItem = {
     group: "0_main",
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(9634, "Edit Code"))
+        title: ( localize(9860, "Edit Code"))
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_V1_ENABLED))
 };
@@ -42,7 +45,7 @@ const generateActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(9635, "Generate"))
+        title: ( localize(9861, "Generate"))
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_EDITING.toNegated()), CTX_INLINE_CHAT_V1_ENABLED))
 };
@@ -53,8 +56,8 @@ const cancelActionMenuItem = {
     order: 0,
     command: {
         id: CancelAction.ID,
-        title: ( localize(9636, "Cancel Request")),
-        shortTitle: ( localize(9637, "Cancel"))
+        title: ( localize(9862, "Cancel Request")),
+        shortTitle: ( localize(9863, "Cancel"))
     },
     when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS))
 };

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

@@ -40,6 +40,14 @@ export declare class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction
 export declare class CancelSessionAction extends KeepOrUndoSessionAction {
     constructor();
 }
+export declare class ContinueInlineChatInChatViewAction extends AbstractInlineChatAction {
+    constructor();
+    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor): Promise<void>;
+}
+export declare class RephraseInlineChatSessionAction extends AbstractInlineChatAction {
+    constructor();
+    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor): Promise<void>;
+}
 export declare class SubmitInlineChatInputAction extends AbstractInlineChatAction {
     constructor();
     runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, ..._args: unknown[]): void;

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

@@ -7,7 +7,7 @@ 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, 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 { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_V1_ENABLED, CTX_INLINE_CHAT_V2_ENABLED, CTX_INLINE_CHAT_POSSIBLE, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_ASK_IN_CHAT_ENABLED, 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_TERMINATED, 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, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -25,22 +25,23 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 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';
+import { ChatEntitlementContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
 
 CommandsRegistry.registerCommandAlias("interactiveEditor.start", "inlineChat.start");
 CommandsRegistry.registerCommandAlias("interactive.acceptChanges", ACTION_ACCEPT_CHANGES);
-const START_INLINE_CHAT = registerIcon("start-inline-chat", Codicon.sparkle, ( localize(9638, "Icon which spawns the inline chat from the editor toolbar.")));
+const START_INLINE_CHAT = registerIcon("start-inline-chat", Codicon.sparkle, ( localize(9864, "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(9639, "Open Inline Chat")),
-            shortTitle: ( localize2(9640, "Inline Chat")),
+            title: ( localize2(9865, "Open Inline Chat")),
+            shortTitle: ( localize2(9866, "Inline Chat")),
             category: AbstractInlineChatAction.category,
             f1: true,
-            precondition: ( ContextKeyExpr.and(inlineChatContextKey, ( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()))),
+            precondition: ( ContextKeyExpr.and(inlineChatContextKey, ( ContextKeyExpr.or(( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()), ( CTX_ASK_IN_CHAT_ENABLED.negate()))))),
             keybinding: {
-                when: EditorContextKeys.focus,
+                when: ( ContextKeyExpr.and(EditorContextKeys.focus, inlineChatContextKey, ( ContextKeyExpr.or(( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()), ( CTX_ASK_IN_CHAT_ENABLED.negate()))))),
                 weight: KeybindingWeight.WorkbenchContrib,
                 primary: KeyMod.CtrlCmd | KeyCode.KeyI
             },
@@ -49,7 +50,7 @@ class StartSessionAction extends Action2 {
                 id: MenuId.EditorContext,
                 group: "1_chat",
                 order: 3,
-                when: inlineChatContextKey
+                when: ( ContextKeyExpr.and(inlineChatContextKey, ( ContextKeyExpr.or(( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()), ( CTX_ASK_IN_CHAT_ENABLED.negate())))))
             }, {
                 id: MenuId.ChatTitleBarMenu,
                 group: "a_open",
@@ -91,7 +92,7 @@ class StartSessionAction extends Action2 {
         }
         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"));
+            const placeholder = selection && !selection.isEmpty() ? ( localize(9867, "Describe how to change this")) : ( localize(9868, "Describe what to generate"));
             await ctrl.inputOverlayWidget.showMenuAtSelection(placeholder);
             return;
         }
@@ -106,12 +107,13 @@ MenuRegistry.appendMenuItem(MenuId.InlineChatEditorAffordance, {
     when: ( ContextKeyExpr.and(
         EditorContextKeys.writable,
         EditorContextKeys.hasNonEmptySelection,
-        ( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate())
+        ( ContextKeyExpr.or(( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()), ( CTX_ASK_IN_CHAT_ENABLED.negate()))),
+        ( ChatEntitlementContextKeys.Setup.hidden.negate())
     )),
     command: {
         id: ACTION_START,
-        title: ( localize(9643, "Ask for Edits")),
-        shortTitle: ( localize(9644, "Ask for Edits")),
+        title: ( localize(9869, "Ask for Edits")),
+        shortTitle: ( localize(9870, "Ask for Edits")),
         icon: Codicon.sparkle
     }
 });
@@ -119,7 +121,7 @@ class FocusInlineChat extends EditorAction2 {
     constructor() {
         super({
             id: "inlineChat.focus",
-            title: ( localize2(9645, "Focus Input")),
+            title: ( localize2(9871, "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()))),
@@ -140,7 +142,7 @@ class FocusInlineChat extends EditorAction2 {
 }
 class AbstractInlineChatAction extends EditorAction2 {
     static {
-        this.category = ( localize2(9646, "Inline Chat"));
+        this.category = ( localize2(9872, "Inline Chat"));
     }
     constructor(desc) {
         const massageMenu = menu => {
@@ -206,7 +208,7 @@ class FixDiagnosticsAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: "inlineChat.fixDiagnostics",
-            title: ( localize2(9647, "Fix")),
+            title: ( localize2(9873, "Fix")),
             icon: Codicon.editSparkle,
             precondition: ( ContextKeyExpr.and(
                 CTX_FIX_DIAGNOSTICS_ENABLED,
@@ -231,6 +233,12 @@ class FixDiagnosticsAction extends AbstractInlineChatAction {
                     EditorContextKeys.selectionHasDiagnostics,
                     ( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate())
                 ))
+            }, {
+                id: MenuId.MarkerHoverStatusBar,
+                group: "1_fix",
+                order: 1,
+                when: ( ContextKeyExpr.and(CTX_FIX_DIAGNOSTICS_ENABLED, ( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()))),
+                precondition: null
             }]
         });
     }
@@ -262,7 +270,7 @@ class KeepSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(true, {
             id: "inlineChat2.keep",
-            title: ( localize2(9648, "Keep")),
+            title: ( localize2(9874, "Keep")),
             f1: true,
             icon: Codicon.check,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( ctxHasRequestInProgress.negate()), ctxHasEditorModification)),
@@ -287,7 +295,7 @@ class UndoSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(false, {
             id: "inlineChat2.undo",
-            title: ( localize2(9649, "Undo")),
+            title: ( localize2(9875, "Undo")),
             f1: true,
             icon: Codicon.discard,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_HOVER_MODE)),
@@ -309,7 +317,7 @@ class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(false, {
             id: "inlineChat2.close",
-            title: ( localize2(9650, "Close")),
+            title: ( localize2(9876, "Close")),
             f1: true,
             icon: Codicon.close,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE)),
@@ -331,7 +339,7 @@ class CancelSessionAction extends KeepOrUndoSessionAction {
     constructor() {
         super(false, {
             id: "inlineChat2.cancel",
-            title: ( localize2(9651, "Cancel")),
+            title: ( localize2(9877, "Cancel")),
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ctxHasRequestInProgress)),
             keybinding: [{
                 when: ( ContextKeyExpr.or(EditorContextKeys.focus, ChatContextKeys.inputHasFocus)),
@@ -347,19 +355,56 @@ class CancelSessionAction extends KeepOrUndoSessionAction {
         });
     }
 }
+class ContinueInlineChatInChatViewAction extends AbstractInlineChatAction {
+    constructor() {
+        super({
+            id: "inlineChat2.continueInChat",
+            title: ( localize2(9878, "Ask in Chat")),
+            icon: Codicon.chatSparkle,
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_HOVER_MODE, CTX_INLINE_CHAT_TERMINATED)),
+            menu: [{
+                id: MenuId.ChatEditorInlineExecute,
+                group: "navigation",
+                order: 2,
+                when: ( ContextKeyExpr.and(CTX_HOVER_MODE, CTX_INLINE_CHAT_TERMINATED))
+            }]
+        });
+    }
+    async runInlineChatCommand(_accessor, ctrl, _editor) {
+        await ctrl.continueSessionInChat();
+    }
+}
+class RephraseInlineChatSessionAction extends AbstractInlineChatAction {
+    constructor() {
+        super({
+            id: "inlineChat2.rephrase",
+            title: ( localize2(9879, "Rephrase")),
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_HOVER_MODE, CTX_INLINE_CHAT_TERMINATED)),
+            menu: [{
+                id: MenuId.ChatEditorInlineExecute,
+                group: "navigation",
+                order: 1,
+                when: ( ContextKeyExpr.and(CTX_HOVER_MODE, CTX_INLINE_CHAT_TERMINATED))
+            }]
+        });
+    }
+    async runInlineChatCommand(_accessor, ctrl, _editor) {
+        await ctrl.rephraseSession();
+    }
+}
 class SubmitInlineChatInputAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: "inlineChat.submitInput",
-            title: ( localize2(9652, "Send")),
+            title: ( localize2(9880, "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())
+                ( ContextKeyExpr.or(( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()), ( CTX_ASK_IN_CHAT_ENABLED.negate())))
             )),
             keybinding: {
-                when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, ( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()))),
+                when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, ( ContextKeyExpr.or(( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()), ( CTX_ASK_IN_CHAT_ENABLED.negate()))))),
                 weight: KeybindingWeight.EditorCore + 10,
                 primary: KeyCode.Enter
             },
@@ -367,13 +412,14 @@ class SubmitInlineChatInputAction extends AbstractInlineChatAction {
                 id: MenuId.InlineChatInput,
                 group: "0_main",
                 order: 1,
-                when: ( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate())
+                when: ( ContextKeyExpr.or(( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()), ( CTX_ASK_IN_CHAT_ENABLED.negate())))
             }]
         });
     }
     runInlineChatCommand(_accessor, ctrl, _editor, ..._args) {
         const value = ctrl.inputWidget.value;
         if (value) {
+            ctrl.inputWidget.addToHistory(value);
             ctrl.inputWidget.hide();
             ctrl.run({
                 message: value,
@@ -386,7 +432,7 @@ class HideInlineChatInputAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: "inlineChat.hideInput",
-            title: ( localize2(9653, "Hide Input")),
+            title: ( localize2(9881, "Hide Input")),
             precondition: CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED,
             keybinding: {
                 when: CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED,
@@ -403,10 +449,14 @@ class AskInChatAction extends EditorAction2 {
     constructor() {
         super({
             id: ACTION_ASK_IN_CHAT,
-            title: ( localize2(9654, "Ask in Chat")),
+            title: ( localize2(9882, "Ask in Chat")),
             category: AbstractInlineChatAction.category,
             f1: true,
-            precondition: ( ContextKeyExpr.and(inlineChatContextKey, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT)),
+            precondition: ( ContextKeyExpr.and(
+                inlineChatContextKey,
+                CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT,
+                CTX_ASK_IN_CHAT_ENABLED
+            )),
             keybinding: {
                 when: EditorContextKeys.focus,
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -417,14 +467,19 @@ class AskInChatAction extends EditorAction2 {
                 id: MenuId.EditorContext,
                 group: "1_chat",
                 order: 3,
-                when: ( ContextKeyExpr.and(inlineChatContextKey, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT))
+                when: ( ContextKeyExpr.and(
+                    inlineChatContextKey,
+                    CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT,
+                    CTX_ASK_IN_CHAT_ENABLED
+                ))
             }, {
                 id: MenuId.InlineChatEditorAffordance,
                 group: "0_chat",
                 order: 1,
                 when: ( ContextKeyExpr.and(
                     EditorContextKeys.hasNonEmptySelection,
-                    CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT
+                    CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT,
+                    CTX_ASK_IN_CHAT_ENABLED
                 ))
             }]
         });
@@ -437,7 +492,7 @@ class AskInChatAction extends EditorAction2 {
         }
         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")));
+            ctrl.inputOverlayWidget.showMenuAtSelection(( localize(9883, "Describe how to proceed in Chat")));
         }
     }
 }
@@ -445,7 +500,7 @@ class DismissEditorAffordanceAction extends EditorAction2 {
     constructor() {
         super({
             id: "inlineChat.dismissEditorAffordance",
-            title: ( localize2(9656, "Dismiss Editor Affordance")),
+            title: ( localize2(9884, "Dismiss Editor Affordance")),
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_AFFORDANCE_VISIBLE, ( ContextKeyExpr.equals("config.inlineChat.affordance", "editor")))),
             keybinding: {
                 when: EditorContextKeys.editorTextFocus,
@@ -462,15 +517,20 @@ class QueueInChatAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: "inlineChat.queueInChat",
-            title: ( localize2(9657, "Queue in Chat")),
+            title: ( localize2(9885, "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
+                CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT,
+                CTX_ASK_IN_CHAT_ENABLED
             )),
             keybinding: {
-                when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT)),
+                when: ( ContextKeyExpr.and(
+                    CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED,
+                    CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT,
+                    CTX_ASK_IN_CHAT_ENABLED
+                )),
                 weight: KeybindingWeight.EditorCore + 10,
                 primary: KeyCode.Enter
             },
@@ -478,7 +538,7 @@ class QueueInChatAction extends AbstractInlineChatAction {
                 id: MenuId.InlineChatInput,
                 group: "0_main",
                 order: 1,
-                when: CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT
+                when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_ASK_IN_CHAT_ENABLED))
             }]
         });
     }
@@ -489,6 +549,9 @@ class QueueInChatAction extends AbstractInlineChatAction {
             return;
         }
         const value = ctrl.inputWidget.value;
+        if (value) {
+            ctrl.inputWidget.addToHistory(value);
+        }
         ctrl.inputWidget.hide();
         if (!value) {
             return;
@@ -506,10 +569,9 @@ class QueueInChatAction extends AbstractInlineChatAction {
             await widget.attachmentModel.addFile(editor.getModel().uri, selection);
         }
         await widget.acceptInput(value, {
-            alwaysQueue: true,
             queue: ChatRequestQueueKind.Queued
         });
     }
 }
 
-export { AbstractInlineChatAction, AskInChatAction, CancelSessionAction, DismissEditorAffordanceAction, FixDiagnosticsAction, FocusInlineChat, HideInlineChatInputAction, KeepSessionAction2, QueueInChatAction, START_INLINE_CHAT, StartSessionAction, SubmitInlineChatInputAction, UndoAndCloseSessionAction2, UndoSessionAction2 };
+export { AbstractInlineChatAction, AskInChatAction, CancelSessionAction, ContinueInlineChatInChatViewAction, DismissEditorAffordanceAction, FixDiagnosticsAction, FocusInlineChat, HideInlineChatInputAction, KeepSessionAction2, QueueInChatAction, RephraseInlineChatSessionAction, START_INLINE_CHAT, StartSessionAction, SubmitInlineChatInputAction, UndoAndCloseSessionAction2, UndoSessionAction2 };

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

@@ -41,14 +41,14 @@ registerWorkbenchContribution2(
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
     ...{
         id: "inlineChat",
-        title: ( localize(9663, "Inline Chat")),
+        title: ( localize(9893, "Inline Chat")),
         order: 30,
         type: "object"
     },
     properties: {
         [InlineChatConfigKeys.DefaultModel]: {
             description: ( localize(
-                9664,
+                9894,
                 "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",

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

@@ -0,0 +1,16 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { IInlineChatHistoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatHistoryService.service";
+export declare class InlineChatHistoryService extends Disposable implements IInlineChatHistoryService {
+    private readonly _storageService;
+    readonly _serviceBrand: undefined;
+    private readonly _history;
+    constructor(_storageService: IStorageService);
+    private _saveToStorage;
+    addToHistory(value: string): void;
+    previousValue(): string | undefined;
+    nextValue(): string | undefined;
+    isAtEnd(): boolean;
+    replaceLast(value: string): void;
+    resetCursor(): void;
+}

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

@@ -0,0 +1,67 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { HistoryNavigator2 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/history';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+
+const _storageKey = "inlineChat.history";
+const _capacity = 50;
+let InlineChatHistoryService = class InlineChatHistoryService extends Disposable {
+    constructor(_storageService) {
+        super();
+        this._storageService = _storageService;
+        const raw = this._storageService.get(_storageKey, StorageScope.PROFILE);
+        let entries = [""];
+        if (raw) {
+            try {
+                const parsed = JSON.parse(raw);
+                if (Array.isArray(parsed) && parsed.length > 0) {
+                    entries = parsed;
+                    if (entries[entries.length - 1] !== "") {
+                        entries.push("");
+                    }
+                }
+            } catch {}
+        }
+        this._history = ( new HistoryNavigator2(entries, _capacity));
+        this._store.add(this._storageService.onWillSaveState(() => {
+            this._saveToStorage();
+        }));
+    }
+    _saveToStorage() {
+        const values = [...this._history].filter(v => v.length > 0);
+        if (values.length === 0) {
+            this._storageService.remove(_storageKey, StorageScope.PROFILE);
+        } else {
+            this._storageService.store(
+                _storageKey,
+                JSON.stringify(values),
+                StorageScope.PROFILE,
+                StorageTarget.USER
+            );
+        }
+    }
+    addToHistory(value) {
+        this._history.replaceLast(value);
+        this._history.add("");
+    }
+    previousValue() {
+        return this._history.previous();
+    }
+    nextValue() {
+        return this._history.next();
+    }
+    isAtEnd() {
+        return this._history.isAtEnd();
+    }
+    replaceLast(value) {
+        this._history.replaceLast(value);
+    }
+    resetCursor() {
+        this._history.resetCursor();
+    }
+};
+InlineChatHistoryService = ( __decorate([( __param(0, IStorageService))], InlineChatHistoryService));
+
+export { InlineChatHistoryService };

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

@@ -13,7 +13,7 @@ import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench
 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 { IInlineChatSession2 } from "./inlineChatSessionService.js";
+import { IInlineChatSession2 } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService";
 import { IInlineChatSessionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service";
 export declare class InlineChatError extends Error {
     static readonly code = "InlineChatError";
@@ -47,5 +47,5 @@ export declare class InlineChatEscapeToolContribution extends Disposable {
     static readonly Id = "inlineChat.escapeTool";
     static readonly DONT_ASK_AGAIN_KEY = "inlineChat.dontAskMoveToPanelChat";
     private static readonly _data;
-    constructor(lmTools: ILanguageModelToolsService, inlineChatSessionService: IInlineChatSessionService, dialogService: IDialogService, codeEditorService: ICodeEditorService, chatService: IChatService, logService: ILogService, storageService: IStorageService, instaService: IInstantiationService);
+    constructor(lmTools: ILanguageModelToolsService, inlineChatSessionService: IInlineChatSessionService, dialogService: IDialogService, codeEditorService: ICodeEditorService, configurationService: IConfigurationService, chatService: IChatService, logService: ILogService, storageService: IStorageService, instaService: IInstantiationService);
 }