@codingame/monaco-vscode-chat-service-override 22.1.8 → 23.0.0

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

@@ -7,8 +7,8 @@ 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, InlineChatController1, InlineChatController2 } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_AGENT2, CTX_INLINE_CHAT_POSSIBLE, ACTION_START, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_ZONE, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_TYPE, InlineChatResponseType, ACTION_DISCARD_CHANGES, ACTION_REGENERATE_RESPONSE, MENU_INLINE_CHAT_SIDE, ACTION_VIEW_IN_CHAT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, ACTION_TOGGLE_DIFF } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
-import { ctxRequestCount, ctxHasEditorModification, ctxHasRequestInProgress, ctxIsGlobalEditingSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
+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_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_ZONE, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_TYPE, InlineChatResponseType, ACTION_DISCARD_CHANGES, ACTION_REGENERATE_RESPONSE, MENU_INLINE_CHAT_SIDE, ACTION_VIEW_IN_CHAT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, ACTION_TOGGLE_DIFF } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-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 { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
@@ -26,16 +26,17 @@ import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { IInlineChatSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
+import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 
 CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
 CommandsRegistry.registerCommandAlias('interactive.acceptChanges', ACTION_ACCEPT_CHANGES);
-const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( localize(7877, 'Icon which spawns the inline chat from the editor toolbar.')));
-const inlineChatContextKey = ( ContextKeyExpr.and(( ContextKeyExpr.or(CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_AGENT2)), CTX_INLINE_CHAT_POSSIBLE, EditorContextKeys.writable, ( EditorContextKeys.editorSimpleInput.negate())));
+const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( localize(8122, '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(7878, 'Open Inline Chat')),
+            title: ( localize2(8123, 'Open Inline Chat')),
             category: AbstractInline1ChatAction.category,
             f1: true,
             precondition: inlineChatContextKey,
@@ -91,7 +92,7 @@ class FocusInlineChat extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.focus',
-            title: ( localize2(7879, "Focus Input")),
+            title: ( localize2(8124, "Focus Input")),
             f1: true,
             category: AbstractInline1ChatAction.category,
             precondition: ( ContextKeyExpr.and(EditorContextKeys.editorTextFocus, CTX_INLINE_CHAT_VISIBLE, ( CTX_INLINE_CHAT_FOCUSED.negate()), ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()))),
@@ -114,7 +115,7 @@ class UnstashSessionAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.unstash',
-            title: ( localize2(7880, "Resume Last Dismissed Inline Chat")),
+            title: ( localize2(8125, "Resume Last Dismissed Inline Chat")),
             category: AbstractInline1ChatAction.category,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_STASHED_SESSION, EditorContextKeys.writable)),
             keybinding: {
@@ -136,16 +137,16 @@ class UnstashSessionAction extends EditorAction2 {
     }
 }
 class AbstractInline1ChatAction extends EditorAction2 {
-    static { this.category = ( localize2(7881, "Inline Chat")); }
+    static { this.category = ( localize2(8126, "Inline Chat")); }
     constructor(desc) {
         const massageMenu = (menu) => {
             if (Array.isArray(menu)) {
                 for (const entry of menu) {
-                    entry.when = ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_AGENT, entry.when));
+                    entry.when = ( ContextKeyExpr.and(CTX_INLINE_CHAT_V1_ENABLED, entry.when));
                 }
             }
             else if (menu) {
-                menu.when = ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_AGENT, menu.when));
+                menu.when = ( ContextKeyExpr.and(CTX_INLINE_CHAT_V1_ENABLED, menu.when));
             }
         };
         if (Array.isArray(desc.menu)) {
@@ -157,7 +158,7 @@ class AbstractInline1ChatAction extends EditorAction2 {
         super({
             ...desc,
             category: AbstractInline1ChatAction.category,
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_AGENT, desc.precondition))
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_V1_ENABLED, desc.precondition))
         });
     }
     runEditorCommand(accessor, editor, ..._args) {
@@ -198,7 +199,7 @@ class ArrowOutUpAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.arrowOutUp',
-            title: ( localize(7882, 'Cursor Up')),
+            title: ( localize(8127, 'Cursor Up')),
             precondition: ( ContextKeyExpr.and(
                 CTX_INLINE_CHAT_FOCUSED,
                 CTX_INLINE_CHAT_INNER_CURSOR_FIRST,
@@ -219,7 +220,7 @@ class ArrowOutDownAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.arrowOutDown',
-            title: ( localize(7883, 'Cursor Down')),
+            title: ( localize(8128, 'Cursor Down')),
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_LAST, ( EditorContextKeys.isEmbeddedDiffEditor.negate()), ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()))),
             keybinding: {
                 weight: KeybindingWeight.EditorCore,
@@ -235,8 +236,8 @@ class AcceptChanges extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: ACTION_ACCEPT_CHANGES,
-            title: ( localize2(7884, "Accept Changes")),
-            shortTitle: ( localize(7885, 'Accept')),
+            title: ( localize2(8129, "Accept Changes")),
+            shortTitle: ( localize(8130, 'Accept')),
             icon: Codicon.check,
             f1: true,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE)),
