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

package/vscode/src/vs/workbench/contrib/chat/common/widget/chatColors.js

@@ -18,45 +18,45 @@ registerColor("agentStatusIndicator.background", {
     light: ( Color.black.transparent(0.05)),
     hcDark: null,
     hcLight: null
-}, ( localize(7407, "Background color of the agent status indicator in the titlebar.")));
+}, ( localize(7633, "Background color of the agent status indicator in the titlebar.")));
 registerColor("chat.requestBorder", {
     dark: ( new Color(( new RGBA(255, 255, 255, 0.10)))),
     light: ( new Color(( new RGBA(0, 0, 0, 0.10)))),
     hcDark: contrastBorder,
     hcLight: contrastBorder
-}, ( localize(7408, "The border color of a chat request.")));
+}, ( localize(7634, "The border color of a chat request.")));
 const chatRequestBackground = registerColor("chat.requestBackground", {
     dark: ( transparent(editorBackground, 0.62)),
     light: ( transparent(editorBackground, 0.62)),
     hcDark: editorWidgetBackground,
     hcLight: null
-}, ( localize(7409, "The background color of a chat request.")));
+}, ( localize(7635, "The background color of a chat request.")));
 const chatSlashCommandBackground = registerColor("chat.slashCommandBackground", {
     dark: "#26477866",
     light: "#adceff7a",
     hcDark: Color.white,
     hcLight: badgeBackground
-}, ( localize(7410, "The background color of a chat slash command.")));
+}, ( localize(7636, "The background color of a chat slash command.")));
 const chatSlashCommandForeground = registerColor("chat.slashCommandForeground", {
     dark: "#85b6ff",
     light: "#26569e",
     hcDark: Color.black,
     hcLight: badgeForeground
-}, ( localize(7411, "The foreground color of a chat slash command.")));
+}, ( localize(7637, "The foreground color of a chat slash command.")));
 registerColor("chat.avatarBackground", {
     dark: "#1f1f1f",
     light: "#f2f2f2",
     hcDark: Color.black,
     hcLight: Color.white
-}, ( localize(7412, "The background color of a chat avatar.")));
-registerColor("chat.avatarForeground", foreground, ( localize(7413, "The foreground color of a chat avatar.")));
+}, ( localize(7638, "The background color of a chat avatar.")));
+registerColor("chat.avatarForeground", foreground, ( localize(7639, "The foreground color of a chat avatar.")));
 registerColor("chat.editedFileForeground", {
     light: "#895503",
     dark: "#E2C08D",
     hcDark: "#E2C08D",
     hcLight: "#895503"
 }, ( localize(
-    7414,
+    7640,
     "The foreground color of a chat edited file in the edited file list."
 )));
 registerColor("chat.requestCodeBorder", {
@@ -64,42 +64,42 @@ registerColor("chat.requestCodeBorder", {
     light: "#0e639c40",
     hcDark: null,
     hcLight: null
-}, ( localize(7415, "Border color of code blocks within the chat request bubble.")), true);
+}, ( localize(7641, "Border color of code blocks within the chat request bubble.")), true);
 registerColor("chat.requestBubbleBackground", {
     light: ( transparent(editorSelectionBackground, 0.3)),
     dark: ( transparent(editorSelectionBackground, 0.3)),
     hcDark: null,
     hcLight: null
-}, ( localize(7416, "Background color of the chat request bubble.")), true);
+}, ( localize(7642, "Background color of the chat request bubble.")), true);
 registerColor("chat.requestBubbleHoverBackground", {
     dark: ( transparent(editorSelectionBackground, 0.6)),
     light: ( transparent(editorSelectionBackground, 0.6)),
     hcDark: null,
     hcLight: null
-}, ( localize(7417, "Background color of the chat request bubble on hover.")), true);
+}, ( localize(7643, "Background color of the chat request bubble on hover.")), true);
 registerColor("chat.checkpointSeparator", {
     dark: "#585858",
     light: "#a9a9a9",
     hcDark: "#a9a9a9",
     hcLight: "#a5a5a5"
-}, ( localize(7418, "Chat checkpoint separator color.")));
+}, ( localize(7644, "Chat checkpoint separator color.")));
 registerColor("chat.linesAddedForeground", {
     dark: "#54B054",
     light: "#107C10",
     hcDark: "#54B054",
     hcLight: "#107C10"
-}, ( localize(7419, "Foreground color of lines added in chat code block pill.")), true);
+}, ( localize(7645, "Foreground color of lines added in chat code block pill.")), true);
 registerColor("chat.linesRemovedForeground", {
     dark: "#FC6A6A",
     light: "#BC2F32",
     hcDark: "#F48771",
     hcLight: "#B5200D"
-}, ( localize(7420, "Foreground color of lines removed in chat code block pill.")), true);
+}, ( localize(7646, "Foreground color of lines removed in chat code block pill.")), true);
 registerColor("chat.thinkingShimmer", {
     dark: "#ffffff",
     light: "#000000",
     hcDark: "#ffffff",
     hcLight: "#000000"
-}, ( localize(7421, "Shimmer highlight for thinking/working labels.")), true);
+}, ( localize(7647, "Shimmer highlight for thinking/working labels.")), true);
 
 export { chatRequestBackground, chatSlashCommandBackground, chatSlashCommandForeground };

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

