@codingame/monaco-vscode-api 7.0.11 → 7.1.1

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

@@ -7,7 +7,7 @@ import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/code
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { InlineChatController, InlineChatRunOptions } from './inlineChatController.js';
 import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDIT_MODE, EditMode, MENU_INLINE_CHAT_WIDGET_STATUS, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_TYPE, InlineChatResponseType, ACTION_REGENERATE_RESPONSE, MENU_INLINE_CHAT_CONTENT_STATUS, ACTION_VIEW_IN_CHAT, ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF } from '../common/inlineChat.js';
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localize2, localize } from '../../../../nls.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import '../../../../platform/instantiation/common/instantiation.js';
@@ -23,11 +23,10 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { IPreferencesService } from '../../../services/preferences/common/preferences.service.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { IChatService } from '../../chat/common/chatService.service.js';
-const _moduleId = "vs/workbench/contrib/inlineChat/browser/inlineChatActions";
 CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
 CommandsRegistry.registerCommandAlias('interactive.acceptChanges', ACTION_ACCEPT_CHANGES);
-const LOCALIZED_START_INLINE_CHAT_STRING = ( localize2WithPath(_moduleId, 0, 'Start in Editor'));
-const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( localizeWithPath(_moduleId, 1, 'Icon which spawns the inline chat from the editor toolbar.')));
+const LOCALIZED_START_INLINE_CHAT_STRING = ( localize2(7311, 'Start in Editor'));
+const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( localize(7312, 'Icon which spawns the inline chat from the editor toolbar.')));
 class StartSessionAction extends EditorAction2 {
     constructor() {
         super({
@@ -62,7 +61,7 @@ class UnstashSessionAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.unstash',
-            title: ( localize2WithPath(_moduleId, 2, "Resume Last Dismissed Inline Chat")),
+            title: ( localize2(7313, "Resume Last Dismissed Inline Chat")),
             category: AbstractInlineChatAction.category,
             precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_STASHED_SESSION, EditorContextKeys.writable))),
             keybinding: {
@@ -85,7 +84,7 @@ class UnstashSessionAction extends EditorAction2 {
     }
 }
 class AbstractInlineChatAction extends EditorAction2 {
-    static { this.category = ( localize2WithPath(_moduleId, 3, "Inline Chat")); }
+    static { this.category = ( localize2(7314, "Inline Chat")); }
     constructor(desc) {
         super({
             ...desc,
@@ -131,7 +130,7 @@ class ArrowOutUpAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.arrowOutUp',
-            title: ( localizeWithPath(_moduleId, 4, 'Cursor Up')),
+            title: ( localize(7315, 'Cursor Up')),
             precondition: ( (ContextKeyExpr.and(
                 CTX_INLINE_CHAT_FOCUSED,
                 CTX_INLINE_CHAT_INNER_CURSOR_FIRST,
@@ -152,7 +151,7 @@ class ArrowOutDownAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.arrowOutDown',
-            title: ( localizeWithPath(_moduleId, 5, 'Cursor Down')),
+            title: ( localize(7316, 'Cursor Down')),
             precondition: ( (ContextKeyExpr.and(
                 CTX_INLINE_CHAT_FOCUSED,
                 CTX_INLINE_CHAT_INNER_CURSOR_LAST,
@@ -173,7 +172,7 @@ class FocusInlineChat extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.focus',
-            title: ( localize2WithPath(_moduleId, 6, "Focus Input")),
+            title: ( localize2(7317, "Focus Input")),
             f1: true,
             category: AbstractInlineChatAction.category,
             precondition: ( (ContextKeyExpr.and(
@@ -207,7 +206,7 @@ class DiscardAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.discard',
-            title: ( localizeWithPath(_moduleId, 7, 'Discard')),
+            title: ( localize(7318, 'Discard')),
             icon: Codicon.discard,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -225,8 +224,8 @@ class AcceptChanges extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_ACCEPT_CHANGES,
-            title: ( localize2WithPath(_moduleId, 8, "Accept Changes")),
-            shortTitle: ( localizeWithPath(_moduleId, 9, 'Accept')),
+            title: ( localize2(7319, "Accept Changes")),
+            shortTitle: ( localize(7320, 'Accept')),
             icon: Codicon.check,
             f1: true,
             precondition: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE,  (ContextKeyExpr.or(
@@ -256,7 +255,7 @@ class DiscardHunkAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.discardHunkChange',
-            title: ( localizeWithPath(_moduleId, 7, 'Discard')),
+            title: ( localize(7320, 'Discard')),
             icon: Codicon.clearAll,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: {
@@ -284,8 +283,8 @@ class RerunAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_REGENERATE_RESPONSE,
-            title: ( localize2WithPath(_moduleId, 10, "Rerun Request")),
-            shortTitle: ( localizeWithPath(_moduleId, 11, 'Rerun')),
+            title: ( localize2(7321, "Rerun Request")),
+            shortTitle: ( localize(7322, 'Rerun')),
             f1: false,
             icon: Codicon.refresh,
             precondition: CTX_INLINE_CHAT_VISIBLE,
@@ -317,7 +316,7 @@ class CloseAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.close',
-            title: ( localizeWithPath(_moduleId, 12, 'Close')),
+            title: ( localize(7323, 'Close')),
             icon: Codicon.close,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -350,7 +349,7 @@ class ConfigureInlineChatAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.configure',
-            title: ( localize2WithPath(_moduleId, 13, 'Configure Inline Chat')),
+            title: ( localize2(7324, 'Configure Inline Chat')),
             icon: Codicon.settingsGear,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             f1: true,
@@ -369,7 +368,7 @@ class MoveToNextHunk extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToNextHunk',
-            title: ( localize2WithPath(_moduleId, 14, 'Move to Next Change')),
+            title: ( localize2(7325, 'Move to Next Change')),
             precondition: CTX_INLINE_CHAT_VISIBLE,
             f1: true,
             keybinding: {
@@ -386,7 +385,7 @@ class MoveToPreviousHunk extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToPreviousHunk',
-            title: ( localize2WithPath(_moduleId, 15, 'Move to Previous Change')),
+            title: ( localize2(7326, 'Move to Previous Change')),
             f1: true,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -404,7 +403,7 @@ class CopyRecordings extends AbstractInlineChatAction {
         super({
             id: 'inlineChat.copyRecordings',
             f1: true,
-            title: ( localize2WithPath(_moduleId, 16, "(Developer) Write Exchange to Clipboard"))
+            title: ( localize2(7327, "(Developer) Write Exchange to Clipboard"))
         });
     }
     async runInlineChatCommand(accessor) {
@@ -418,9 +417,8 @@ class CopyRecordings extends AbstractInlineChatAction {
         const picks = ( (recordings.map(rec => {
             return {
                 rec,
-                label: ( localizeWithPath(
-                    _moduleId,
-                    17,
+                label: ( localize(
+                    7328,
                     "'{0}' and {1} follow ups ({2})",
                     rec.exchanges[0].prompt,
                     rec.exchanges.length - 1,
@@ -439,7 +437,7 @@ class ViewInChatAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_VIEW_IN_CHAT,
-            title: ( localizeWithPath(_moduleId, 18, 'View in Chat')),
+            title: ( localize(7329, 'View in Chat')),
             icon: Codicon.commentDiscussion,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: [{
@@ -475,7 +473,7 @@ class ToggleDiffForChange extends AbstractInlineChatAction {
                  (CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Live)),
                 CTX_INLINE_CHAT_CHANGE_HAS_DIFF
             ))),
-            title: ( localize2WithPath(_moduleId, 19, 'Toggle Changes')),
+            title: ( localize2(7330, 'Toggle Changes')),
             icon: Codicon.diffSingle,
             toggled: {
                 condition: CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF,

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/inlineChatContentWidget.css.js';
 import { ContentWidgetPositionPreference } from '../../../../editor/browser/editorBrowser.js';
-import { trackFocus } from '../../../../base/browser/dom.js';
+import { size, trackFocus } from '../../../../base/browser/dom.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { Position } from '../../../../editor/common/core/position.js';
@@ -30,8 +30,9 @@ import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolb
 import { MenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { TextOnlyMenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
 let InlineChatContentWidget = class InlineChatContentWidget {
-    constructor(location, _editor, instaService, contextKeyService, configurationService) {
+    constructor(location, _editor, instaService, contextKeyService, configurationService, quickInputService) {
         this._editor = _editor;
         this.suppressMouseDown = false;
         this.allowEditorOverflow = true;
@@ -54,7 +55,7 @@ let InlineChatContentWidget = class InlineChatContentWidget {
             renderStyle: 'minimal',
             renderInputOnTop: true,
             renderFollowups: true,
-            supportsFileReferences: false,
+            supportsFileReferences: configurationService.getValue(`chat.experimental.variables.${location.location}`) === true,
             menus: {
                 telemetrySource: 'inlineChat-content',
                 executeToolbar: MENU_INLINE_CHAT_EXECUTE,
@@ -88,9 +89,17 @@ let InlineChatContentWidget = class InlineChatContentWidget {
         this._store.add(toolbar.onDidChangeMenuItems(() => {
             this._domNode.classList.toggle('contents', toolbar.getItemsLength() > 1);
         }));
+        let widgetHasBeenInteractedWith = false;
+        this._store.add(this._widget.inputEditor.onDidChangeModelContent(() => {
+            widgetHasBeenInteractedWith ||= this._widget.inputEditor.getModel()?.getValueLength() !== 0;
+        }));
+        this._store.add(this._widget.onDidChangeContext(() => {
+            widgetHasBeenInteractedWith ||= true;
+            _editor.layoutContentWidget(this);
+        }));
         const tracker = trackFocus(this._domNode);
         this._store.add(tracker.onDidBlur(() => {
-            if (this._visible && this._widget.inputEditor.getModel()?.getValueLength() === 0) {
+            if (this._visible && !widgetHasBeenInteractedWith && !quickInputService.currentQuickInput) {
                 this._onDidBlur.fire();
             }
         }));
@@ -117,7 +126,10 @@ let InlineChatContentWidget = class InlineChatContentWidget {
     beforeRender() {
         const maxHeight = this._widget.input.inputEditor.getOption(EditorOption.lineHeight) * 5;
         const inputEditorHeight = this._widget.contentHeight;
-        this._widget.layout(Math.min(maxHeight, inputEditorHeight), 390);
+        const height = Math.min(maxHeight, inputEditorHeight);
+        const width = 390;
+        this._widget.layout(height, width);
+        size(this._domNode, width, null);
         return null;
     }
     afterRender() {
@@ -143,6 +155,7 @@ let InlineChatContentWidget = class InlineChatContentWidget {
             const wordInfo = this._editor.getModel()?.getWordAtPosition(position);
             this._position = wordInfo ? ( new Position(position.lineNumber, wordInfo.startColumn)) : position;
             this._editor.addContentWidget(this);
+            this._widget.setContext(true);
             this._widget.setVisible(true);
         }
     }
@@ -163,6 +176,7 @@ let InlineChatContentWidget = class InlineChatContentWidget {
 InlineChatContentWidget = ( __decorate([
     ( __param(2, IInstantiationService)),
     ( __param(3, IContextKeyService)),
-    ( __param(4, IConfigurationService))
+    ( __param(4, IConfigurationService)),
+    ( __param(5, IQuickInputService))
 ], InlineChatContentWidget));
 export { InlineChatContentWidget };

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

@@ -13,17 +13,16 @@ import { assertType } from '../../../../base/common/types.js';
 import { Position } from '../../../../editor/common/core/position.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { Selection } from '../../../../editor/common/core/selection.js';
-import { CompletionItemKind, TextEdit } from '../../../../editor/common/languages.js';
+import { TextEdit } from '../../../../editor/common/languages.js';
 import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
 import { InlineCompletionsController } from '../../../../editor/contrib/inlineCompletions/browser/inlineCompletionsController.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { showChatView } from '../../chat/browser/chat.js';
-import { IChatWidgetService } from '../../chat/browser/chat.service.js';
 import { IChatService } from '../../chat/common/chatService.service.js';
 import { IInlineChatSavingService } from './inlineChatSavingService.service.js';
 import { SessionPrompt, EmptyResponse, ErrorResponse, ReplyResponse, Session } from './inlineChatSession.js';
@@ -35,16 +34,12 @@ import { InlineChatContentWidget } from './inlineChatContentWidget.js';
 import { MessageController } from '../../../../editor/contrib/message/browser/messageController.js';
 import { ChatRequestRemovalReason } from '../../chat/common/chatModel.js';
 import { InlineChatError } from './inlineChatSessionServiceImpl.js';
-import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
-import { ChatInputPart } from '../../chat/browser/chatInputPart.js';
 import { IViewsService } from '../../../services/views/common/viewsService.service.js';
 import { DefaultModelSHA1Computer } from '../../../../editor/common/services/modelService.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
 import { INotebookEditorService } from '../../notebook/browser/services/notebookEditorService.service.js';
-import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
-const _moduleId = "vs/workbench/contrib/inlineChat/browser/inlineChatController";
 var State;
 ( ((function(State) {
     State["CREATE_SESSION"] = "CREATE_SESSION";
@@ -92,7 +87,7 @@ let InlineChatController = class InlineChatController {
             return this._ui.value.zone.widget.chatWidget;
         }
     }
-    constructor(_editor, _instaService, _inlineChatSessionService, _inlineChatSavingService, _editorWorkerService, _logService, _configurationService, _dialogService, contextKeyService, _chatService, _languageFeatureService, _chatWidgetService, notebookEditorService) {
+    constructor(_editor, _instaService, _inlineChatSessionService, _inlineChatSavingService, _editorWorkerService, _logService, _configurationService, _dialogService, contextKeyService, _chatService, notebookEditorService) {
         this._editor = _editor;
         this._instaService = _instaService;
         this._inlineChatSessionService = _inlineChatSessionService;
@@ -102,8 +97,6 @@ let InlineChatController = class InlineChatController {
         this._configurationService = _configurationService;
         this._dialogService = _dialogService;
         this._chatService = _chatService;
-        this._languageFeatureService = _languageFeatureService;
-        this._chatWidgetService = _chatWidgetService;
         this._isDisposed = false;
         this._store = ( (new DisposableStore()));
         this._messages = this._store.add(( (new Emitter())));
@@ -117,11 +110,23 @@ let InlineChatController = class InlineChatController {
         this._ctxResponseType = CTX_INLINE_CHAT_RESPONSE_TYPE.bindTo(contextKeyService);
         this._ctxRequestInProgress = CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.bindTo(contextKeyService);
         this._ui = ( (new Lazy(() => {
-            let location = ChatAgentLocation.Editor;
+            const location = {
+                location: ChatAgentLocation.Editor,
+                resolveData: () => {
+                    assertType(this._editor.hasModel());
+                    assertType(this._session);
+                    return {
+                        type: ChatAgentLocation.Editor,
+                        selection: this._editor.getSelection(),
+                        document: this._session.textModelN.uri,
+                        wholeRange: this._session?.wholeRange.trackedInitialRange,
+                    };
+                }
+            };
             for (const notebookEditor of notebookEditorService.listNotebookEditors()) {
                 for (const [, codeEditor] of notebookEditor.codeEditors) {
                     if (codeEditor === this._editor) {
-                        location = ChatAgentLocation.Notebook;
+                        location.location = ChatAgentLocation.Notebook;
                         break;
                     }
                 }
@@ -230,14 +235,14 @@ let InlineChatController = class InlineChatController {
             delete options.position;
         }
         const widgetPosition = this._showWidget(true, initPosition);
-        let errorMessage = ( localizeWithPath(_moduleId, 0, "Failed to start editor chat"));
+        let errorMessage = ( localize(7215, "Failed to start editor chat"));
         if (!session) {
             const createSessionCts = ( (new CancellationTokenSource()));
             const msgListener = Event.once(this._messages.event)(m => {
                 this._log('state=_createSession) message received', m);
                 if (m === Message.ACCEPT_INPUT) {
                     options.autoSend = true;
-                    this._ui.value.zone.widget.updateInfo(( localizeWithPath(_moduleId, 1, "Getting ready...")));
+                    this._ui.value.zone.widget.updateInfo(( localize(7216, "Getting ready...")));
                 }
                 else {
                     createSessionCts.cancel();
@@ -331,73 +336,6 @@ let InlineChatController = class InlineChatController {
                 await this._session.undoChangesUntil(e.requestId);
             }
         }));
-        this._sessionStore.add(this._languageFeatureService.completionProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, hasAccessToAllModels: true }, {
-            _debugDisplayName: 'inline chat commands',
-            triggerCharacters: ['/'],
-            provideCompletionItems: (model, position, context, token) => {
-                if (position.lineNumber !== 1) {
-                    return undefined;
-                }
-                if (!this._session || !this._session.agent.slashCommands) {
-                    return undefined;
-                }
-                const widget = this._chatWidgetService.getWidgetByInputUri(model.uri);
-                if (widget !== this._ui.value.zone.widget.chatWidget && widget !== this._ui.value.content.chatWidget) {
-                    return undefined;
-                }
-                const result = { suggestions: [], incomplete: false };
-                for (const command of this._session.agent.slashCommands) {
-                    const withSlash = `/${command.name}`;
-                    result.suggestions.push({
-                        label: { label: withSlash, description: command.description ?? '' },
-                        kind: CompletionItemKind.Text,
-                        insertText: `${withSlash} `,
-                        range: Range.fromPositions(( (new Position(1, 1))), position),
-                    });
-                }
-                return result;
-            }
-        }));
-        const updateSlashDecorations = (collection, model) => {
-            const newDecorations = [];
-            for (const command of (this._session?.agent.slashCommands ?? []).sort((a, b) => b.name.length - a.name.length)) {
-                const withSlash = `/${command.name}`;
-                const firstLine = model.getLineContent(1);
-                if (firstLine.match(( (new RegExp(`^${escapeRegExpCharacters(withSlash)}(\\s|$)`))))) {
-                    newDecorations.push({
-                        range: ( (new Range(1, 1, 1, withSlash.length + 1))),
-                        options: {
-                            description: 'inline-chat-slash-command',
-                            inlineClassName: 'inline-chat-slash-command',
-                        }
-                    });
-                    if (firstLine.trim() === `/${command.name}`) {
-                        newDecorations.push({
-                            range: ( (new Range(1, withSlash.length, 1, withSlash.length))),
-                            options: {
-                                description: 'inline-chat-slash-command-detail',
-                                after: {
-                                    content: `${command.description}`,
-                                    inlineClassName: 'inline-chat-slash-command-detail'
-                                }
-                            }
-                        });
-                    }
-                    break;
-                }
-            }
-            collection.set(newDecorations);
-        };
-        const inputInputEditor = this._ui.value.content.chatWidget.inputEditor;
-        const zoneInputEditor = this._ui.value.zone.widget.chatWidget.inputEditor;
-        const inputDecorations = inputInputEditor.createDecorationsCollection();
-        const zoneDecorations = zoneInputEditor.createDecorationsCollection();
-        this._sessionStore.add(inputInputEditor.onDidChangeModelContent(() => updateSlashDecorations(inputDecorations, inputInputEditor.getModel())));
-        this._sessionStore.add(zoneInputEditor.onDidChangeModelContent(() => updateSlashDecorations(zoneDecorations, zoneInputEditor.getModel())));
-        this._sessionStore.add(toDisposable(() => {
-            inputDecorations.clear();
-            zoneDecorations.clear();
-        }));
         if (!this._session.chatModel.hasRequests) {
             return State.WAIT_FOR_INPUT;
         }
@@ -572,7 +510,7 @@ let InlineChatController = class InlineChatController {
         const { response } = this._session.lastExchange;
         let newPosition;
         if (response instanceof EmptyResponse) {
-            const status = ( localizeWithPath(_moduleId, 2, "No results, please refine your input and try again"));
+            const status = ( localize(7217, "No results, please refine your input and try again"));
             this._ui.value.zone.widget.updateStatus(status, { classes: ['warn'] });
             return State.WAIT_FOR_INPUT;
         }
@@ -613,7 +551,7 @@ let InlineChatController = class InlineChatController {
             await this._strategy.apply();
         }
         catch (err) {
-            this._dialogService.error(( localizeWithPath(_moduleId, 3, "Failed to apply changes.", toErrorMessage(err))));
+            this._dialogService.error(( localize(7218, "Failed to apply changes.", toErrorMessage(err))));
             this._log('FAILED to apply changes');
             this._log(err);
         }
@@ -633,7 +571,7 @@ let InlineChatController = class InlineChatController {
                 undoCancelEdits = this._strategy.cancel();
             }
             catch (err) {
-                this._dialogService.error(( localizeWithPath(_moduleId, 4, "Failed to discard changes.", toErrorMessage(err))));
+                this._dialogService.error(( localize(7219, "Failed to discard changes.", toErrorMessage(err))));
                 this._log('FAILED to discard changes');
                 this._log(err);
             }
@@ -752,7 +690,7 @@ let InlineChatController = class InlineChatController {
         return this._forcedPlaceholder ?? this._session?.agent.description ?? '';
     }
     showSaveHint() {
-        const status = ( localizeWithPath(_moduleId, 5, "Accept or discard changes to continue saving"));
+        const status = ( localize(7220, "Accept or discard changes to continue saving"));
         this._ui.value.zone.widget.updateStatus(status, { classes: ['warn'] });
     }
     acceptInput() {
@@ -826,6 +764,7 @@ let InlineChatController = class InlineChatController {
                 sessionId: response.session.sessionId,
                 requestId: response.requestId,
                 agentId: response.agent?.id,
+                command: response.slashCommand?.name,
                 result: response.result,
                 action: {
                     kind: 'inlineChat',
@@ -848,6 +787,7 @@ let InlineChatController = class InlineChatController {
                 sessionId: response.session.sessionId,
                 requestId: response.requestId,
                 agentId: response.agent?.id,
+                command: response.slashCommand?.name,
                 result: response.result,
                 action: {
                     kind: 'inlineChat',
@@ -890,9 +830,7 @@ InlineChatController = ( (__decorate([
     ( (__param(7, IDialogService))),
     ( (__param(8, IContextKeyService))),
     ( (__param(9, IChatService))),
-    ( (__param(10, ILanguageFeaturesService))),
-    ( (__param(11, IChatWidgetService))),
-    ( (__param(12, INotebookEditorService)))
+    ( (__param(10, INotebookEditorService)))
 ], InlineChatController)));
 async function moveToPanelChat(accessor, model) {
     const viewsService = accessor.get(IViewsService);

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

@@ -20,7 +20,6 @@ import { CTX_INLINE_CHAT_HAS_AGENT } from '../common/inlineChat.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { UntitledTextEditorInput } from '../../../services/untitled/common/untitledTextEditorInput.js';
 import { ReplyResponse, SessionExchange, Session, SessionWholeRange, HunkData, StashedSession, ErrorResponse, EmptyResponse } from './inlineChatSession.js';
-import { IChatVariablesService } from '../../chat/common/chatVariables.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 class InlineChatError extends Error {
     static { this.code = 'InlineChatError'; }
@@ -29,18 +28,8 @@ class InlineChatError extends Error {
         this.name = InlineChatError.code;
     }
 }
-const _inlineChatContext = '_inlineChatContext';
-const _inlineChatDocument = '_inlineChatDocument';
-class InlineChatContext {
-    static { this.variableName = '_inlineChatContext'; }
-    constructor(uri, selection, wholeRange) {
-        this.uri = uri;
-        this.selection = selection;
-        this.wholeRange = wholeRange;
-    }
-}
 let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
-    constructor(_telemetryService, _modelService, _textModelService, _editorWorkerService, _logService, _instaService, _editorService, _chatService, _chatAgentService, chatVariableService) {
+    constructor(_telemetryService, _modelService, _textModelService, _editorWorkerService, _logService, _instaService, _editorService, _chatService, _chatAgentService) {
         this._telemetryService = _telemetryService;
         this._modelService = _modelService;
         this._textModelService = _textModelService;
@@ -62,26 +51,6 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
         this._sessions = ( new Map());
         this._keyComputers = ( new Map());
         this._recordings = [];
-        this._store.add(chatVariableService.registerVariable({ id: _inlineChatContext, name: _inlineChatContext, description: '', hidden: true }, async (_message, _arg, model) => {
-            for (const [, data] of this._sessions) {
-                if (data.session.chatModel === model) {
-                    return JSON.stringify(( new InlineChatContext(
-                        data.session.textModelN.uri,
-                        data.editor.getSelection(),
-                        data.session.wholeRange.trackedInitialRange
-                    )));
-                }
-            }
-            return undefined;
-        }));
-        this._store.add(chatVariableService.registerVariable({ id: _inlineChatDocument, name: _inlineChatDocument, description: '', hidden: true }, async (_message, _arg, model) => {
-            for (const [, data] of this._sessions) {
-                if (data.session.chatModel === model) {
-                    return data.session.textModelN.uri;
-                }
-            }
-            return undefined;
-        }));
     }
     dispose() {
         this._store.dispose();
@@ -285,8 +254,7 @@ InlineChatSessionServiceImpl = ( __decorate([
     ( __param(5, IInstantiationService)),
     ( __param(6, IEditorService)),
     ( __param(7, IChatService)),
-    ( __param(8, IChatAgentService)),
-    ( __param(9, IChatVariablesService))
+    ( __param(8, IChatAgentService))
 ], InlineChatSessionServiceImpl));
 let InlineChatEnabler = class InlineChatEnabler {
     static { this.Id = 'inlineChat.enabler'; }

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

@@ -12,7 +12,7 @@ import { OverviewRulerLane, MinimapPosition, TrackedRangeStickiness } from '../.
 import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
 import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
 import { InlineDecoration, InlineDecorationType } from '../../../../editor/common/viewModel.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { Progress } from '../../../../platform/progress/common/progress.js';
 import { SaveReason } from '../../../common/editor.js';
@@ -30,7 +30,6 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { DefaultChatTextEditor } from '../../chat/browser/codeBlockPart.js';
 import { isEqual } from '../../../../base/common/resources.js';
 var EditModeStrategy_1;
-const _moduleId = "vs/workbench/contrib/inlineChat/browser/inlineChatStrategies";
 let EditModeStrategy = class EditModeStrategy {
     static { EditModeStrategy_1 = this; }
     static { this._decoBlock = ModelDecorationOptions.register({
@@ -422,21 +421,21 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
         const needsReview = this._configService.getValue(InlineChatConfigKeys.AcceptedOrDiscardBeforeSave);
         let message;
         if (total === 0) {
-            message = ( localizeWithPath(_moduleId, 0, "Nothing changed."));
+            message = ( localize(10594, "Nothing changed."));
         }
         else if (remaining === 1) {
             message = needsReview
-                ? ( localizeWithPath(_moduleId, 1, "$(info) Accept or Discard change"))
-                : ( localizeWithPath(_moduleId, 2, "1 change"));
+                ? ( localize(10595, "$(info) Accept or Discard change"))
+                : ( localize(10596, "1 change"));
         }
         else {
             message = needsReview
-                ? ( localizeWithPath(_moduleId, 3, "$(info) Accept or Discard {0} changes", remaining))
-                : ( localizeWithPath(_moduleId, 4, "{0} changes", total));
+                ? ( localize(10597, "$(info) Accept or Discard {0} changes", remaining))
+                : ( localize(10598, "{0} changes", total));
         }
         let title;
         if (needsReview) {
-            title = ( localizeWithPath(_moduleId, 5, "Review (accept or discard) all changes before continuing"));
+            title = ( localize(10599, "Review (accept or discard) all changes before continuing"));
         }
         this._zone.widget.updateStatus(message, { title });
     }