@codingame/monaco-vscode-chat-service-override 30.0.0 → 31.0.0

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

@@ -29,14 +29,14 @@ import { ChatEntitlementContextKeys } from '@codingame/monaco-vscode-api/vscode/
 
 CommandsRegistry.registerCommandAlias("interactiveEditor.start", "inlineChat.start");
 CommandsRegistry.registerCommandAlias("interactive.acceptChanges", ACTION_ACCEPT_CHANGES);
-const START_INLINE_CHAT = registerIcon("start-inline-chat", Codicon.sparkle, ( localize(9929, "Icon which spawns the inline chat from the editor toolbar.")));
+const START_INLINE_CHAT = registerIcon("start-inline-chat", Codicon.sparkle, ( localize(10067, "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(9930, "Open Inline Chat")),
-            shortTitle: ( localize2(9931, "Inline Chat")),
+            title: ( localize2(10068, "Open Inline Chat")),
+            shortTitle: ( localize2(10069, "Inline Chat")),
             category: AbstractInlineChatAction.category,
             f1: true,
             precondition: ( ContextKeyExpr.and(inlineChatContextKey, ( ContextKeyExpr.or(( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()), ( CTX_ASK_IN_CHAT_ENABLED.negate()))))),
@@ -92,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(9932, "Describe how to change this")) : ( localize(9933, "Describe what to generate"));
+            const placeholder = selection && !selection.isEmpty() ? ( localize(10070, "Describe how to change this")) : ( localize(10071, "Describe what to generate"));
             await ctrl.inputOverlayWidget.showMenuAtSelection(placeholder);
             return;
         }
@@ -112,8 +112,8 @@ MenuRegistry.appendMenuItem(MenuId.InlineChatEditorAffordance, {
     )),
     command: {
         id: ACTION_START,
-        title: ( localize(9934, "Ask for Edits")),
-        shortTitle: ( localize(9935, "Ask for Edits")),
+        title: ( localize(10072, "Ask for Edits")),
+        shortTitle: ( localize(10073, "Ask for Edits")),
         icon: Codicon.sparkle
     }
 });