@@ -264,7 +265,7 @@ class DiscardHunkAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: ACTION_DISCARD_CHANGES,
-            title: ( localize(7886, 'Discard')),
+            title: ( localize(8131, 'Discard')),
             icon: Codicon.chromeClose,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: [{
@@ -287,8 +288,8 @@ class RerunAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: ACTION_REGENERATE_RESPONSE,
-            title: ( localize2(7887, "Rerun Request")),
-            shortTitle: ( localize(7888, 'Rerun')),
+            title: ( localize2(8132, "Rerun Request")),
+            shortTitle: ( localize(8133, 'Rerun')),
             f1: false,
             icon: Codicon.refresh,
             precondition: CTX_INLINE_CHAT_VISIBLE,
@@ -313,7 +314,7 @@ class RerunAction extends AbstractInline1ChatAction {
         }
         const lastRequest = model.getRequests().at(-1);
         if (lastRequest) {
-            const widget = chatWidgetService.getWidgetBySessionId(model.sessionId);
+            const widget = chatWidgetService.getWidgetBySessionResource(model.sessionResource);
             await chatService.resendRequest(lastRequest, {
                 noCommandDetection: false,
                 attempt: lastRequest.attempt + 1,
@@ -327,7 +328,7 @@ class CloseAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.close',
-            title: ( localize(7889, 'Close')),
+            title: ( localize(8134, 'Close')),
             icon: Codicon.close,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -354,7 +355,7 @@ class ConfigureInlineChatAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.configure',
-            title: ( localize2(7890, 'Configure Inline Chat')),
+            title: ( localize2(8135, 'Configure Inline Chat')),
             icon: Codicon.settingsGear,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             f1: true,
@@ -373,7 +374,7 @@ class MoveToNextHunk extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToNextHunk',
-            title: ( localize2(7891, 'Move to Next Change')),
+            title: ( localize2(8136, 'Move to Next Change')),
             precondition: CTX_INLINE_CHAT_VISIBLE,
             f1: true,
             keybinding: {
@@ -390,7 +391,7 @@ class MoveToPreviousHunk extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToPreviousHunk',
-            title: ( localize2(7892, 'Move to Previous Change')),
+            title: ( localize2(8137, 'Move to Previous Change')),
             f1: true,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -407,7 +408,7 @@ class ViewInChatAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: ACTION_VIEW_IN_CHAT,
-            title: ( localize(7893, 'View in Chat')),
+            title: ( localize(8138, 'View in Chat')),
             icon: Codicon.chatSparkle,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: [{
@@ -437,7 +438,7 @@ class ToggleDiffForChange extends AbstractInline1ChatAction {
         super({
             id: ACTION_TOGGLE_DIFF,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_CHANGE_HAS_DIFF)),
-            title: ( localize2(7894, 'Toggle Changes')),
+            title: ( localize2(8139, 'Toggle Changes')),
             icon: Codicon.diffSingle,
             toggled: {
                 condition: CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF,
@@ -459,16 +460,16 @@ class ToggleDiffForChange extends AbstractInline1ChatAction {
     }
 }
 class AbstractInline2ChatAction extends EditorAction2 {
-    static { this.category = ( localize2(7881, "Inline Chat")); }
+    static { this.category = ( localize2(8126, "Inline Chat")); }
     constructor(desc) {
         const massageMenu = (menu) => {
             if (Array.isArray(menu)) {
                 for (const entry of menu) {
-                    entry.when = ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_AGENT2, entry.when));
+                    entry.when = ( ContextKeyExpr.and(CTX_INLINE_CHAT_V2_ENABLED, entry.when));
                 }
             }
             else if (menu) {
-                menu.when = ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_AGENT2, menu.when));
+                menu.when = ( ContextKeyExpr.and(CTX_INLINE_CHAT_V2_ENABLED, menu.when));
             }
         };
         if (Array.isArray(desc.menu)) {
@@ -480,7 +481,7 @@ class AbstractInline2ChatAction extends EditorAction2 {
         super({
             ...desc,
             category: AbstractInline2ChatAction.category,
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_AGENT2, desc.precondition))
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_V2_ENABLED, desc.precondition))
         });
     }
     runEditorCommand(accessor, editor, ..._args) {
@@ -518,32 +519,8 @@ class AbstractInline2ChatAction extends EditorAction2 {
     }
 }
 class KeepOrUndoSessionAction extends AbstractInline2ChatAction {
-    constructor(id, _keep) {
-        super({
-            id,
-            title: _keep
-                ? ( localize2(7895, "Keep"))
-                : ( localize2(7896, "Undo")),
-            f1: true,
-            icon: _keep ? Codicon.check : Codicon.discard,
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( ctxHasRequestInProgress.negate()))),
-            keybinding: [{
-                    weight: KeybindingWeight.WorkbenchContrib + 10,
-                    primary: _keep
-                        ? KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyY
-                        : KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyN
-                }],
-            menu: [{
-                    id: MENU_INLINE_CHAT_WIDGET_STATUS,
-                    group: '0_main',
-                    order: 1,
-                    when: ( ContextKeyExpr.and(
-                        CTX_INLINE_CHAT_HAS_AGENT2,
-                        ContextKeyExpr.greater(ctxRequestCount.key, 0),
-                        ctxHasEditorModification
-                    )),
-                }]
-        });
+    constructor(_keep, desc) {
+        super(desc);
         this._keep = _keep;
     }
     async runInlineChatCommand(accessor, _ctrl, editor, ..._args) {
@@ -560,110 +537,56 @@ class KeepOrUndoSessionAction extends AbstractInline2ChatAction {
             else {
                 await session.editingSession.reject();
             }
+            editor.setSelection(editor.getSelection().collapseToStart());
             session.dispose();
         }
     }
 }
 class KeepSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
-        super('inlineChat2.keep', true);
-    }
-}
-class UndoSessionAction2 extends KeepOrUndoSessionAction {
-    constructor() {
-        super('inlineChat2.undo', false);
-    }
-}
-class CloseSessionAction2 extends AbstractInline2ChatAction {
-    constructor() {
-        super({
-            id: 'inlineChat2.close',
-            title: ( localize2(7897, "Close")),
+        super(true, {
+            id: 'inlineChat2.keep',
+            title: ( localize2(8140, "Keep")),
             f1: true,
-            icon: Codicon.close,
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( ctxHasRequestInProgress.negate()), ( ContextKeyExpr.or(( ctxRequestCount.isEqualTo(0)), ( ctxHasEditorModification.negate()))))),
+            icon: Codicon.check,
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( ctxHasRequestInProgress.negate()), ctxHasEditorModification, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditorInline)))),
             keybinding: [{
-                    when: ( ctxRequestCount.isEqualTo(0)),
+                    when: ( ContextKeyExpr.and(ChatContextKeys.inputHasFocus, ( ChatContextKeys.inputHasText.negate()))),
                     weight: KeybindingWeight.WorkbenchContrib,
-                    primary: KeyMod.CtrlCmd | KeyCode.KeyI,
+                    primary: KeyCode.Enter
                 }, {
-                    weight: KeybindingWeight.WorkbenchContrib,
-                    primary: KeyCode.Escape,
+                    weight: KeybindingWeight.WorkbenchContrib + 10,
+                    primary: KeyMod.CtrlCmd | KeyCode.Enter
                 }],
             menu: [{
-                    id: MENU_INLINE_CHAT_SIDE,
+                    id: MenuId.ChatEditorInlineExecute,
                     group: 'navigation',
-                    when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_AGENT2, ( ctxRequestCount.isEqualTo(0)))),
-                }, {
-                    id: MENU_INLINE_CHAT_WIDGET_STATUS,
-                    group: '0_main',
-                    order: 1,
-                    when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_AGENT2, ( ctxHasEditorModification.negate()))),
+                    order: 4,
+                    when: ( ContextKeyExpr.and(( ctxHasRequestInProgress.negate()), ctxHasEditorModification, ( ChatContextKeys.inputHasText.toNegated()))),
                 }]
         });
     }
