@codingame/monaco-vscode-katex-common 31.0.0 → 32.0.0

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

@@ -1,14 +1,16 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { $, addDisposableListener, Dimension } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $, getWindow, addDisposableListener, Dimension } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { status } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { renderAsPlaintext, renderMarkdown } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { DomScrollableElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
+import { ActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { ActionRunner } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { ScrollbarVisibility } from '@codingame/monaco-vscode-api/vscode/vs/base/common/scrollable';
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { StableEditorBottomScrollState } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/stableEditorScroll';
@@ -16,17 +18,45 @@ import { EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/comm
 import { ScrollType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon';
 import { ZoneWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/zoneWidget/browser/zoneWidget';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { RawContextKey, ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { 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 { MenuWorkbenchToolBar, HiddenItemStrategy } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
-import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Action2, MenuId, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { IActionViewItemService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/actionViewItemService.service';
 import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
-import { CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_SIDE, MENU_INLINE_CHAT_WIDGET_SECONDARY, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_REPORT_ISSUE, MENU_INLINE_CHAT_WIDGET_STATUS } from '../common/inlineChat.js';
+import { CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_SIDE, MENU_INLINE_CHAT_WIDGET_SECONDARY } from '../common/inlineChat.js';
 import { EditorBasedInlineChatWidget } from './inlineChatWidget.js';
+import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var InlineChatZoneWidget_1;
+class StatusPlaceholder extends Action2 {
+    static {
+        this.Id = "inlineChatWidget.statusPlaceholder";
+    }
+    static {
+        this.CtxHasStatus = ( new RawContextKey("inlineChatHasStatus", false));
+    }
+    constructor() {
+        super({
+            id: StatusPlaceholder.Id,
+            title: "",
+            precondition: ( ContextKeyExpr.false()),
+            menu: {
+                id: MenuId.ChatInput,
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.EditorInline)), StatusPlaceholder.CtxHasStatus)),
+                group: "navigation",
+                order: Number.MAX_SAFE_INTEGER
+            }
+        });
+    }
+    run() {}
+}
+registerAction2(StatusPlaceholder);
 let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
     static {
         InlineChatZoneWidget_1 = this;
@@ -42,7 +72,22 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         showInHiddenAreas: true,
         ordinal: 50000
     };
+    static #instances = ( new Set());
+    static #statusDidChange = ( new Emitter());
+    static #factoryRegistration;
+    static #findByDom(element) {
+        const widgetDom = element.closest(".inline-chat-widget");
+        if (widgetDom) {
+            for (const instance of InlineChatZoneWidget_1.#instances) {
+                if (instance.domNode === widgetDom) {
+                    return instance;
+                }
+            }
+        }
+        return undefined;
+    }
     #ctxCursorPosition;
+    #ctxHasStatus;
     #dimension;
     #logService;
     #terminationCard;
@@ -50,17 +95,20 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
     #terminationMarkdownMessage;
     #terminationMarkdownScrollable;
     #terminationToolbar;
-    #terminationStore = ( new DisposableStore());
+    #terminationStore;
     constructor(
         location,
         options,
         editors,
         clearDelegate,
         instaService,
+        actionViewItemService,
         logService,
         contextKeyService
     ) {
         super(editors.editor, InlineChatZoneWidget_1.#options);
+        this.status = observableValue(this, "");
+        this.#terminationStore = ( new DisposableStore());
         this.notebookEditor = editors.notebookEditor;
         this.#logService = logService;
         this.#terminationCard = $("div.inline-chat-terminated-card.hidden");
@@ -79,29 +127,59 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         this.#terminationCard.appendChild(contentRow);
         this._disposables.add(this.#terminationStore);
         this.#ctxCursorPosition = CTX_INLINE_CHAT_OUTER_CURSOR_POSITION.bindTo(contextKeyService);
+        this.#ctxHasStatus = StatusPlaceholder.CtxHasStatus.bindTo(contextKeyService);
         this._disposables.add(toDisposable(() => {
             this.#ctxCursorPosition.reset();
+            this.#ctxHasStatus.reset();
         }));
-        this.widget = instaService.createInstance(EditorBasedInlineChatWidget, location, this.editor, {
-            statusMenuId: {
-                menu: MENU_INLINE_CHAT_WIDGET_STATUS,
-                options: {
-                    buttonConfigProvider: (action, index) => {
-                        const isSecondary = index > 0;
-                        if (( ( new Set([ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_REPORT_ISSUE])).has(action.id))) {
-                            return {
-                                isSecondary,
-                                showIcon: true,
-                                showLabel: false
-                            };
-                        } else {
-                            return {
-                                isSecondary
-                            };
-                        }
+        this._disposables.add(autorun(r => {
+            this.#ctxHasStatus.set(!!this.status.read(r));
+        }));
+        InlineChatZoneWidget_1.#instances.add(this);
+        this._disposables.add(toDisposable(() => {
+            InlineChatZoneWidget_1.#instances.delete(this);
+            if (InlineChatZoneWidget_1.#instances.size === 0) {
+                InlineChatZoneWidget_1.#factoryRegistration?.dispose();
+                InlineChatZoneWidget_1.#factoryRegistration = undefined;
+            }
+        }));
+        this._disposables.add(autorun(r => {
+            this.status.read(r);
+            InlineChatZoneWidget_1.#statusDidChange.fire();
+        }));
+        if (!InlineChatZoneWidget_1.#factoryRegistration) {
+            InlineChatZoneWidget_1.#factoryRegistration = actionViewItemService.register(MenuId.ChatInput, StatusPlaceholder.Id, (action, options) => {
+                const item = new (class extends ActionViewItem {
+                    render(container) {
+                        super.render(container);
+                        container.classList.add("status-placeholder");
+                        const targetWindow = getWindow(container);
+                        let handle = targetWindow.requestAnimationFrame(() => {
+                            handle = 0;
+                            const widget = InlineChatZoneWidget_1.#findByDom(container);
+                            if (widget) {
+                                this._store.add(autorun(r => {
+                                    const value = widget.status.read(r) ?? "";
+                                    this.action.label = value;
+                                    this.updateLabel();
+                                }));
+                            }
+                        });
+                        this._store.add(toDisposable(() => {
+                            if (handle) {
+                                targetWindow.cancelAnimationFrame(handle);
+                            }
+                        }));
                     }
-                }
-            },
+                })(undefined, action, {
+                    ...options,
+                    icon: false,
+                    label: true
+                });
+                return item;
+            }, InlineChatZoneWidget_1.#statusDidChange.event);
+        }
+        this.widget = instaService.createInstance(EditorBasedInlineChatWidget, location, this.editor, {
             secondaryMenuId: MENU_INLINE_CHAT_WIDGET_SECONDARY,
             inZoneWidget: true,
             chatWidgetViewOptions: {
@@ -343,10 +421,10 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         this.widget.domNode.style.display = "";
         this.widget.chatWidget.setVisible(false);
         super.hide();
-        status(( localize(10113, "Closed inline chat widget")));
+        status(( localize(10434, "Closed inline chat widget")));
         scrollState.restore(this.editor);
     }
 };
-InlineChatZoneWidget = InlineChatZoneWidget_1 = ( __decorate([( __param(4, IInstantiationService)), ( __param(5, ILogService)), ( __param(6, IContextKeyService))], InlineChatZoneWidget));
+InlineChatZoneWidget = InlineChatZoneWidget_1 = ( __decorate([( __param(4, IInstantiationService)), ( __param(5, IActionViewItemService)), ( __param(6, ILogService)), ( __param(7, IContextKeyService))], InlineChatZoneWidget));
 
 export { InlineChatZoneWidget };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css

@@ -124,6 +124,11 @@
 	.chat-editor-container .interactive-input-editor .monaco-editor .monaco-editor-background {
 		background-color: var(--vscode-inlineChat-background);
 	}
+
+	/* Counteract the -4px margin from .interactive-session .chat-editing-session */
+	.interactive-input-part > .chat-input-notification-container {
+		margin-bottom: 12px;
+	}
 }
 
 
@@ -323,6 +328,11 @@
 	padding: 2px 0px;
 }
 
+.monaco-workbench .inline-chat .interactive-session .chat-input-toolbar .chat-input-picker-item .action-label.model-picker-split::before,
+.monaco-workbench .inline-chat .interactive-session .chat-input-toolbar .chat-input-picker-item .action-label.model-picker-split::after {
+	display: none;
+}
+
 /* Termination card (zone widget) — aligned with overlay widget */
 
 .monaco-workbench .inline-chat-terminated-card {
@@ -385,3 +395,22 @@
 	font-size: 12px;
 	white-space: nowrap;
 }
+
+/* Status Placeholder */
+.monaco-workbench .zone-widget.inline-chat-widget .status-placeholder {
+	margin-left: auto;
+	opacity: 0;
+	pointer-events: none;
+	transition: opacity 0.1s ease-in-out;
+}
+
+.monaco-workbench .zone-widget.inline-chat-widget .status-placeholder .action-label {
+	color: var(--vscode-descriptionForeground);
+	font-size: 11px;
+	cursor: default;
+}
+
+.monaco-workbench .zone-widget.inline-chat-widget:hover .status-placeholder,
+.monaco-workbench .zone-widget.inline-chat-widget:focus-within .status-placeholder {
+	opacity: 1;
+}

package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.d.ts

@@ -1,25 +1,15 @@
 import { MenuId } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
 export declare enum InlineChatConfigKeys {
-    FinishOnType = "inlineChat.finishOnType",
-    /** @deprecated do not read on client */
-    EnableV2 = "inlineChat.enableV2",
-    notebookAgent = "inlineChat.notebookAgent",
+    NotebookAgent = "inlineChat.notebookAgent",
     DefaultModel = "inlineChat.defaultModel",
     Affordance = "inlineChat.affordance",
-    RenderMode = "inlineChat.renderMode",
     FixDiagnostics = "inlineChat.fixDiagnostics",
     AskInChat = "inlineChat.askInChat"
 }
-export declare const INLINE_CHAT_ID = "interactiveEditor";
-export declare const INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID = "interactiveEditorAccessiblityHelp";
-export declare enum InlineChatResponseType {
-    None = "none",
-    Messages = "messages",
-    MessagesAndEdits = "messagesAndEdits"
-}
+export declare const INLINE_CHAT_ID = "editor.contrib.inlineChatController";
 export declare const CTX_INLINE_CHAT_POSSIBLE: RawContextKey<boolean>;
-export declare const CTX_INLINE_CHAT_HAS_AGENT2: RawContextKey<boolean>;
+export declare const CTX_INLINE_CHAT_HAS_AGENT: RawContextKey<boolean>;
 export declare const CTX_INLINE_CHAT_HAS_NOTEBOOK_INLINE: RawContextKey<boolean>;
 export declare const CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT: RawContextKey<boolean>;
 export declare const CTX_INLINE_CHAT_VISIBLE: RawContextKey<boolean>;
@@ -27,36 +17,17 @@ export declare const CTX_INLINE_CHAT_FOCUSED: RawContextKey<boolean>;
 export declare const CTX_INLINE_CHAT_EDITING: RawContextKey<boolean>;
 export declare const CTX_INLINE_CHAT_RESPONSE_FOCUSED: RawContextKey<boolean>;
 export declare const CTX_INLINE_CHAT_EMPTY: RawContextKey<boolean>;
-export declare const CTX_INLINE_CHAT_INPUT_HAS_TEXT: RawContextKey<boolean>;
-export declare const CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED: RawContextKey<boolean>;
-export declare const CTX_INLINE_CHAT_INNER_CURSOR_FIRST: RawContextKey<boolean>;
-export declare const CTX_INLINE_CHAT_INNER_CURSOR_LAST: RawContextKey<boolean>;
 export declare const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION: RawContextKey<"" | "above" | "below">;
-export declare const CTX_INLINE_CHAT_HAS_STASHED_SESSION: RawContextKey<boolean>;
-export declare const CTX_INLINE_CHAT_CHANGE_HAS_DIFF: RawContextKey<boolean>;
-export declare const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF: RawContextKey<boolean>;
 export declare const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS: RawContextKey<boolean>;
-export declare const CTX_INLINE_CHAT_RESPONSE_TYPE: RawContextKey<InlineChatResponseType>;
 export declare const CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT: RawContextKey<boolean>;
-export declare const CTX_INLINE_CHAT_PENDING_CONFIRMATION: RawContextKey<boolean>;
 export declare const CTX_INLINE_CHAT_TERMINATED: RawContextKey<boolean>;
 export declare const CTX_INLINE_CHAT_AFFORDANCE_VISIBLE: RawContextKey<boolean>;
-export declare const CTX_INLINE_CHAT_V1_ENABLED: import("@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression | undefined;
 export declare const CTX_INLINE_CHAT_V2_ENABLED: import("@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression | undefined;
-export declare const CTX_HOVER_MODE: import("@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression;
 export declare const CTX_FIX_DIAGNOSTICS_ENABLED: import("@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression;
 export declare const CTX_ASK_IN_CHAT_ENABLED: import("@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression;
 export declare const ACTION_START = "inlineChat.start";
 export declare const ACTION_ASK_IN_CHAT = "inlineChat.askInChat";
-export declare const ACTION_ACCEPT_CHANGES = "inlineChat.acceptChanges";
-export declare const ACTION_DISCARD_CHANGES = "inlineChat.discardHunkChange";
-export declare const ACTION_REGENERATE_RESPONSE = "inlineChat.regenerate";
-export declare const ACTION_VIEW_IN_CHAT = "inlineChat.viewInChat";
-export declare const ACTION_TOGGLE_DIFF = "inlineChat.toggleDiff";
-export declare const ACTION_REPORT_ISSUE = "inlineChat.reportIssue";
-export declare const MENU_INLINE_CHAT_WIDGET_STATUS: MenuId;
 export declare const MENU_INLINE_CHAT_WIDGET_SECONDARY: MenuId;
-export declare const MENU_INLINE_CHAT_ZONE: MenuId;
 export declare const MENU_INLINE_CHAT_SIDE: MenuId;
 export declare const inlineChatForeground: string;
 export declare const inlineChatBackground: string;

package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js

@@ -19,37 +19,17 @@ import { NOTEBOOK_IS_ACTIVE_EDITOR } from '@codingame/monaco-vscode-api/vscode/v
 
 var InlineChatConfigKeys;
 (function(InlineChatConfigKeys) {
-    InlineChatConfigKeys["FinishOnType"] = "inlineChat.finishOnType";
-    InlineChatConfigKeys["EnableV2"] = "inlineChat.enableV2";
-    InlineChatConfigKeys["notebookAgent"] = "inlineChat.notebookAgent";
+    InlineChatConfigKeys["NotebookAgent"] = "inlineChat.notebookAgent";
     InlineChatConfigKeys["DefaultModel"] = "inlineChat.defaultModel";
     InlineChatConfigKeys["Affordance"] = "inlineChat.affordance";
-    InlineChatConfigKeys["RenderMode"] = "inlineChat.renderMode";
     InlineChatConfigKeys["FixDiagnostics"] = "inlineChat.fixDiagnostics";
     InlineChatConfigKeys["AskInChat"] = "inlineChat.askInChat";
 })(InlineChatConfigKeys || (InlineChatConfigKeys = {}));
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
     id: "editor",
     properties: {
-        [InlineChatConfigKeys.FinishOnType]: {
-            description: ( localize(
-                10114,
-                "Whether to finish an inline chat session when typing outside of changed regions."
-            )),
-            default: false,
-            type: "boolean"
-        },
-        [InlineChatConfigKeys.EnableV2]: {
-            description: ( localize(10115, "Whether to use the next version of inline chat.")),
-            default: false,
-            type: "boolean",
-            tags: ["preview"],
-            experiment: {
-                mode: "auto"
-            }
-        },
-        [InlineChatConfigKeys.notebookAgent]: {
-            markdownDescription: ( localize(10116, "Enable agent-like behavior for inline chat widget in notebooks.")),
+        [InlineChatConfigKeys.NotebookAgent]: {
+            markdownDescription: ( localize(10435, "Enable agent-like behavior for inline chat widget in notebooks.")),
             default: false,
             type: "boolean",
             tags: ["experimental"],
@@ -59,32 +39,24 @@ var InlineChatConfigKeys;
         },
         [InlineChatConfigKeys.Affordance]: {
             description: ( localize(
-                10117,
+                10436,
                 "Controls whether an inline chat affordance is shown when text is selected."
             )),
             default: "off",
             type: "string",
             enum: ["off", "editor"],
-            enumDescriptions: [( localize(10118, "No affordance is shown.")), ( localize(10119, "Show an affordance in the editor at the cursor position."))],
+            enumDescriptions: [( localize(10437, "No affordance is shown.")), ( localize(10438, "Show an affordance in the editor at the cursor position."))],
             experiment: {
                 mode: "auto"
             },
-            tags: ["experimental"]
-        },
-        [InlineChatConfigKeys.RenderMode]: {
-            description: ( localize(10120, "Controls how inline chat is rendered.")),
-            default: "hover",
-            type: "string",
-            enum: ["zone", "hover"],
-            enumDescriptions: [( localize(10121, "Render inline chat as a zone widget below the current line.")), ( localize(10122, "Render inline chat as a hover overlay."))],
-            experiment: {
-                mode: "auto"
-            },
-            tags: ["experimental"]
+            tags: ["experimental"],
+            agentsWindow: {
+                default: "editor"
+            }
         },
         [InlineChatConfigKeys.FixDiagnostics]: {
             description: ( localize(
-                10123,
+                10439,
                 "Controls whether the Fix action is shown for diagnostics in the editor."
             )),
             default: true,
@@ -96,7 +68,7 @@ var InlineChatConfigKeys;
         },
         [InlineChatConfigKeys.AskInChat]: {
             description: ( localize(
-                10124,
+                10440,
                 "Controls whether files in a chat editing session use Ask in Chat instead of Inline Chat."
             )),
             default: true,
@@ -104,88 +76,63 @@ var InlineChatConfigKeys;
         }
     }
 });
-const INLINE_CHAT_ID = "interactiveEditor";
-var InlineChatResponseType;
-(function(InlineChatResponseType) {
-    InlineChatResponseType["None"] = "none";
-    InlineChatResponseType["Messages"] = "messages";
-    InlineChatResponseType["MessagesAndEdits"] = "messagesAndEdits";
-})(InlineChatResponseType || (InlineChatResponseType = {}));
+const INLINE_CHAT_ID = "editor.contrib.inlineChatController";
 const CTX_INLINE_CHAT_POSSIBLE = ( new RawContextKey("inlineChatPossible", false, ( localize(
-    10125,
+    10441,
     "Whether a provider for inline chat exists and whether an editor for inline chat is open"
 ))));
-const CTX_INLINE_CHAT_HAS_AGENT2 = ( new RawContextKey("inlineChatHasEditsAgent", false, ( localize(10126, "Whether an agent for inline for interactive editors exists"))));
-const CTX_INLINE_CHAT_HAS_NOTEBOOK_INLINE = ( new RawContextKey("inlineChatHasNotebookInline", false, ( localize(10127, "Whether an agent for notebook cells exists"))));
-const CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT = ( new RawContextKey("inlineChatHasNotebookAgent", false, ( localize(10128, "Whether an agent for notebook cells exists"))));
-const CTX_INLINE_CHAT_VISIBLE = ( new RawContextKey("inlineChatVisible", false, ( localize(10129, "Whether the interactive editor input is visible"))));
-const CTX_INLINE_CHAT_FOCUSED = ( new RawContextKey("inlineChatFocused", false, ( localize(10130, "Whether the interactive editor input is focused"))));
-const CTX_INLINE_CHAT_EDITING = ( new RawContextKey("inlineChatEditing", true, ( localize(
-    10131,
-    "Whether the user is currently editing or generating code in the inline chat"
-))));
-const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( new RawContextKey("inlineChatResponseFocused", false, ( localize(10132, "Whether the interactive widget's response is focused"))));
-const CTX_INLINE_CHAT_INPUT_HAS_TEXT = ( new RawContextKey("inlineChatInputHasText", false, ( localize(10133, "Whether the inline chat input widget has text"))));
-const CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED = ( new RawContextKey("inlineChatInputWidgetFocused", false, ( localize(10134, "Whether the inline chat input widget editor is focused"))));
+const CTX_INLINE_CHAT_HAS_AGENT = ( new RawContextKey("inlineChatHasEditsAgent", false, ( localize(10442, "Whether an agent for inline chat in interactive editors exists"))));
+const CTX_INLINE_CHAT_HAS_NOTEBOOK_INLINE = ( new RawContextKey("inlineChatHasNotebookInline", false, ( localize(10443, "Whether an agent for notebook cells exists"))));
+const CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT = ( new RawContextKey("inlineChatHasNotebookAgent", false, ( localize(10444, "Whether an agent for notebook cells exists"))));
+const CTX_INLINE_CHAT_VISIBLE = ( new RawContextKey("inlineChatVisible", false, ( localize(10445, "Whether the interactive editor input is visible"))));
+const CTX_INLINE_CHAT_FOCUSED = ( new RawContextKey("inlineChatFocused", false, ( localize(10446, "Whether the interactive editor input is focused"))));
+const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( new RawContextKey("inlineChatResponseFocused", false, ( localize(10447, "Whether the interactive widget's response is focused"))));
 const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = ( new RawContextKey("inlineChatOuterCursorPosition", "", ( localize(
-    10135,
+    10448,
     "Whether the cursor of the outer editor is above or below the interactive editor input"
 ))));
-const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = ( new RawContextKey("inlineChatRequestInProgress", false, ( localize(10136, "Whether an inline chat request is currently in progress"))));
-const CTX_INLINE_CHAT_RESPONSE_TYPE = ( new RawContextKey("inlineChatResponseType", InlineChatResponseType.None, ( localize(
-    10137,
-    "What type was the responses have been receieved, nothing yet, just messages, or messaged and local edits"
-))));
-const CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT = ( new RawContextKey("inlineChatFileBelongsToChat", false, ( localize(10138, "Whether the current file belongs to a chat editing session"))));
-const CTX_INLINE_CHAT_PENDING_CONFIRMATION = ( new RawContextKey("inlineChatPendingConfirmation", false, ( localize(10139, "Whether an inline chat request is pending user confirmation"))));
-const CTX_INLINE_CHAT_TERMINATED = ( new RawContextKey("inlineChatTerminated", false, ( localize(10140, "Whether the current inline chat session is terminated"))));
-const CTX_INLINE_CHAT_AFFORDANCE_VISIBLE = ( new RawContextKey("inlineChatAffordanceVisible", false, ( localize(10141, "Whether an inline chat affordance widget is visible"))));
-const CTX_INLINE_CHAT_V1_ENABLED = ( ContextKeyExpr.or(( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, CTX_INLINE_CHAT_HAS_NOTEBOOK_INLINE))));
-const CTX_INLINE_CHAT_V2_ENABLED = ( ContextKeyExpr.or(CTX_INLINE_CHAT_HAS_AGENT2, ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT))));
-const CTX_HOVER_MODE = ( ContextKeyExpr.equals("config.inlineChat.renderMode", "hover"));
+const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = ( new RawContextKey("inlineChatRequestInProgress", false, ( localize(10449, "Whether an inline chat request is currently in progress"))));
+const CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT = ( new RawContextKey("inlineChatFileBelongsToChat", false, ( localize(10450, "Whether the current file belongs to a chat editing session"))));
+const CTX_INLINE_CHAT_TERMINATED = ( new RawContextKey("inlineChatTerminated", false, ( localize(10451, "Whether the current inline chat session is terminated"))));
+const CTX_INLINE_CHAT_AFFORDANCE_VISIBLE = ( new RawContextKey("inlineChatAffordanceVisible", false, ( localize(10452, "Whether an inline chat affordance widget is visible"))));
+const CTX_INLINE_CHAT_V2_ENABLED = ( ContextKeyExpr.or(CTX_INLINE_CHAT_HAS_AGENT, ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT))));
 const CTX_FIX_DIAGNOSTICS_ENABLED = ( ContextKeyExpr.equals("config.inlineChat.fixDiagnostics", true));
 const CTX_ASK_IN_CHAT_ENABLED = ( ContextKeyExpr.equals("config.inlineChat.askInChat", true));
 const ACTION_START = "inlineChat.start";
 const ACTION_ASK_IN_CHAT = "inlineChat.askInChat";
-const ACTION_ACCEPT_CHANGES = "inlineChat.acceptChanges";
-const ACTION_REGENERATE_RESPONSE = "inlineChat.regenerate";
-const ACTION_TOGGLE_DIFF = "inlineChat.toggleDiff";
-const ACTION_REPORT_ISSUE = "inlineChat.reportIssue";
-const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for("inlineChatWidget.status");
 const MENU_INLINE_CHAT_WIDGET_SECONDARY = MenuId.for("inlineChatWidget.secondary");
-MenuId.for("inlineChatWidget.changesZone");
 const MENU_INLINE_CHAT_SIDE = MenuId.for("inlineChatWidget.side");
-const inlineChatForeground = registerColor("inlineChat.foreground", editorWidgetForeground, ( localize(10142, "Foreground color of the interactive editor widget")));
-const inlineChatBackground = registerColor("inlineChat.background", editorWidgetBackground, ( localize(10143, "Background color of the interactive editor widget")));
-registerColor("inlineChat.border", editorWidgetBorder, ( localize(10144, "Border color of the interactive editor widget")));
-registerColor("inlineChat.shadow", widgetShadow, ( localize(10145, "Shadow color of the interactive editor widget")));
-registerColor("inlineChatInput.border", editorWidgetBorder, ( localize(10146, "Border color of the interactive editor input")));
-registerColor("inlineChatInput.focusBorder", focusBorder, ( localize(10147, "Border color of the interactive editor input when focused")));
+const inlineChatForeground = registerColor("inlineChat.foreground", editorWidgetForeground, ( localize(10453, "Foreground color of the interactive editor widget")));
+const inlineChatBackground = registerColor("inlineChat.background", editorWidgetBackground, ( localize(10454, "Background color of the interactive editor widget")));
+registerColor("inlineChat.border", editorWidgetBorder, ( localize(10455, "Border color of the interactive editor widget")));
+registerColor("inlineChat.shadow", widgetShadow, ( localize(10456, "Shadow color of the interactive editor widget")));
+registerColor("inlineChatInput.border", editorWidgetBorder, ( localize(10457, "Border color of the interactive editor input")));
+registerColor("inlineChatInput.focusBorder", focusBorder, ( localize(10458, "Border color of the interactive editor input when focused")));
 registerColor(
     "inlineChatInput.placeholderForeground",
     inputPlaceholderForeground,
-    ( localize(10148, "Foreground color of the interactive editor input placeholder"))
+    ( localize(10459, "Foreground color of the interactive editor input placeholder"))
 );
-registerColor("inlineChatInput.background", inputBackground, ( localize(10149, "Background color of the interactive editor input")));
-registerColor("inlineChatDiff.inserted", ( transparent(diffInserted, .5)), ( localize(10150, "Background color of inserted text in the interactive editor input")));
+registerColor("inlineChatInput.background", inputBackground, ( localize(10460, "Background color of the interactive editor input")));
+registerColor("inlineChatDiff.inserted", ( transparent(diffInserted, .5)), ( localize(10461, "Background color of inserted text in the interactive editor input")));
 registerColor("editorOverviewRuler.inlineChatInserted", {
     dark: ( transparent(diffInserted, 0.6)),
     light: ( transparent(diffInserted, 0.8)),
     hcDark: ( transparent(diffInserted, 0.6)),
     hcLight: ( transparent(diffInserted, 0.8))
-}, ( localize(10151, "Overview ruler marker color for inline chat inserted content.")));
+}, ( localize(10462, "Overview ruler marker color for inline chat inserted content.")));
 registerColor("editorMinimap.inlineChatInserted", {
     dark: ( transparent(diffInserted, 0.6)),
     light: ( transparent(diffInserted, 0.8)),
     hcDark: ( transparent(diffInserted, 0.6)),
     hcLight: ( transparent(diffInserted, 0.8))
-}, ( localize(10152, "Minimap marker color for inline chat inserted content.")));
-registerColor("inlineChatDiff.removed", ( transparent(diffRemoved, .5)), ( localize(10153, "Background color of removed text in the interactive editor input")));
+}, ( localize(10463, "Minimap marker color for inline chat inserted content.")));
+registerColor("inlineChatDiff.removed", ( transparent(diffRemoved, .5)), ( localize(10464, "Background color of removed text in the interactive editor input")));
 registerColor("editorOverviewRuler.inlineChatRemoved", {
     dark: ( transparent(diffRemoved, 0.6)),
     light: ( transparent(diffRemoved, 0.8)),
     hcDark: ( transparent(diffRemoved, 0.6)),
     hcLight: ( transparent(diffRemoved, 0.8))
-}, ( localize(10154, "Overview ruler marker color for inline chat removed content.")));
+}, ( localize(10465, "Overview ruler marker color for inline chat removed content.")));
 