@@ -121,7 +121,7 @@ class FocusInlineChat extends EditorAction2 {
     constructor() {
         super({
             id: "inlineChat.focus",
-            title: ( localize2(9936, "Focus Input")),
+            title: ( localize2(10074, "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()))),
@@ -142,7 +142,7 @@ class FocusInlineChat extends EditorAction2 {
 }
 class AbstractInlineChatAction extends EditorAction2 {
     static {
-        this.category = ( localize2(9937, "Inline Chat"));
+        this.category = ( localize2(10075, "Inline Chat"));
     }
     constructor(desc) {
         const massageMenu = menu => {
@@ -208,7 +208,7 @@ class FixDiagnosticsAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: "inlineChat.fixDiagnostics",
-            title: ( localize2(9938, "Fix")),
+            title: ( localize2(10076, "Fix")),
             icon: Codicon.editSparkle,
             precondition: ( ContextKeyExpr.and(
                 CTX_FIX_DIAGNOSTICS_ENABLED,
@@ -270,7 +270,7 @@ class KeepSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(true, {
             id: "inlineChat2.keep",
-            title: ( localize2(9939, "Keep")),
+            title: ( localize2(10077, "Keep")),
             f1: true,
             icon: Codicon.check,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( ctxHasRequestInProgress.negate()), ctxHasEditorModification)),
@@ -295,7 +295,7 @@ class UndoSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(false, {
             id: "inlineChat2.undo",
-            title: ( localize2(9940, "Undo")),
+            title: ( localize2(10078, "Undo")),
             f1: true,
             icon: Codicon.discard,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_HOVER_MODE)),
@@ -317,7 +317,7 @@ class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(false, {
             id: "inlineChat2.close",
-            title: ( localize2(9941, "Close")),
+            title: ( localize2(10079, "Close")),
             f1: true,
             icon: Codicon.close,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE)),
@@ -339,7 +339,7 @@ class CancelSessionAction extends KeepOrUndoSessionAction {
     constructor() {
         super(false, {
             id: "inlineChat2.cancel",
-            title: ( localize2(9942, "Cancel")),
+            title: ( localize2(10080, "Cancel")),
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ctxHasRequestInProgress)),
             keybinding: [{
                 when: ( ContextKeyExpr.or(EditorContextKeys.focus, ChatContextKeys.inputHasFocus)),
@@ -359,14 +359,14 @@ class ContinueInlineChatInChatViewAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: "inlineChat2.continueInChat",
-            title: ( localize2(9943, "Ask in Chat")),
+            title: ( localize2(10081, "Ask in Chat")),
             icon: Codicon.chatSparkle,
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_HOVER_MODE, CTX_INLINE_CHAT_TERMINATED)),
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_TERMINATED)),
             menu: [{
                 id: MenuId.ChatEditorInlineExecute,
                 group: "navigation",
                 order: 2,
-                when: ( ContextKeyExpr.and(CTX_HOVER_MODE, CTX_INLINE_CHAT_TERMINATED))
+                when: CTX_INLINE_CHAT_TERMINATED
             }]
         });
     }
@@ -378,13 +378,13 @@ class RephraseInlineChatSessionAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: "inlineChat2.rephrase",
-            title: ( localize2(9944, "Rephrase")),
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_HOVER_MODE, CTX_INLINE_CHAT_TERMINATED)),
+            title: ( localize2(10082, "Rephrase")),
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_TERMINATED)),
             menu: [{
                 id: MenuId.ChatEditorInlineExecute,
                 group: "navigation",
                 order: 1,
-                when: ( ContextKeyExpr.and(CTX_HOVER_MODE, CTX_INLINE_CHAT_TERMINATED))
+                when: CTX_INLINE_CHAT_TERMINATED
             }]
         });
     }
@@ -396,7 +396,7 @@ class SubmitInlineChatInputAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: "inlineChat.submitInput",
-            title: ( localize2(9945, "Send")),
+            title: ( localize2(10083, "Send")),
             icon: Codicon.send,
             precondition: ( ContextKeyExpr.and(
                 CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED,
@@ -432,7 +432,7 @@ class HideInlineChatInputAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: "inlineChat.hideInput",
-            title: ( localize2(9946, "Hide Input")),
+            title: ( localize2(10084, "Hide Input")),
             precondition: CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED,
             keybinding: {
                 when: CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED,
@@ -449,7 +449,7 @@ class AskInChatAction extends EditorAction2 {
     constructor() {
         super({
             id: ACTION_ASK_IN_CHAT,
-            title: ( localize2(9947, "Ask in Chat")),
+            title: ( localize2(10085, "Ask in Chat")),
             category: AbstractInlineChatAction.category,
             f1: true,
             precondition: ( ContextKeyExpr.and(
@@ -492,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(9948, "Describe how to proceed in Chat")));
+            ctrl.inputOverlayWidget.showMenuAtSelection(( localize(10086, "Describe how to proceed in Chat")));
         }
     }
 }
@@ -500,7 +500,7 @@ class DismissEditorAffordanceAction extends EditorAction2 {
     constructor() {
         super({
             id: "inlineChat.dismissEditorAffordance",
-            title: ( localize2(9949, "Dismiss Editor Affordance")),
+            title: ( localize2(10087, "Dismiss Editor Affordance")),
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_AFFORDANCE_VISIBLE, ( ContextKeyExpr.equals("config.inlineChat.affordance", "editor")))),
             keybinding: {
                 when: EditorContextKeys.editorTextFocus,
@@ -517,7 +517,7 @@ class QueueInChatAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: "inlineChat.queueInChat",
-            title: ( localize2(9950, "Queue in Chat")),
+            title: ( localize2(10088, "Queue in Chat")),
             icon: Codicon.arrowUp,
             precondition: ( ContextKeyExpr.and(
                 CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED,

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

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

@@ -2,11 +2,9 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 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;
+    #private;
     readonly _serviceBrand: undefined;
-    private readonly _history;
-    constructor(_storageService: IStorageService);
-    private _saveToStorage;
+    constructor(storageService: IStorageService);
     addToHistory(value: string): void;
     previousValue(): string | undefined;
     nextValue(): string | undefined;

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

@@ -8,10 +8,12 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 const _storageKey = "inlineChat.history";
 const _capacity = 50;
 let InlineChatHistoryService = class InlineChatHistoryService extends Disposable {
-    constructor(_storageService) {
+    #history;
+    #storageService;
+    constructor(storageService) {
         super();
-        this._storageService = _storageService;
-        const raw = this._storageService.get(_storageKey, StorageScope.PROFILE);
+        this.#storageService = storageService;
+        const raw = this.#storageService.get(_storageKey, StorageScope.PROFILE);
         let entries = [""];
         if (raw) {
             try {
@@ -24,17 +26,17 @@ let InlineChatHistoryService = class InlineChatHistoryService extends Disposable
                 }
             } catch {}
         }
-        this._history = ( new HistoryNavigator2(entries, _capacity));
-        this._store.add(this._storageService.onWillSaveState(() => {
-            this._saveToStorage();
+        this.#history = ( new HistoryNavigator2(entries, _capacity));
+        this._store.add(this.#storageService.onWillSaveState(() => {
+            this.#saveToStorage();
         }));
     }
-    _saveToStorage() {
-        const values = [...this._history].filter(v => v.length > 0);
+    #saveToStorage() {
+        const values = [...this.#history].filter(v => v.length > 0);
         if (values.length === 0) {
-            this._storageService.remove(_storageKey, StorageScope.PROFILE);
+            this.#storageService.remove(_storageKey, StorageScope.PROFILE);
         } else {
-            this._storageService.store(
+            this.#storageService.store(
                 _storageKey,
                 JSON.stringify(values),
                 StorageScope.PROFILE,
@@ -43,23 +45,23 @@ let InlineChatHistoryService = class InlineChatHistoryService extends Disposable
         }
     }
     addToHistory(value) {
-        this._history.replaceLast(value);
-        this._history.add("");
+        this.#history.replaceLast(value);
+        this.#history.add("");
     }
     previousValue() {
-        return this._history.previous();
+        return this.#history.previous();
     }
     nextValue() {
-        return this._history.next();
+        return this.#history.next();
     }
     isAtEnd() {
-        return this._history.isAtEnd();
+        return this.#history.isAtEnd();
     }
     replaceLast(value) {
-        this._history.replaceLast(value);
+        this.#history.replaceLast(value);
     }
     resetCursor() {
-        this._history.resetCursor();
+        this.#history.resetCursor();
     }
 };
 InlineChatHistoryService = ( __decorate([( __param(0, IStorageService))], InlineChatHistoryService));

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

@@ -2,7 +2,7 @@ import { IInlineChatSessionService } from "@codingame/monaco-vscode-api/vscode/v
 import { INotebookEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 export declare class InlineChatNotebookContribution {
-    private readonly _store;
+    #private;
     constructor(sessionService: IInlineChatSessionService, editorService: IEditorService, notebookEditorService: INotebookEditorService);
     dispose(): void;
 }

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

@@ -9,9 +9,9 @@ import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contri
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 let InlineChatNotebookContribution = class InlineChatNotebookContribution {
+    #store = ( new DisposableStore());
     constructor(sessionService, editorService, notebookEditorService) {
-        this._store = ( new DisposableStore());
-        this._store.add(sessionService.onWillStartSession(newSessionEditor => {
+        this.#store.add(sessionService.onWillStartSession(newSessionEditor => {
             const candidate = CellUri.parse(newSessionEditor.getModel().uri);
             if (!candidate) {
                 return;
@@ -37,7 +37,7 @@ let InlineChatNotebookContribution = class InlineChatNotebookContribution {
         }));
     }
     dispose() {
-        this._store.dispose();
+        this.#store.dispose();
     }
 };
 InlineChatNotebookContribution = ( __decorate([( __param(0, IInlineChatSessionService)), ( __param(1, IEditorService)), ( __param(2, INotebookEditorService))], InlineChatNotebookContribution));

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

@@ -2,13 +2,9 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IActiveCodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
-import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
-import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
-import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
@@ -20,32 +16,24 @@ export declare class InlineChatError extends Error {
     constructor(message: string);
 }
 export declare class InlineChatSessionServiceImpl implements IInlineChatSessionService {
-    private readonly _chatService;
+    #private;
     _serviceBrand: undefined;
-    private readonly _store;
-    private readonly _sessions;
-    private readonly _onWillStartSession;
     readonly onWillStartSession: Event<IActiveCodeEditor>;
-    private readonly _onDidChangeSessions;
     readonly onDidChangeSessions: Event<this>;
-    constructor(_chatService: IChatService, chatAgentService: IChatAgentService);
+    constructor(chatService: IChatService, chatAgentService: IChatAgentService);
     dispose(): void;
     createSession(editor: IActiveCodeEditor): IInlineChatSession2;
     getSessionByTextModel(uri: URI): IInlineChatSession2 | undefined;
     getSessionBySessionUri(sessionResource: URI): IInlineChatSession2 | undefined;
 }
 export declare class InlineChatEnabler {
+    #private;
     static Id: string;
-    private readonly _ctxHasProvider2;
-    private readonly _ctxHasNotebookProvider;
-    private readonly _ctxPossible;
-    private readonly _store;
     constructor(contextKeyService: IContextKeyService, chatAgentService: IChatAgentService, editorService: IEditorService, configService: IConfigurationService);
     dispose(): void;
 }
 export declare class InlineChatEscapeToolContribution extends Disposable {
+    #private;
     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, configurationService: IConfigurationService, chatService: IChatService, logService: ILogService, storageService: IStorageService, instaService: IInstantiationService);
+    constructor(lmTools: ILanguageModelToolsService, inlineChatSessionService: IInlineChatSessionService, logService: ILogService);
 }