-    runInlineChatCommand(accessor, _ctrl, editor, ...args) {
-        const inlineChatSessions = accessor.get(IInlineChatSessionService);
-        if (editor.hasModel()) {
-            const textModel = editor.getModel();
-            inlineChatSessions.getSession2(textModel.uri)?.dispose();
-        }
-    }
 }
-class RevealWidget extends AbstractInline2ChatAction {
+class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
-        super({
-            id: 'inlineChat2.reveal',
-            title: ( localize2(7898, "Toggle Inline Chat")),
-            f1: true,
-            icon: Codicon.chatSparkle,
-            precondition: ( ContextKeyExpr.and(( ctxIsGlobalEditingSession.negate()), ContextKeyExpr.greaterEquals(ctxRequestCount.key, 1))),
-            toggled: {
-                condition: CTX_INLINE_CHAT_VISIBLE,
-            },
-            keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod.CtrlCmd | KeyCode.KeyI
-            },
-            menu: {
-                id: MenuId.ChatEditingEditorContent,
-                when: ( ContextKeyExpr.and(ContextKeyExpr.greaterEquals(ctxRequestCount.key, 1), ( ctxIsGlobalEditingSession.negate()))),
-                group: 'navigate',
-                order: 4,
-            }
-        });
-    }
-    runInlineChatCommand(_accessor, ctrl, _editor) {
-        ctrl.toggleWidgetUntilNextRequest();
-        ctrl.markActiveController();
-    }
-}
-class CancelRequestAction extends AbstractInline2ChatAction {
-    constructor() {
-        super({
-            id: 'inlineChat2.cancelRequest',
-            title: ( localize2(7899, "Cancel Request")),
+        super(false, {
+            id: 'inlineChat2.close',
+            title: ( localize2(8141, "Close")),
             f1: true,
-            icon: Codicon.stopCircle,
-            precondition: ( ContextKeyExpr.and(( ctxIsGlobalEditingSession.negate()), ctxHasRequestInProgress)),
-            toggled: CTX_INLINE_CHAT_VISIBLE,
-            menu: {
-                id: MenuId.ChatEditingEditorContent,
-                when: ( ContextKeyExpr.and(( ctxIsGlobalEditingSession.negate()), ctxHasRequestInProgress)),
-                group: 'a_request',
-                order: 1,
-            }
+            icon: Codicon.close,
+            precondition: CTX_INLINE_CHAT_VISIBLE,
+            keybinding: [{
+                    when: ( ContextKeyExpr.or(( ContextKeyExpr.and(EditorContextKeys.focus, ( ctxHasEditorModification.negate()))), ChatContextKeys.inputHasFocus)),
+                    weight: KeybindingWeight.WorkbenchContrib + 1,
+                    primary: KeyCode.Escape,
+                }],
+            menu: [{
+                    id: MenuId.ChatEditorInlineExecute,
+                    group: 'navigation',
+                    order: 100
+                }]
         });
     }
-    runInlineChatCommand(accessor, ctrl, _editor) {
-        const chatService = accessor.get(IChatService);
-        const { viewModel } = ctrl.widget.chatWidget;
-        if (viewModel) {
-            ctrl.toggleWidgetUntilNextRequest();
-            ctrl.markActiveController();
-            chatService.cancelCurrentRequestForSession(viewModel.sessionId);
-        }
-    }
 }
 
-export { AbstractInline1ChatAction, AcceptChanges, ArrowOutDownAction, ArrowOutUpAction, CancelRequestAction, CloseAction, CloseSessionAction2, ConfigureInlineChatAction, DiscardHunkAction, FocusInlineChat, KeepSessionAction2, MoveToNextHunk, MoveToPreviousHunk, RerunAction, RevealWidget, START_INLINE_CHAT, StartSessionAction, ToggleDiffForChange, UndoSessionAction2, UnstashSessionAction, ViewInChatAction };
+export { AbstractInline1ChatAction, AcceptChanges, ArrowOutDownAction, ArrowOutUpAction, CloseAction, ConfigureInlineChatAction, DiscardHunkAction, FocusInlineChat, KeepSessionAction2, MoveToNextHunk, MoveToPreviousHunk, RerunAction, START_INLINE_CHAT, StartSessionAction, ToggleDiffForChange, UndoAndCloseSessionAction2, UnstashSessionAction, ViewInChatAction };

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

@@ -22,7 +22,7 @@ export declare class ShowInlineChatHintAction extends EditorAction2 {
     runEditorCommand(_accessor: ServicesAccessor, editor: ICodeEditor, ...args: [
         uri: URI,
         position: IPosition,
-        ...rest: any[]
+        ...rest: unknown[]
     ]): Promise<void>;
 }
 export declare class InlineChatHintsController extends Disposable implements IEditorContribution {

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

@@ -32,12 +32,12 @@ import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { MODE_FILE_EXTENSION } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
-import { INSTRUCTIONS_LANGUAGE_ID, PROMPT_LANGUAGE_ID } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
-import { CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_HAS_AGENT, ACTION_START, InlineChatConfigKeys } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { LEGACY_MODE_FILE_EXTENSION, AGENT_FILE_EXTENSION } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { INSTRUCTIONS_LANGUAGE_ID, PROMPT_LANGUAGE_ID } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_V1_ENABLED, ACTION_START, InlineChatConfigKeys } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { AbstractInline1ChatAction } from './inlineChatActions.js';
 import { InlineChatController } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import * as inlineChat from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css';
+import * as inlineChat from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -51,18 +51,19 @@ const IGNORED_LANGUAGE_IDS = ( new Set([
     'search-result',
     INSTRUCTIONS_LANGUAGE_ID,
     PROMPT_LANGUAGE_ID,
-    MODE_FILE_EXTENSION
+    LEGACY_MODE_FILE_EXTENSION,
+    AGENT_FILE_EXTENSION
 ]));
-const CTX_INLINE_CHAT_SHOWING_HINT = ( new RawContextKey('inlineChatShowingHint', false, ( localize(7907, "Whether inline chat shows a contextual hint"))));
+const CTX_INLINE_CHAT_SHOWING_HINT = ( new RawContextKey('inlineChatShowingHint', false, ( localize(8153, "Whether inline chat shows a contextual hint"))));
 const _inlineChatActionId = 'inlineChat.startWithCurrentLine';
 class InlineChatExpandLineAction extends EditorAction2 {
     constructor() {
         super({
             id: _inlineChatActionId,
             category: AbstractInline1ChatAction.category,
-            title: ( localize2(7908, "Start in Editor with Current Line")),
+            title: ( localize2(8154, "Start in Editor with Current Line")),
             f1: true,
-            precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable)),
+            precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_V1_ENABLED, EditorContextKeys.writable)),
             keybinding: [{
                     when: CTX_INLINE_CHAT_SHOWING_HINT,
                     weight: KeybindingWeight.WorkbenchContrib + 1,
@@ -103,9 +104,9 @@ class ShowInlineChatHintAction extends EditorAction2 {
         super({
             id: 'inlineChat.showHint',
             category: AbstractInline1ChatAction.category,
-            title: ( localize2(7909, "Show Inline Chat Hint")),
+            title: ( localize2(8155, "Show Inline Chat Hint")),
             f1: false,
-            precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable)),
+            precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_V1_ENABLED, EditorContextKeys.writable)),
         });
     }
     async runEditorCommand(_accessor, editor, ...args) {
@@ -231,15 +232,15 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
                 this._ctxShowingHint.reset();
                 return;
             }
