@codingame/monaco-vscode-katex-common 28.4.0 → 29.0.0

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

@@ -5,12 +5,15 @@ import * as inlineChatOverlayWidget from './media/inlineChatOverlayWidget.css';
 import { $, append, setVisibility, DisposableResizeObserver, getTotalWidth, addDisposableListener, isAncestorOfActiveElement, trackFocus, createElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { DEFAULT_FONT_FAMILY } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/fonts';
 import { StandardKeyboardEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/keyboardEvent';
-import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
+import { renderAsPlaintext, renderMarkdown } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { ActionBar, ActionsOrientation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { DomScrollableElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { ScrollbarVisibility } from '@codingame/monaco-vscode-api/vscode/vs/base/common/scrollable';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
@@ -33,6 +36,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { getSimpleEditorOptions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { PlaceholderTextContribution } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/placeholderText/browser/placeholderTextContribution';
 import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { IInlineChatHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatHistoryService.service';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableFromEvent, observableFromEventOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
@@ -47,12 +51,14 @@ let InlineChatInputWidget = class InlineChatInputWidget extends Disposable {
         _menuService,
         instantiationService,
         modelService,
-        configurationService
+        configurationService,
+        _historyService
     ) {
         super();
         this._editorObs = _editorObs;
         this._contextKeyService = _contextKeyService;
         this._menuService = _menuService;
+        this._historyService = _historyService;
         this._position = observableValue(this, null);
         this.position = this._position;
         this._showStore = this._store.add(( new DisposableStore()));
@@ -153,7 +159,17 @@ let InlineChatInputWidget = class InlineChatInputWidget extends Disposable {
             const totalWidth = contentWidth.read(r) + editorPad + toolbarWidth.read(r);
             const minWidth = 220;
             const maxWidth = 600;
-            const clampedWidth = this._input.getOption(EditorOption.wordWrap) === "on" ? maxWidth : Math.max(minWidth, Math.min(totalWidth, maxWidth));
+            const midWidth = Math.round(maxWidth / 1.618);
+            let clampedWidth;
+            if (this._input.getOption(EditorOption.wordWrap) === "on") {
+                clampedWidth = maxWidth;
+            } else if (totalWidth <= minWidth) {
+                clampedWidth = minWidth;
+            } else if (totalWidth <= midWidth) {
+                clampedWidth = midWidth;
+            } else {
+                clampedWidth = maxWidth;
+            }
             const lineHeight = this._input.getOption(EditorOption.lineHeight);
             const clampedHeight = Math.min(contentHeight.read(r), (3 * lineHeight));
             if (totalWidth > clampedWidth) {
@@ -202,13 +218,26 @@ let InlineChatInputWidget = class InlineChatInputWidget extends Disposable {
         this._store.add(this._input.onDidBlurEditorText(() => inputWidgetFocused.set(false)));
         this._store.add(toDisposable(() => inputWidgetFocused.reset()));
         this._store.add(this._input.onKeyDown(e => {
-            if (e.keyCode === KeyCode.DownArrow && !actionBar.isEmpty()) {
-                const model = this._input.getModel();
+            if (e.keyCode === KeyCode.UpArrow) {
                 const position = this._input.getPosition();
-                if (position && position.lineNumber === model.getLineCount()) {
+                if (position && position.lineNumber === 1) {
+                    this._showPreviousHistoryValue();
                     e.preventDefault();
                     e.stopPropagation();
-                    actionBar.focus(0);
+                }
+            } else if (e.keyCode === KeyCode.DownArrow) {
+                const model = this._input.getModel();
+                const position = this._input.getPosition();
+                if (position && position.lineNumber === model.getLineCount()) {
+                    if (!this._historyService.isAtEnd()) {
+                        this._showNextHistoryValue();
+                        e.preventDefault();
+                        e.stopPropagation();
+                    } else if (!actionBar.isEmpty()) {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        actionBar.focus(0);
+                    }
                 }
             }
         }));
@@ -233,13 +262,35 @@ let InlineChatInputWidget = class InlineChatInputWidget extends Disposable {
     get value() {
         return this._input.getModel().getValue().trim();
     }
-    show(lineNumber, left, anchorAbove, placeholder) {
+    addToHistory(value) {
+        this._historyService.addToHistory(value);
+    }
+    _showPreviousHistoryValue() {
+        if (this._historyService.isAtEnd()) {
+            this._historyService.replaceLast(this._input.getModel().getValue());
+        }
+        const value = this._historyService.previousValue();
+        if (value !== undefined) {
+            this._input.getModel().setValue(value);
+        }
+    }
+    _showNextHistoryValue() {
+        if (this._historyService.isAtEnd()) {
+            return;
+        }
+        const value = this._historyService.nextValue();
+        if (value !== undefined) {
+            this._input.getModel().setValue(value);
+        }
+    }
+    show(lineNumber, left, anchorAbove, placeholder, value) {
         this._showStore.clear();
+        this._historyService.resetCursor();
         this._input.updateOptions({
             wordWrap: "off",
             placeholder
         });
-        this._input.getModel().setValue("");
+        this._input.getModel().setValue(value ?? "");
         this._anchorLineNumber = lineNumber;
         this._anchorLeft = left;
         this._anchorAbove = anchorAbove;
@@ -265,7 +316,12 @@ let InlineChatInputWidget = class InlineChatInputWidget extends Disposable {
                 this._updatePosition();
             }
         }));
-        setTimeout(() => this._input.focus(), 0);
+        setTimeout(() => {
+            this._input.focus();
+            if (value) {
+                this._input.setSelection(this._input.getModel().getFullModelRange());
+            }
+        }, 0);
     }
     _updatePosition() {
         const editor = this._editorObs.editor;
@@ -304,7 +360,7 @@ let InlineChatInputWidget = class InlineChatInputWidget extends Disposable {
         this._showStore.clear();
     }
 };
-InlineChatInputWidget = ( __decorate([( __param(1, IContextKeyService)), ( __param(2, IMenuService)), ( __param(3, IInstantiationService)), ( __param(4, IModelService)), ( __param(5, IConfigurationService))], InlineChatInputWidget));
+InlineChatInputWidget = ( __decorate([( __param(1, IContextKeyService)), ( __param(2, IMenuService)), ( __param(3, IInstantiationService)), ( __param(4, IModelService)), ( __param(5, IConfigurationService)), ( __param(6, IInlineChatHistoryService))], InlineChatInputWidget));
 let InlineChatSessionOverlayWidget = class InlineChatSessionOverlayWidget extends Disposable {
     constructor(_editorObs, _instaService, _keybindingService, _logService) {
         super();
@@ -320,11 +376,25 @@ let InlineChatSessionOverlayWidget = class InlineChatSessionOverlayWidget extend
         this._container = createElement("div");
         this._domNode.appendChild(this._container);
         this._container.classList.add("inline-chat-session-overlay-container");
+        this._markdownContainer = createElement("div");
+        this._markdownContainer.classList.add("markdown-scroll-container");
+        this._markdownMessage = createElement("div");
+        this._markdownMessage.classList.add("markdown-message");
+        this._markdownContainer.appendChild(this._markdownMessage);
+        this._markdownScrollable = this._store.add(( new DomScrollableElement(this._markdownContainer, {
+            consumeMouseWheelIfScrollbarIsNeeded: true,
+            horizontal: ScrollbarVisibility.Hidden,
+            vertical: ScrollbarVisibility.Auto
+        })));
+        this._container.appendChild(this._markdownScrollable.getDomNode());
+        this._contentRow = createElement("div");
+        this._contentRow.classList.add("content-row");
+        this._container.appendChild(this._contentRow);
         this._statusNode = createElement("div");
         this._statusNode.classList.add("status");
         this._icon = append(this._statusNode, $("span"));
         this._message = append(this._statusNode, $("span.message"));
-        this._container.appendChild(this._statusNode);
+        this._contentRow.appendChild(this._statusNode);
         this._toolbarNode = createElement("div");
         this._toolbarNode.classList.add("toolbar");
         const stickyScrollController = StickyScrollController.get(this._editorObs.editor);
@@ -342,10 +412,17 @@ let InlineChatSessionOverlayWidget = class InlineChatSessionOverlayWidget extend
             if (!session || !chatModel) {
                 return undefined;
             }
+            const terminationState = session.terminationState.read(r);
+            if (terminationState) {
+                return {
+                    markdown: terminationState,
+                    icon: Codicon.info
+                };
+            }
             const response = chatModel.lastRequestObs.read(r)?.response;
             if (!response) {
                 return {
-                    message: ( localize(9665, "Working...")),
+                    message: ( localize(9895, "Working...")),
                     icon: ThemeIcon.modify(Codicon.loading, "spin")
                 };
             }
@@ -353,20 +430,20 @@ let InlineChatSessionOverlayWidget = class InlineChatSessionOverlayWidget extend
                 const result = response.result;
                 if (result?.errorDetails) {
                     return {
-                        message: ( localize(9666, "Sorry, your request failed")),
+                        message: ( localize(9896, "Sorry, your request failed")),
                         icon: Codicon.error
                     };
                 }
                 const changes = entry.read(r)?.changesCount.read(r) ?? 0;
                 return {
-                    message: changes === 0 ? ( localize(9667, "Done")) : changes === 1 ? ( localize(9668, "Done, 1 change")) : ( localize(9669, "Done, {0} changes", changes)),
+                    message: changes === 0 ? ( localize(9897, "Done")) : changes === 1 ? ( localize(9898, "Done, 1 change")) : ( localize(9899, "Done, {0} changes", changes)),
                     icon: Codicon.check
                 };
             }
             const pendingConfirmation = response.isPendingConfirmation.read(r);
             if (pendingConfirmation) {
                 return {
-                    message: ( localize(9670, "Sorry, but an expected error happened")),
+                    message: ( localize(9900, "Sorry, but an expected error happened")),
                     icon: Codicon.error
                 };
             }
@@ -385,20 +462,46 @@ let InlineChatSessionOverlayWidget = class InlineChatSessionOverlayWidget extend
                 };
             } else {
                 return {
-                    message: ( localize(9665, "Working...")),
+                    message: ( localize(9895, "Working...")),
                     icon: ThemeIcon.modify(Codicon.loading, "spin")
                 };
             }
         });
+        const markdownStore = this._showStore.add(( new DisposableStore()));
         this._showStore.add(autorun(r => {
             const value = requestMessage.read(r);
             if (value) {
-                this._message.innerText = renderAsPlaintext(value.message);
-                this._icon.className = "";
-                this._icon.classList.add(...ThemeIcon.asClassNameArray(value.icon));
+                if (value.message && value.icon) {
+                    this._message.innerText = renderAsPlaintext(value.message);
+                    this._icon.className = "";
+                    this._icon.classList.add(...ThemeIcon.asClassNameArray(value.icon));
+                    this._statusNode.classList.remove("hidden");
+                    this._contentRow.classList.remove("status-hidden");
+                } else {
+                    this._message.innerText = "";
+                    this._icon.className = "";
+                    this._statusNode.classList.add("hidden");
+                    this._contentRow.classList.add("status-hidden");
+                }
+                markdownStore.clear();
+                this._markdownMessage.replaceChildren();
+                if (value.markdown) {
+                    this._markdownScrollable.getDomNode().classList.remove("hidden");
+                    const markdown = typeof value.markdown === "string" ? ( new MarkdownString(value.markdown)) : value.markdown;
+                    const rendered = markdownStore.add(renderMarkdown(markdown));
+                    this._markdownMessage.appendChild(rendered.element);
+                    this._markdownScrollable.scanDomNode();
+                } else {
+                    this._markdownScrollable.getDomNode().classList.add("hidden");
+                }
             } else {
                 this._message.innerText = "";
                 this._icon.className = "";
+                this._statusNode.classList.add("hidden");
+                this._contentRow.classList.add("status-hidden");
+                markdownStore.clear();
+                this._markdownMessage.replaceChildren();
+                this._markdownScrollable.getDomNode().classList.add("hidden");
             }
         }));
         this._showStore.add(autorun(r => {
@@ -408,7 +511,7 @@ let InlineChatSessionOverlayWidget = class InlineChatSessionOverlayWidget extend
                 this._logService.info(`[InlineChat] UNEXPECTED approval needed: ${pending.detail ?? "unknown"}`);
             }
         }));
-        this._container.appendChild(this._toolbarNode);
+        this._contentRow.appendChild(this._toolbarNode);
         this._showStore.add(toDisposable(() => this._toolbarNode.remove()));
         const that = this;
         this._showStore.add(
@@ -423,7 +526,7 @@ let InlineChatSessionOverlayWidget = class InlineChatSessionOverlayWidget extend
                     renderShortTitle: true
                 },
                 actionViewItemProvider: (action, options) => {
-                    const primaryActions = ["inlineChat2.cancel", "inlineChat2.keep", "inlineChat2.close"];
+                    const primaryActions = ["inlineChat2.cancel", "inlineChat2.keep", "inlineChat2.rephrase"];
                     const labeledActions = primaryActions.concat(["inlineChat2.undo"]);
                     if (!labeledActions.includes(action.id)) {
                         return undefined;
@@ -447,8 +550,12 @@ let InlineChatSessionOverlayWidget = class InlineChatSessionOverlayWidget extend
             const stickyScrollHeight = this._stickyScrollHeight.read(r);
             const width = widgetWidth.read(r);
             const padding = Math.round(lineHeight.read(r) * 2 / 3);
-            const maxWidth = layoutInfo.contentWidth - 2 * padding;
+            const maxWidth = Math.min(400, layoutInfo.contentWidth - 2 * padding);
+            const maxHeight = Math.min(150, Math.floor(layoutInfo.height / 3));
             this._domNode.style.maxWidth = `${maxWidth}px`;
+            this._markdownScrollable.getDomNode().style.maxHeight = `${maxHeight}px`;
+            this._markdownContainer.style.maxHeight = `${maxHeight}px`;
+            this._markdownScrollable.scanDomNode();
             const top = stickyScrollHeight + padding;
             const left = layoutInfo.width - width - layoutInfo.verticalScrollbarWidth - layoutInfo.minimap.minimapWidth - padding;
             this._position.set({

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

@@ -0,0 +1,23 @@
+import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { Position } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position";
+import { Selection } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection";
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IChatEditingSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IChatModel, IChatModelInputState, IChatRequestModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+export type InlineChatSessionTerminationState = string | IMarkdownString;
+export interface IInlineChatSession2 {
+    readonly initialPosition: Position;
+    readonly initialSelection: Selection;
+    readonly uri: URI;
+    readonly chatModel: IChatModel;
+    readonly editingSession: IChatEditingSession;
+    readonly terminationState: IObservable<InlineChatSessionTerminationState | undefined>;
+    setTerminationState(state: InlineChatSessionTerminationState | undefined): void;
+    dispose(): void;
+}
+export declare function moveToPanelChat(accessor: ServicesAccessor, model: IChatModel | undefined, resend: boolean): Promise<void>;
+export declare function askInPanelChat(accessor: ServicesAccessor, request: IChatRequestModel, state: IChatModelInputState | undefined): Promise<void>;
+export declare function continueInPanelChat(accessor: ServicesAccessor, session: IInlineChatSession2): Promise<void>;
+export declare function rephraseInlineChat(accessor: ServicesAccessor, session: IInlineChatSession2): string | undefined;

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

@@ -0,0 +1,41 @@
+
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+
+async function askInPanelChat(accessor, request, state) {
+    const widgetService = accessor.get(IChatWidgetService);
+    const chatService = accessor.get(IChatService);
+    if (!request) {
+        return;
+    }
+    const newModelRef = chatService.startNewLocalSession(ChatAgentLocation.Chat);
+    const newModel = newModelRef.object;
+    newModel.inputModel.setState({
+        ...state,
+        mode: { id: 'agent', kind: ChatModeKind.Agent }
+    });
+    const widget = await widgetService.openSession(newModelRef.object.sessionResource);
+    newModelRef.dispose();
+    widget?.acceptInput(request.message.text);
+}
+async function continueInPanelChat(accessor, session) {
+    const request = session.chatModel.getRequests().at(-1);
+    if (!request) {
+        return;
+    }
+    await askInPanelChat(accessor, request, session.chatModel.inputModel.state.get());
+    session.dispose();
+}
+function rephraseInlineChat(accessor, session) {
+    const request = session.chatModel.getRequests().at(-1);
+    if (!request) {
+        return undefined;
+    }
+    accessor.get(IChatService).removeRequest(session.chatModel.sessionResource, request.id);
+    session.chatModel.inputModel.setState({ inputText: request.message.text });
+    session.setTerminationState(undefined);
+    return request.message.text;
+}
+
+export { askInPanelChat, continueInPanelChat, rephraseInlineChat };

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

@@ -248,7 +248,7 @@ let InlineChatWidget = class InlineChatWidget {
         );
         this._store.add(this._chatService.onDidPerformUserAction(e => {
             if (isEqual(e.sessionResource, this._chatWidget.viewModel?.model.sessionResource) && e.action.kind === "vote") {
-                this.updateStatus(( localize(9679, "Thank you for your feedback!")), {
+                this.updateStatus(( localize(9912, "Thank you for your feedback!")), {
                     resetAfter: 1250
                 });
             }
@@ -261,11 +261,11 @@ let InlineChatWidget = class InlineChatWidget {
             if (this._configurationService.getValue(AccessibilityVerbositySettingId.InlineChat)) {
                 const kbLabel = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
                 label = kbLabel ? ( localize(
-                    9680,
+                    9913,
                     "Inline Chat Input, Use {0} for Inline Chat Accessibility Help.",
                     kbLabel
                 )) : ( localize(
-                    9681,
+                    9914,
                     "Inline Chat Input, Run the Inline Chat Accessibility Help command for more information."
                 ));
             }
@@ -286,7 +286,7 @@ let InlineChatWidget = class InlineChatWidget {
             this._elements.disclaimerLabel.classList.toggle("hidden", !showDisclaimer);
             if (showDisclaimer) {
                 const renderedMarkdown = disposables.add(this._markdownRendererService.render(( new MarkdownString(( localize(
-                    9682,
+                    9915,
                     "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})",
                     product.defaultChatAgent?.provider?.default?.name ?? "",
                     product.defaultChatAgent?.provider?.default?.name ?? "",
@@ -495,7 +495,7 @@ let InlineChatWidget = class InlineChatWidget {
     }
 };
 InlineChatWidget = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IContextKeyService)), ( __param(4, IKeybindingService)), ( __param(5, IAccessibilityService)), ( __param(6, IConfigurationService)), ( __param(7, IAccessibleViewService)), ( __param(8, ITextModelService)), ( __param(9, IChatService)), ( __param(10, IHoverService)), ( __param(11, IChatEntitlementService)), ( __param(12, IMarkdownRendererService))], InlineChatWidget));
-const defaultAriaLabel = ( localize(9683, "Inline Chat Input"));
+const defaultAriaLabel = ( localize(9916, "Inline Chat Input"));
 let EditorBasedInlineChatWidget = class EditorBasedInlineChatWidget extends InlineChatWidget {
     constructor(
         location,

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

@@ -240,7 +240,7 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         this._ctxCursorPosition.reset();
         this.widget.chatWidget.setVisible(false);
         super.hide();
-        status(( localize(9684, "Closed inline chat widget")));
+        status(( localize(9917, "Closed inline chat widget")));
         scrollState.restore(this.editor);
     }
 };

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

@@ -98,29 +98,81 @@
 }
 
 .inline-chat-session-overlay-container {
-	padding: 2px 4px;
+	padding: 4px;
 	color: var(--vscode-foreground);
 	background-color: var(--vscode-editorWidget-background);
 	border-radius: 6px;
 	border: 1px solid var(--vscode-contrastBorder);
 	display: flex;
-	align-items: center;
+	flex-direction: column;
+	align-items: stretch;
 	justify-content: center;
-	gap: 4px;
+	gap: 8px;
 	z-index: 10;
 	box-shadow: var(--vscode-shadow-lg);
 	overflow: hidden;
 }
 
+.inline-chat-session-overlay-container .markdown-message {
+	padding: 5px;
+	font-size: 12px;
+	line-height: 1.45;
+}
+
+.inline-chat-session-overlay-container > .monaco-scrollable-element {
+	width: 100%;
+}
+
+.inline-chat-session-overlay-container > .monaco-scrollable-element.hidden {
+	display: none;
+}
+
+.inline-chat-session-overlay-container .markdown-scroll-container {
+	width: 100%;
+}
+
+.inline-chat-session-overlay-container .markdown-message DIV P {
+	margin: 0;
+}
+
+.inline-chat-session-overlay-container .markdown-message DIV P code {
+	font-family: var(--monaco-monospace-font);
+	font-size: var(--vscode-chat-font-size-body-xs);
+	color: var(--vscode-textPreformat-foreground);
+	background-color: var(--vscode-textPreformat-background);
+	padding: 1px 3px;
+	border-radius: 4px;
+	border: 1px solid var(--vscode-textPreformat-border);
+	white-space: pre-wrap;
+}
+
+
+.inline-chat-session-overlay-container .content-row {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 4px;
+	min-width: 0;
+}
+
+.inline-chat-session-overlay-container .content-row.status-hidden {
+	justify-content: flex-end;
+}
+
 .inline-chat-session-overlay-container .status {
 	align-items: center;
 	display: inline-flex;
+	flex: 1;
 	padding: 5px 0 5px 5px;
 	font-size: 12px;
 	overflow: hidden;
 	gap: 6px;
 }
 
+.inline-chat-session-overlay-container .status.hidden {
+	display: none;
+}
+
 .inline-chat-session-overlay-container .status .message {
 	white-space: nowrap;
 	overflow: hidden;

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

@@ -8,7 +8,8 @@ export declare enum InlineChatConfigKeys {
     DefaultModel = "inlineChat.defaultModel",
     Affordance = "inlineChat.affordance",
     RenderMode = "inlineChat.renderMode",
-    FixDiagnostics = "inlineChat.fixDiagnostics"
+    FixDiagnostics = "inlineChat.fixDiagnostics",
+    AskInChat = "inlineChat.askInChat"
 }
 export declare const INLINE_CHAT_ID = "interactiveEditor";
 export declare const INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID = "interactiveEditorAccessiblityHelp";
@@ -38,11 +39,13 @@ 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";