@@ -11,5 +11,5 @@ export declare class InlineChatAffordance extends Disposable {
     #private;
     constructor(editor: ICodeEditor, inputWidget: InlineChatInputWidget, instantiationService: IInstantiationService, configurationService: IConfigurationService, chatEntiteldService: IChatEntitlementService, inlineChatSessionService: IInlineChatSessionService, telemetryService: ITelemetryService, contextKeyService: IContextKeyService);
     dismiss(): void;
-    showMenuAtSelection(placeholder: string): Promise<void>;
+    showMenuAtSelection(placeholder: string, value?: string): Promise<void>;
 }

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

@@ -149,7 +149,7 @@ let InlineChatAffordance = class InlineChatAffordance extends Disposable {
             const editorDomNode = this.#editor.getDomNode();
             const editorRect = editorDomNode.getBoundingClientRect();
             const left = data.rect.left - editorRect.left;
-            this.#inputWidget.show(data.lineNumber, left, data.above, data.placeholder);
+            this.#inputWidget.show(data.lineNumber, left, data.above, data.placeholder, data.value);
         }));
         this._store.add(autorun(r => {
             const pos = this.#inputWidget.position.read(r);
@@ -161,7 +161,7 @@ let InlineChatAffordance = class InlineChatAffordance extends Disposable {
     dismiss() {
         this.#selectionData.set(undefined, undefined);
     }
-    async showMenuAtSelection(placeholder) {
+    async showMenuAtSelection(placeholder, value) {
         assertType(this.#editor.hasModel());
         const direction = this.#editor.getSelection().getDirection();
         const position = this.#editor.getPosition();
@@ -174,7 +174,8 @@ let InlineChatAffordance = class InlineChatAffordance extends Disposable {
             rect: ( new DOMRect(x, y, 0, scrolledPosition.height)),
             above: direction === SelectionDirection.RTL,
             lineNumber: position.lineNumber,
-            placeholder
+            placeholder,
+            value
         }, undefined);
         await waitForState(this.#inputWidget.position, pos => pos === null);
     }

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

@@ -79,6 +79,8 @@ export declare class InlineChatController implements IEditorContribution {
     run(arg?: InlineChatRunOptions): Promise<boolean>;
     acceptSession(): Promise<void>;
     rejectSession(): Promise<void>;
+    continueSessionInChat(): Promise<void>;
+    rephraseSession(): Promise<void>;
     private _selectVendorDefaultModel;
     /**
      * Applies model defaults based on settings and tracks user model changes.

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

@@ -44,9 +44,10 @@ import { isNotebookContainingCellEditor } from '@codingame/monaco-vscode-api/vsc
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
-import { CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_INLINE_CHAT_PENDING_CONFIRMATION, InlineChatConfigKeys } from '../common/inlineChat.js';
+import { CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_INLINE_CHAT_PENDING_CONFIRMATION, CTX_INLINE_CHAT_TERMINATED, InlineChatConfigKeys } from '../common/inlineChat.js';
 import { InlineChatAffordance } from './inlineChatAffordance.js';
 import { InlineChatInputWidget, InlineChatSessionOverlayWidget } from './inlineChatOverlayWidget.js';
+import { continueInPanelChat } from './inlineChatSessionService.js';
 import { IInlineChatSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
 import { InlineChatZoneWidget } from './inlineChatZoneWidget.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
@@ -139,6 +140,7 @@ let InlineChatController = class InlineChatController {
         const ctxInlineChatVisible = CTX_INLINE_CHAT_VISIBLE.bindTo(contextKeyService);
         const ctxFileBelongsToChat = CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.bindTo(contextKeyService);
         const ctxPendingConfirmation = CTX_INLINE_CHAT_PENDING_CONFIRMATION.bindTo(contextKeyService);
+        const ctxTerminated = CTX_INLINE_CHAT_TERMINATED.bindTo(contextKeyService);
         const notebookAgentConfig = observableConfigValue(InlineChatConfigKeys.notebookAgent, false, this._configurationService);
         this._renderMode = observableConfigValue(InlineChatConfigKeys.RenderMode, "zone", this._configurationService);
         this._store.add(autorun(r => {
@@ -273,7 +275,11 @@ let InlineChatController = class InlineChatController {
             }
         }));
         const defaultPlaceholderObs = ( visibleSessionObs.map((session, r) => {
-            return session?.initialSelection.isEmpty() ? ( localize(9658, "Generate code")) : ( localize(9659, "Modify selected code"));
+            return session?.initialSelection.isEmpty() ? ( localize(9886, "Generate code")) : ( localize(9887, "Modify selected code"));
+        }));
+        this._store.add(autorun(r => {
+            const session = visibleSessionObs.read(r);
+            ctxTerminated.set(!!session?.terminationState.read(r));
         }));
         this._store.add(autorun(r => {
             const session = visibleSessionObs.read(r);
@@ -311,10 +317,11 @@ let InlineChatController = class InlineChatController {
             const isInProgress = lastRequest?.response?.isInProgress.read(r);
             const isPendingConfirmation = !!lastRequest?.response?.isPendingConfirmation.read(r);
             const isError = !!lastRequest?.response?.result?.errorDetails;
+            const isTerminated = !!session.terminationState.read(r);
             ctxPendingConfirmation.set(isPendingConfirmation);
             const entry = session.editingSession.readEntry(session.uri, r);
             const isNotSettled = entry ? entry.state.read(r) === ModifiedFileEntryState.Modified : false;
-            if (isInProgress || isNotSettled || isPendingConfirmation || isError) {
+            if (isInProgress || isNotSettled || isPendingConfirmation || isError || isTerminated) {
                 sessionOverlayWidget.show(session);
             } else {
                 sessionOverlayWidget.hide();
@@ -363,12 +370,16 @@ let InlineChatController = class InlineChatController {
             ).read(r);
         }));
         this._store.add(autorun(r => {
+            const session = visibleSessionObs.read(r);
             const response = lastResponseObs.read(r);
+            const terminationState = session?.terminationState.read(r);
             this._zone.rawValue?.widget.updateInfo("");
             if (!response?.isInProgress.read(r)) {
                 if (response?.result?.errorDetails) {
                     this._zone.rawValue?.widget.updateInfo(`$(error) ${response.result.errorDetails.message}`);
                     alert(response.result.errorDetails.message);
+                } else if (terminationState) {
+                    this._zone.rawValue?.widget.updateInfo(`$(info) ${renderAsPlaintext(terminationState)}`);
                 }
                 this._zone.rawValue?.widget.domNode.classList.toggle("request-in-progress", false);
                 this._zone.rawValue?.widget.chatWidget.setInputPlaceholder(defaultPlaceholderObs.read(r));
@@ -379,7 +390,7 @@ let InlineChatController = class InlineChatController {
                 if (lastProgress) {
                     placeholder = renderAsPlaintext(lastProgress.content);
                 }
-                this._zone.rawValue?.widget.chatWidget.setInputPlaceholder(placeholder || ( localize(9660, "Working...")));
+                this._zone.rawValue?.widget.chatWidget.setInputPlaceholder(placeholder || ( localize(9888, "Working...")));
             }
         }));
         this._store.add(autorun(r => {
@@ -450,7 +461,7 @@ let InlineChatController = class InlineChatController {
                 }
                 if (entries.length > 0) {
                     this._zone.value.widget.chatWidget.attachmentModel.addContext(...entries);
-                    const msg = entries.length > 1 ? ( localize(9661, "Fix the attached problems")) : ( localize(9662, "Fix the attached problem"));
+                    const msg = entries.length > 1 ? ( localize(9889, "Fix the attached problems")) : ( localize(9890, "Fix the attached problem"));
                     this._zone.value.widget.chatWidget.input.setValue(msg, true);
                     arg.message = msg;
                     this._zone.value.widget.chatWidget.inputEditor.setSelection(( new Selection(1, 1, Number.MAX_SAFE_INTEGER, 1)));
@@ -521,10 +532,31 @@ let InlineChatController = class InlineChatController {
         if (!session) {
             return;
         }
-        this._chatService.cancelCurrentRequestForSession(session.chatModel.sessionResource, "inlineChatReject");
+        await this._chatService.cancelCurrentRequestForSession(session.chatModel.sessionResource, "inlineChatReject");
         await session.editingSession.reject();
         session.dispose();
     }
+    async continueSessionInChat() {
+        const session = this._currentSession.get();
+        if (!session) {
+            return;
+        }
+        await this._instaService.invokeFunction(continueInPanelChat, session);
+    }
+    async rephraseSession() {
+        const session = this._currentSession.get();
+        if (!session) {
+            return;
+        }
+        const requestText = session.chatModel.getRequests().at(-1)?.message.text;
+        session.dispose();
+        if (!requestText) {
+            return;
+        }
+        const selection = this._editor.getSelection();
+        const placeholder = selection && !selection.isEmpty() ? ( localize(9891, "Describe how to change this")) : ( localize(9892, "Describe what to generate"));
+        await this.inputOverlayWidget.showMenuAtSelection(placeholder, requestText);
+    }
     async _selectVendorDefaultModel(session) {
         const model = this._zone.value.widget.chatWidget.input.selectedLanguageModel.get();
         if (model && !model.metadata.isDefaultForLocation[session.chatModel.initialLocation]) {

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

@@ -24,6 +24,7 @@ export declare class InlineChatEditorAffordance extends Disposable implements IC
     private _show;
     private _showAtSelection;
     private _showAtLineStart;
+    private _isPositionInViewport;
     private _hide;
     getId(): string;
     getDomNode(): HTMLElement;

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

@@ -186,6 +186,18 @@ let InlineChatEditorAffordance = class InlineChatEditorAffordance extends Dispos
                 this._hide();
             }
         }));
+        this._store.add(this._editor.onDidScrollChange(() => {
+            const sel = selection.get();
+            if (!sel) {
+                return;
+            }
+            const isInViewport = this._isPositionInViewport();
+            if (isInViewport && !this._isVisible) {
+                this._show(sel);
+            } else if (!isInViewport && this._isVisible) {
+                this._hide();
+            }
+        }));
     }
     _show(selection) {
         if (selection.isEmpty()) {
@@ -241,6 +253,25 @@ let InlineChatEditorAffordance = class InlineChatEditorAffordance extends Dispos
             preference: [ContentWidgetPositionPreference.EXACT]
         };
     }
+    _isPositionInViewport() {
+        const widgetPosition = this._position?.position;
+        if (!widgetPosition) {
+            return false;
+        }
+        const visibleRanges = this._editor.getVisibleRanges();
+        const isLineVisible = ( visibleRanges.some(
+            range => widgetPosition.lineNumber >= range.startLineNumber && widgetPosition.lineNumber <= range.endLineNumber
+        ));
+        if (!isLineVisible) {
+            return false;
+        }
+        const scrolledPos = this._editor.getScrolledVisiblePosition(widgetPosition);
+        if (!scrolledPos) {
+            return false;
+        }
+        const layoutInfo = this._editor.getOptions().get(EditorOption.layoutInfo);
+        return scrolledPos.left >= 0 && scrolledPos.left <= layoutInfo.width;
+    }
     _hide() {
         if (this._isVisible) {
             this._isVisible = false;

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

@@ -9,7 +9,8 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IInlineChatSession2 } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService";
+import { IInlineChatSession2 } from "./inlineChatSessionService.js";
+import { IInlineChatHistoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatHistoryService.service";
 /**
  * Overlay widget that displays a vertical action bar menu.
  */
@@ -17,6 +18,7 @@ export declare class InlineChatInputWidget extends Disposable {
     private readonly _editorObs;
     private readonly _contextKeyService;
     private readonly _menuService;
+    private readonly _historyService;
     private readonly _domNode;
     private readonly _container;
     private readonly _inputContainer;
@@ -30,15 +32,18 @@ export declare class InlineChatInputWidget extends Disposable {
     private _anchorLineNumber;
     private _anchorLeft;
     private _anchorAbove;
-    constructor(_editorObs: ObservableCodeEditor, _contextKeyService: IContextKeyService, _menuService: IMenuService, instantiationService: IInstantiationService, modelService: IModelService, configurationService: IConfigurationService);
+    constructor(_editorObs: ObservableCodeEditor, _contextKeyService: IContextKeyService, _menuService: IMenuService, instantiationService: IInstantiationService, modelService: IModelService, configurationService: IConfigurationService, _historyService: IInlineChatHistoryService);
     get value(): string;
+    addToHistory(value: string): void;
+    private _showPreviousHistoryValue;
+    private _showNextHistoryValue;
     /**
      * Show the widget at the specified line.
      * @param lineNumber The line number to anchor the widget to
      * @param left Left offset relative to editor
      * @param anchorAbove Whether to anchor above the position (widget grows upward)
      */
-    show(lineNumber: number, left: number, anchorAbove: boolean, placeholder: string): void;
+    show(lineNumber: number, left: number, anchorAbove: boolean, placeholder: string, value?: string): void;
     private _updatePosition;
     /**
      * Hide the widget (removes from editor but does not dispose).
@@ -55,6 +60,10 @@ export declare class InlineChatSessionOverlayWidget extends Disposable {
     private readonly _logService;
     private readonly _domNode;
     private readonly _container;
+    private readonly _markdownContainer;
+    private readonly _markdownMessage;
+    private readonly _markdownScrollable;
+    private readonly _contentRow;
     private readonly _statusNode;
     private readonly _icon;
     private readonly _message;