-export { ACTION_ACCEPT_CHANGES, ACTION_ASK_IN_CHAT, ACTION_REGENERATE_RESPONSE, ACTION_REPORT_ISSUE, ACTION_START, ACTION_TOGGLE_DIFF, CTX_ASK_IN_CHAT_ENABLED, CTX_FIX_DIAGNOSTICS_ENABLED, CTX_HOVER_MODE, CTX_INLINE_CHAT_AFFORDANCE_VISIBLE, CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_AGENT2, CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT, CTX_INLINE_CHAT_HAS_NOTEBOOK_INLINE, CTX_INLINE_CHAT_INPUT_HAS_TEXT, CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_PENDING_CONFIRMATION, CTX_INLINE_CHAT_POSSIBLE, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_TERMINATED, CTX_INLINE_CHAT_V1_ENABLED, CTX_INLINE_CHAT_V2_ENABLED, CTX_INLINE_CHAT_VISIBLE, INLINE_CHAT_ID, InlineChatConfigKeys, InlineChatResponseType, MENU_INLINE_CHAT_SIDE, MENU_INLINE_CHAT_WIDGET_SECONDARY, MENU_INLINE_CHAT_WIDGET_STATUS, inlineChatBackground, inlineChatForeground };
+export { ACTION_ASK_IN_CHAT, ACTION_START, CTX_ASK_IN_CHAT_ENABLED, CTX_FIX_DIAGNOSTICS_ENABLED, CTX_INLINE_CHAT_AFFORDANCE_VISIBLE, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_NOTEBOOK_AGENT, CTX_INLINE_CHAT_HAS_NOTEBOOK_INLINE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_POSSIBLE, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_TERMINATED, CTX_INLINE_CHAT_V2_ENABLED, CTX_INLINE_CHAT_VISIBLE, INLINE_CHAT_ID, InlineChatConfigKeys, MENU_INLINE_CHAT_SIDE, MENU_INLINE_CHAT_WIDGET_SECONDARY, inlineChatBackground, inlineChatForeground };