-            const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.EditorInline)?.name ?? ( localize(7910, "Chat"));
+            const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.EditorInline)?.name ?? ( localize(8156, "Chat"));
             const { position, isEol, isWhitespace, kb, model } = showData;
             const inlineClassName = ['a' , 'inline-chat-hint', 'inline-chat-hint-text'];
             let content;
             if (isWhitespace) {
-                content = '\u00a0' + ( localize(7911, "{0} to edit with {1}", kb, agentName));
+                content = '\u00a0' + ( localize(8157, "{0} to edit with {1}", kb, agentName));
             }
             else if (isEol) {
-                content = '\u00a0' + ( localize(7912, "{0} to continue with {1}", kb, agentName));
+                content = '\u00a0' + ( localize(8158, "{0} to continue with {1}", kb, agentName));
             }
             else {
                 content = '\u200a' + kb + '\u200a';
@@ -268,7 +269,7 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
             getActions: () => [
                 toAction({
                     id: 'inlineChat.disableHint',
-                    label: ( localize(7913, "Disable Inline Chat Hint")),
+                    label: ( localize(8159, "Disable Inline Chat Hint")),
                     run: async () => {
                         await this._configurationService.updateValue(setting, false);
                     }
@@ -296,7 +297,7 @@ class HideInlineChatHintAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.hideHint',
-            title: ( localize2(7914, "Hide Inline Chat Hint")),
+            title: ( localize2(8160, "Hide Inline Chat Hint")),
             precondition: CTX_INLINE_CHAT_SHOWING_HINT,
             keybinding: {
                 weight: KeybindingWeight.EditorContrib - 10,

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.d.ts

@@ -1,6 +1,6 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { CellDiffInfo } from "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
-import { INotebookEditor } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 export declare class NotebookModifiedCellDecorator extends Disposable {
     private readonly notebookEditor;
     private readonly decorators;

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.js

@@ -1,7 +1,7 @@
 
 import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { NotebookOverviewRulerLane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { overviewRulerModifiedForeground } from '@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { NotebookOverviewRulerLane } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { overviewRulerModifiedForeground } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
 
 class NotebookModifiedCellDecorator extends Disposable {
     constructor(notebookEditor) {

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

@@ -13,42 +13,42 @@ import { IRemoteCodingAgentsService } from '@codingame/monaco-vscode-api/vscode/
 const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'remoteCodingAgents',
     jsonSchema: {
-        description: ( localize(9972, 'Contributes remote coding agent integrations to the chat widget.')),
+        description: ( localize(10221, 'Contributes remote coding agent integrations to the chat widget.')),
         type: 'array',
         items: {
             type: 'object',
             properties: {
                 id: {
-                    description: ( localize(9973, 'A unique identifier for this item.')),
+                    description: ( localize(10222, 'A unique identifier for this item.')),
                     type: 'string',
                 },
                 command: {
                     description: ( localize(
-                        9974,
+                        10223,
                         'Identifier of the command to execute. The command must be declared in the "commands" section.'
                     )),
                     type: 'string'
                 },
                 displayName: {
                     description: ( localize(
-                        9975,
+                        10224,
                         'A user-friendly name for this item which is used for display in menus.'
                     )),
                     type: 'string'
                 },
                 description: {
-                    description: ( localize(9976, 'Description of the remote agent for use in menus and tooltips.')),
+                    description: ( localize(10225, 'Description of the remote agent for use in menus and tooltips.')),
                     type: 'string'
                 },
                 followUpRegex: {
                     description: ( localize(
-                        9977,
+                        10226,
                         'The last occurrence of pattern in an existing chat conversation is sent to the contributing extension to facilitate follow-up responses.'
                     )),
                     type: 'string',
                 },
                 when: {
-                    description: ( localize(9978, 'Condition which must be true to show this item.')),
+                    description: ( localize(10227, 'Condition which must be true to show this item.')),
                     type: 'string'
                 },
             },

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.chat.contribution.js

@@ -7,6 +7,9 @@ import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/p
 import { TerminalChatAccessibilityHelp } from './terminalChatAccessibilityHelp.js';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { TerminalChatEnabler } from './terminalChatEnabler.js';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import './terminalChatService.js';
 
 registerTerminalContribution(TerminalChatController.ID, TerminalChatController, false);
 AccessibleViewRegistry.register(( new TerminalInlineChatAccessibleView()));