package/vscode/src/vs/workbench/contrib/interactive/browser/replInputHintContentWidget.js

@@ -88,7 +88,7 @@ let ReplInputHintContentWidget = class ReplInputHintContentWidget extends Dispos
         const keybinding = this.getKeybinding();
         const keybindingHintLabel = keybinding?.getLabel();
         if (keybinding && keybindingHintLabel) {
-            const actionPart = ( localize(10171, "Press {0} to execute. ", keybindingHintLabel));
+            const actionPart = ( localize(10482, "Press {0} to execute. ", keybindingHintLabel));
             const [before, after] = ( actionPart.split(keybindingHintLabel).map(fragment => {
                 const hintPart = $("span", undefined, fragment);
                 hintPart.style.fontStyle = "italic";
@@ -105,9 +105,9 @@ let ReplInputHintContentWidget = class ReplInputHintContentWidget extends Dispos
             hintElement.appendChild(after);
             this.domNode.append(hintElement);
             const helpKeybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
-            const helpInfo = helpKeybinding ? ( localize(10172, "Use {0} for accessibility help. ", helpKeybinding)) : ( localize(10173, "Run the Open Accessibility Help command for more information. "));
+            const helpInfo = helpKeybinding ? ( localize(10483, "Use {0} for accessibility help. ", helpKeybinding)) : ( localize(10484, "Run the Open Accessibility Help command for more information. "));
             this.ariaLabel = actionPart.concat(helpInfo, ( localize(
-                10174,
+                10485,
                 " Toggle {0} in settings to disable this hint.",
                 AccessibilityVerbositySettingId.ReplEditor
             )));

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js

@@ -144,7 +144,7 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
             return [{
                 text: `$(${successStateIcon.id})`,
                 color: themeColorFromId(cellStatusIconSuccess),
-                tooltip: ( localize(11111, "Success")),
+                tooltip: ( localize(11413, "Success")),
                 alignment: CellStatusbarAlignment.Left,
                 priority: Number.MAX_SAFE_INTEGER
             }];
@@ -152,14 +152,14 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
             return [{
                 text: `$(${errorStateIcon.id})`,
                 color: themeColorFromId(cellStatusIconError),
-                tooltip: ( localize(11112, "Failed")),
+                tooltip: ( localize(11414, "Failed")),
                 alignment: CellStatusbarAlignment.Left,
                 priority: Number.MAX_SAFE_INTEGER
             }];
         } else if (state === NotebookCellExecutionState.Pending || state === NotebookCellExecutionState.Unconfirmed) {
             return [{
                 text: `$(${pendingStateIcon.id})`,
-                tooltip: ( localize(11113, "Pending")),
+                tooltip: ( localize(11415, "Pending")),
                 alignment: CellStatusbarAlignment.Left,
                 priority: Number.MAX_SAFE_INTEGER
             }];
@@ -167,7 +167,7 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
             const icon = runState?.didPause ? executingStateIcon : ThemeIcon.modify(executingStateIcon, "spin");
             return [{
                 text: `$(${icon.id})`,
-                tooltip: ( localize(11114, "Executing")),
+                tooltip: ( localize(11416, "Executing")),
                 alignment: CellStatusbarAlignment.Left,
                 priority: Number.MAX_SAFE_INTEGER
             }];
@@ -298,10 +298,10 @@ let TimerCellStatusBarItem = class TimerCellStatusBarItem extends Disposable {
                 const rendererTitle = renderIssueLink ? `[${linkText}](command:workbench.action.openIssueReporter?${args})` : `**${linkText}**`;
                 renderTimes += `- ${rendererTitle} ${formatCellDuration(renderDuration[key])}\n`;
             }
-            renderTimes += `\n*${( localize(11115, "Use the links above to file an issue using the issue reporter."))}*\n`;
+            renderTimes += `\n*${( localize(11417, "Use the links above to file an issue using the issue reporter."))}*\n`;
             tooltip = {
                 value: ( localize(
-                    11116,
+                    11418,
                     "**Last Execution** {0}\n\n**Execution Time** {1}\n\n**Overhead Time** {2}\n\n**Render Times**\n\n{3}",
                     lastExecution,
                     formatCellDuration(executionDuration),
@@ -312,7 +312,7 @@ let TimerCellStatusBarItem = class TimerCellStatusBarItem extends Disposable {
             };
         }
         const executionText = this._isVerbose ? ( localize(
-            11117,
+            11419,
             "Last Execution: {0}, Duration: {1}",
             lastExecution,
             formatCellDuration(duration, false)

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js

@@ -348,9 +348,9 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
     }
     _getAriaLabel(label, currentMatch, searchString) {
         if (label === NLS_NO_RESULTS) {
-            return searchString === "" ? ( localize(11158, "{0} found", label)) : ( localize(11159, "{0} found for '{1}'", label, searchString));
+            return searchString === "" ? ( localize(11460, "{0} found", label)) : ( localize(11461, "{0} found for '{1}'", label, searchString));
         }
-        return localize(11160, "{0} found for '{1}'", label, searchString);
+        return localize(11462, "{0} found for '{1}'", label, searchString);
     }
     dispose() {
         this._notebookEditor?.removeClassName(FIND_SHOW_TRANSITION);