@codingame/monaco-vscode-chat-service-override 26.2.2 → 27.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/chatStatusWidget.js

@@ -41,8 +41,7 @@ let ChatStatusWidget = class ChatStatusWidget extends Disposable {
     initializeIfEnabled() {
         const entitlement = this.chatEntitlementService.entitlement;
         const isAnonymous = this.chatEntitlementService.anonymous;
-        const enabledSku = this.configurationService.getValue("chat.statusWidget.sku");
-        if (isAnonymous && enabledSku === "anonymous") {
+        if (isAnonymous && this.configurationService.getValue("chat.statusWidget.anonymous")) {
             this.createWidgetContent("anonymous");
         } else if (entitlement === ChatEntitlement.Free) {
             this.createWidgetContent("free");
@@ -66,19 +65,19 @@ let ChatStatusWidget = class ChatStatusWidget extends Disposable {
         this.actionButton.element.classList.add("chat-status-button");
         if (enabledSku === "anonymous") {
             const message = ( localize(
-                6175,
-                "You've reached the limit for chat messages. Try Copilot Pro for free."
+                6725,
+                "You've reached the limit for chat messages. Sign in to use Copilot Free."
             ));
-            const buttonLabel = ( localize(6176, "Sign In"));
+            const buttonLabel = ( localize(6726, "Sign In"));
             this.messageElement.textContent = message;
             this.actionButton.label = buttonLabel;
-            this.actionButton.element.ariaLabel = ( localize(6177, "{0} {1}", message, buttonLabel));
+            this.actionButton.element.ariaLabel = ( localize(6727, "{0} {1}", message, buttonLabel));
         } else {
-            const message = ( localize(6178, "You've reached the limit for chat messages."));
-            const buttonLabel = ( localize(6179, "Upgrade"));
+            const message = ( localize(6728, "You've reached the limit for chat messages."));
+            const buttonLabel = ( localize(6729, "Upgrade"));
             this.messageElement.textContent = message;
             this.actionButton.label = buttonLabel;
-            this.actionButton.element.ariaLabel = ( localize(6180, "{0} {1}", message, buttonLabel));
+            this.actionButton.element.ariaLabel = ( localize(6730, "{0} {1}", message, buttonLabel));
         }
         this._register(this.actionButton.onDidClick(async () => {
             const commandId = this.chatEntitlementService.anonymous ? CHAT_SETUP_ACTION_ID : "workbench.action.chat.upgradePlan";

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.js

@@ -47,22 +47,30 @@ import { IChatAgentService, IChatAgentNameService } from '@codingame/monaco-vsco
 import { getAttachableImageExtension } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { ChatRequestAgentPart, chatSubcommandLeader, chatAgentLeader, ChatRequestAgentSubcommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, chatVariableLeader, ChatRequestToolPart, ChatRequestToolSetPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service';
-import { ChatAgentLocation, ChatModeKind, isSupportedChatFileScheme } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatModeKind, ChatAgentLocation, isSupportedChatFileScheme } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { isToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
+import { Target } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 import { ChatSubmitAction } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageUtils';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { getPromptFileType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 
 var BuiltinDynamicCompletions_1, ToolCompletions_1;
+const SlashCommandWord = /\/[\p{L}0-9_.:-]*/gu;
+const AgentOrSlashCommandWord = /(@|\/)[\p{L}0-9_.:-]*/gu;
 let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
     constructor(
         languageFeaturesService,
         chatWidgetService,
         chatSlashCommandService,
         promptsService,
+        chatService,
+        chatSessionsService,
         mcpService
     ) {
         super();
@@ -81,10 +89,16 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                 if (!widget || !widget.viewModel) {
                     return null;
                 }
+                let customAgentTarget = undefined;
                 if (widget.lockedAgentId) {
-                    return null;
+                    if (!widget.attachmentCapabilities.supportsPromptAttachments) {
+                        return null;
+                    }
+                    const sessionResource = widget.viewModel.model.sessionResource;
+                    const ctx = sessionResource && chatService.getChatSessionFromInternalUri(sessionResource);
+                    customAgentTarget = (ctx ? chatSessionsService.getCustomAgentTargetForSessionType(ctx.chatSessionType) : undefined) ?? Target.Undefined;
                 }
-                const range = computeCompletionRanges(model, position, /\/\w*/g);
+                const range = computeCompletionRanges(model, position, SlashCommandWord);
                 if (!range) {
                     return null;
                 }
@@ -101,7 +115,18 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                     return null;
                 }
                 return {
-                    suggestions: ( slashCommands.map((c, i) => {
+                    suggestions: ( slashCommands.filter(c => {
+                        if (!widget.lockedAgentId) {
+                            return true;
+                        }
+                        if (c.modes && c.modes.length && !c.modes.includes(ChatModeKind.Agent)) {
+                            return false;
+                        }
+                        if (c.target && customAgentTarget && c.target !== customAgentTarget) {
+                            return false;
+                        }
+                        return true;
+                    }).map((c, i) => {
                         const withSlash = `/${c.command}`;
                         return {
                             label: withSlash,
@@ -183,7 +208,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                 if (!widget || !widget.viewModel) {
                     return null;
                 }
-                const range = computeCompletionRanges(model, position, /\/\w*/g);
+                const range = computeCompletionRanges(model, position, SlashCommandWord);
                 if (!range) {
                     return null;
                 }
@@ -199,15 +224,28 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                 if (promptCommands.length === 0) {
                     return null;
                 }
-                if (widget.lockedAgentId) {
+                if (widget.lockedAgentId && !widget.attachmentCapabilities.supportsPromptAttachments) {
                     return null;
                 }
-                const userInvokableCommands = promptCommands.filter(c => c.parsedPromptFile?.header?.userInvokable !== false);
-                if (userInvokableCommands.length === 0) {
+                const userInvocableCommands = promptCommands.filter(c => {
+                    if (widget.lockedAgentId) {
+                        if (c.promptPath.extension) {
+                            return false;
+                        }
+                        try {
+                            const promptType = getPromptFileType(c.promptPath.uri);
+                            if (promptType && promptType === PromptsType.hook) {
+                                return false;
+                            }
+                        } catch {}
+                    }
+                    return true;
+                }).filter(c => c.parsedPromptFile?.header?.userInvocable !== false);
+                if (userInvocableCommands.length === 0) {
                     return null;
                 }
                 return {
-                    suggestions: ( userInvokableCommands.map((c, i) => {
+                    suggestions: ( userInvocableCommands.map((c, i) => {
                         const label = `/${c.name}`;
                         const description = c.description;
                         return {
@@ -236,7 +274,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                 if (!widget || !widget.viewModel) {
                     return null;
                 }
-                const range = computeCompletionRanges(model, position, /\/[a-z0-9_.-]*/g);
+                const range = computeCompletionRanges(model, position, /\/[\p{L}0-9_.-]*/gu);
                 if (!range) {
                     return null;
                 }
@@ -269,7 +307,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
         }));
     }
 };
-SlashCommandCompletions = ( __decorate([( __param(0, ILanguageFeaturesService)), ( __param(1, IChatWidgetService)), ( __param(2, IChatSlashCommandService)), ( __param(3, IPromptsService)), ( __param(4, IMcpService))], SlashCommandCompletions));
+SlashCommandCompletions = ( __decorate([( __param(0, ILanguageFeaturesService)), ( __param(1, IChatWidgetService)), ( __param(2, IChatSlashCommandService)), ( __param(3, IPromptsService)), ( __param(4, IChatService)), ( __param(5, IChatSessionsService)), ( __param(6, IMcpService))], SlashCommandCompletions));
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(SlashCommandCompletions, LifecyclePhase.Eventually);
 let AgentCompletions = class AgentCompletions extends Disposable {
     constructor(
@@ -293,7 +331,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                 if (!widget || !widget.viewModel) {
                     return;
                 }
-                const range = computeCompletionRanges(model, position, /\/\w*/g);
+                const range = computeCompletionRanges(model, position, SlashCommandWord);
                 if (!range) {
                     return;
                 }
@@ -334,7 +372,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                 if (widget.lockedAgentId) {
                     return null;
                 }
-                const range = computeCompletionRanges(model, position, /(@|\/)\w*/g);
+                const range = computeCompletionRanges(model, position, AgentOrSlashCommandWord);
                 if (!range) {
                     return null;
                 }
@@ -349,7 +387,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                     const dummyPrefix = agent.id === "github.copilot.terminalPanel" ? `0000` : ``;
                     return `${chatAgentLeader}${dummyPrefix}${agent.name}.${command}`;
                 };
-                const justAgents = ( agents.filter(a => !a.isDefault).map(agent => {
+                const justAgents = ( agents.filter(a => !a.isDefault).filter(a => !( chatSessionAgentIds.has(a.id))).map(agent => {
                     const {
                         label: agentLabel,
                         isDupe
@@ -435,7 +473,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                 if (widget.lockedAgentId) {
                     return null;
                 }
-                const range = computeCompletionRanges(model, position, /(@|\/)\w*/g);
+                const range = computeCompletionRanges(model, position, AgentOrSlashCommandWord);
                 if (!range) {
                     return null;
                 }
@@ -507,14 +545,14 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                 if (widget.lockedAgentId) {
                     return null;
                 }
-                const range = computeCompletionRanges(model, position, /(@|\/)\w*/g);
+                const range = computeCompletionRanges(model, position, AgentOrSlashCommandWord);
                 if (!range) {
                     return;
                 }
                 if (!isEmptyUpToCompletionWord(model, range)) {
                     return;
                 }
-                const label = ( localize(6186, "Install Chat Extensions..."));
+                const label = ( localize(6736, "Install Chat Extensions..."));
                 const item = {
                     label,
                     insertText: "",
@@ -557,7 +595,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
             };
         }
         for (const partAfterAgent of parsedRequest.slice(usedAgentIdx + 1)) {
-            if (!(partAfterAgent instanceof ChatRequestTextPart) || !partAfterAgent.text.trim().match(/^(\/\w*)?$/)) {
+            if (!(partAfterAgent instanceof ChatRequestTextPart) || !partAfterAgent.text.trim().match(/^(\/[\p{L}0-9_.:-]*)?$/u)) {
                 return;
             }
         }
@@ -662,7 +700,7 @@ class StartParameterizedPromptAction extends Action2 {
                 messages = await prompt.resolve(args, cts.token);
             } catch (e) {
                 if (!cts.token.isCancellationRequested) {
-                    notificationService.error(( localize(6187, "Error resolving prompt: {0}", String(e))));
+                    notificationService.error(( localize(6737, "Error resolving prompt: {0}", String(e))));
                 }
                 replaceTextWith("");
                 return;
@@ -690,15 +728,15 @@ class StartParameterizedPromptAction extends Action2 {
                             id: generateUuid(),
                             kind: "generic",
                             value: contents,
-                            name: ( localize(6188, "Prompt Resource"))
+                            name: ( localize(6738, "Prompt Resource"))
                         });
                     }
                 } else if (mimeType && getAttachableImageExtension(mimeType)) {
                     const resized = await resizeImage(contents).catch(() => decodeBase64(contents).buffer);
                     chatWidget.attachmentModel.addContext({
                         id: generateUuid(),
-                        name: ( localize(6189, "Prompt Image")),
-                        fullName: ( localize(6189, "Prompt Image")),
+                        name: ( localize(6739, "Prompt Image")),
+                        fullName: ( localize(6739, "Prompt Image")),
                         value: resized,
                         kind: "image",
                         references: validURI && [{
@@ -977,7 +1015,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             const uriLabel = this.labelService.getUriLabel(resource, {
                 relative: true
             });
-            const labelDescription = description ? ( localize(6190, "{0} ({1})", uriLabel, description)) : uriLabel;
+            const labelDescription = description ? ( localize(6740, "{0} ({1})", uriLabel, description)) : uriLabel;
             const sortText = boostPriority ? " " : "!";
             return {
                 label: {
@@ -1025,7 +1063,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 }
             }
             seen.add(resource);
-            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(6191, "Active file")) : undefined, i === 0));
+            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(6741, "Active file")) : undefined, i === 0));
             if (newLen - len >= 5) {
                 break;
             }
@@ -1258,7 +1296,7 @@ let ToolCompletions = class ToolCompletions extends Disposable {
                         name = item.referenceName;
                     } else {
                         const source = item.source;
-                        detail = ( localize(6192, "{0}: {1}", source.label, item.displayName));
+                        detail = ( localize(6742, "{0}: {1}", source.label, item.displayName));
                         name = item.toolReferenceName ?? item.displayName;
                         documentation = item.userDescription ?? item.modelDescription;
                     }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorContrib.js

@@ -28,7 +28,7 @@ import { ChatRequestTextPart, ChatRequestSlashPromptPart, ChatRequestAgentPart,
 import { ChatRequestParser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget';
-import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
+import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
 import { NativeEditContextRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/controller/editContext/native/nativeEditContextRegistry';
 import { TextAreaEditContextRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/controller/editContext/textArea/textAreaEditContextRegistry';
 import { ThrottledDelayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
@@ -400,13 +400,15 @@ let ChatTokenDeleter = class ChatTokenDeleter extends Disposable {
             }
             const change = e.changes[0];
             if (!change.text && this.widget.viewModel) {
+                const attachmentCapabilities = previousSelectedAgent?.capabilities ?? this.widget.attachmentCapabilities;
                 const previousParsedValue = parser.parseChatRequest(
                     this.widget.viewModel.sessionResource,
                     previousInputValue,
                     widget.location,
                     {
                         selectedAgent: previousSelectedAgent,
-                        mode: this.widget.input.currentModeKind
+                        mode: this.widget.input.currentModeKind,
+                        attachmentCapabilities
                     }
                 );
                 const deletableTokens = previousParsedValue.parts.filter(

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorHover.js

@@ -62,7 +62,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(6193, "There is a chat agent hover part here.");
+        return localize(6743, "There is a chat agent hover part here.");
     }
 };
 ChatAgentHoverParticipant = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IChatWidgetService)), ( __param(3, ICommandService))], ChatAgentHoverParticipant));

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/chatQuick.js

@@ -253,7 +253,7 @@ let QuickChat = class QuickChat extends Disposable {
             disclaimerElement.classList.toggle("hidden", !showDisclaimer);
             if (showDisclaimer) {
                 const renderedMarkdown = disposables.add(this.markdownRendererService.render(( new MarkdownString(( localize(
-                    6224,
+                    6763,
                     "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 ?? "",
@@ -362,7 +362,7 @@ let QuickChat = class QuickChat extends Disposable {
         this.widget.inputEditor.setValue("");
     }
     updateModel() {
-        this.modelRef ??= this.chatService.startSession(ChatAgentLocation.Chat, {
+        this.modelRef ??= this.chatService.startNewLocalSession(ChatAgentLocation.Chat, {
             disableBackgroundKeepAlive: true
         });
         const model = this.modelRef?.object;

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditor.d.ts

@@ -1,5 +1,7 @@
 import * as dom from "@codingame/monaco-vscode-api/vscode/vs/base/browser/dom";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { ITextResourceConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service";
 import { IScopedContextKeyService } 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 { IEditorOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor";
@@ -7,9 +9,12 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
-import { EditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorPane";
+import { AbstractEditorWithViewState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorWithViewState";
 import { IEditorOpenContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
+import { EditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput";
 import { IEditorGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService";
+import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
+import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IChatModelInputState, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
@@ -30,11 +35,14 @@ export interface IChatEditorOptions extends IEditorOptions {
         fallback?: string;
     };
 }
-export declare class ChatEditor extends EditorPane {
-    private readonly instantiationService;
+export interface IChatEditorViewState {
+    scrollTop: number;
+}
+export declare class ChatEditor extends AbstractEditorWithViewState<IChatEditorViewState> {
     private readonly chatSessionsService;
     private readonly contextKeyService;
     private readonly chatService;
+    private static readonly VIEW_STATE_KEY;
     private _widget;
     get widget(): ChatWidget;
     private _scopedContextKeyService;
@@ -42,7 +50,7 @@ export declare class ChatEditor extends EditorPane {
     private dimension;
     private _loadingContainer;
     private _editorContainer;
-    constructor(group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, instantiationService: IInstantiationService, storageService: IStorageService, chatSessionsService: IChatSessionsService, contextKeyService: IContextKeyService, chatService: IChatService);
+    constructor(group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, instantiationService: IInstantiationService, storageService: IStorageService, chatSessionsService: IChatSessionsService, contextKeyService: IContextKeyService, chatService: IChatService, textResourceConfigurationService: ITextResourceConfigurationService, editorService: IEditorService, editorGroupService: IEditorGroupsService);
     private clear;
     protected createEditor(parent: HTMLElement): void;
     protected setEditorVisible(visible: boolean): void;
@@ -52,5 +60,8 @@ export declare class ChatEditor extends EditorPane {
     private hideLoadingInChatWidget;
     setInput(input: ChatEditorInput, options: IChatEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void>;
     private updateModel;
+    protected computeEditorViewState(_resource: URI): IChatEditorViewState | undefined;
+    protected tracksEditorViewState(input: EditorInput): boolean;
+    protected toEditorViewStateResource(input: EditorInput): URI | undefined;
     layout(dimension: dom.Dimension, position?: dom.IDomPosition | undefined): void;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditor.js

@@ -6,6 +6,7 @@ import { raceCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/ba
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { ITextResourceConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service';
 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 { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
@@ -23,8 +24,10 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { EditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorPane';
+import { AbstractEditorWithViewState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorWithViewState';
 import { EDITOR_DRAG_AND_DROP_BACKGROUND } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/theme';
+import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
@@ -34,7 +37,14 @@ import { clearChatEditor } from '../../actions/chatClear.js';
 import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
 import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget';
 
-let ChatEditor = class ChatEditor extends EditorPane {
+var ChatEditor_1;
+let ChatEditor = class ChatEditor extends AbstractEditorWithViewState {
+    static {
+        ChatEditor_1 = this;
+    }
+    static {
+        this.VIEW_STATE_KEY = "chatEditorViewState";
+    }
     get widget() {
         return this._widget;
     }
@@ -49,16 +59,23 @@ let ChatEditor = class ChatEditor extends EditorPane {
         storageService,
         chatSessionsService,
         contextKeyService,
-        chatService
+        chatService,
+        textResourceConfigurationService,
+        editorService,
+        editorGroupService
     ) {
         super(
             ChatEditorInput.EditorID,
             group,
+            ChatEditor_1.VIEW_STATE_KEY,
             telemetryService,
+            instantiationService,
+            storageService,
+            textResourceConfigurationService,
             themeService,
-            storageService
+            editorService,
+            editorGroupService
         );
-        this.instantiationService = instantiationService;
         this.chatSessionsService = chatSessionsService;
         this.contextKeyService = contextKeyService;
         this.chatService = chatService;
@@ -117,7 +134,6 @@ let ChatEditor = class ChatEditor extends EditorPane {
         this.widget?.focusInput();
     }
     clearInput() {
-        this.saveState();
         this.widget.setModel(undefined);
         super.clearInput();
     }
@@ -158,7 +174,7 @@ let ChatEditor = class ChatEditor extends EditorPane {
         let isContributedChatSession = false;
         const chatSessionType = input.getSessionType();
         if (chatSessionType !== localChatSessionType) {
-            const loadingMessage = ( localize(6225, "Loading..."));
+            const loadingMessage = ( localize(6764, "Loading..."));
             this.showLoadingInChatWidget(loadingMessage);
         }
         await super.setInput(input, options, context, token);
@@ -199,6 +215,10 @@ let ChatEditor = class ChatEditor extends EditorPane {
                 editorModel.model.inputModel.setState(options.modelInputState);
             }
             this.updateModel(editorModel.model);
+            const viewState = this.loadEditorViewState(input, context);
+            if (viewState) {
+                this._widget.scrollTop = viewState.scrollTop;
+            }
             if (isContributedChatSession && options?.title?.preferred && input.sessionResource) {
                 this.chatService.setChatSessionTitle(input.sessionResource, options.title.preferred);
             }
@@ -210,6 +230,20 @@ let ChatEditor = class ChatEditor extends EditorPane {
     updateModel(model) {
         this.widget.setModel(model);
     }
+    computeEditorViewState(_resource) {
+        if (!this._widget) {
+            return undefined;
+        }
+        return {
+            scrollTop: this._widget.scrollTop
+        };
+    }
+    tracksEditorViewState(input) {
+        return input instanceof ChatEditorInput;
+    }
+    toEditorViewStateResource(input) {
+        return input.sessionResource;
+    }
     layout(dimension, position) {
         this.dimension = dimension;
         if (this.widget) {
@@ -217,6 +251,6 @@ let ChatEditor = class ChatEditor extends EditorPane {
         }
     }
 };
-ChatEditor = ( __decorate([( __param(1, ITelemetryService)), ( __param(2, IThemeService)), ( __param(3, IInstantiationService)), ( __param(4, IStorageService)), ( __param(5, IChatSessionsService)), ( __param(6, IContextKeyService)), ( __param(7, IChatService))], ChatEditor));
+ChatEditor = ChatEditor_1 = ( __decorate([( __param(1, ITelemetryService)), ( __param(2, IThemeService)), ( __param(3, IInstantiationService)), ( __param(4, IStorageService)), ( __param(5, IChatSessionsService)), ( __param(6, IContextKeyService)), ( __param(7, IChatService)), ( __param(8, ITextResourceConfigurationService)), ( __param(9, IEditorService)), ( __param(10, IEditorGroupsService))], ChatEditor));
 
 export { ChatEditor };

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.d.ts

@@ -7,6 +7,7 @@ import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/h
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 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 { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
@@ -29,11 +30,14 @@ import { IActivityService } from "@codingame/monaco-vscode-api/vscode/vs/workben
 import { IAgentSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service";
 import { IAgentSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
+import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
+import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
 export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
     private readonly storageService;
     private readonly chatService;
     private readonly chatAgentService;
     private readonly logService;
+    private readonly notificationService;
     private readonly layoutService;
     private readonly chatSessionsService;
     private readonly telemetryService;
@@ -42,6 +46,8 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private readonly chatEntitlementService;
     private readonly commandService;
     private readonly activityService;
+    private readonly workbenchEnvironmentService;
+    private readonly hostService;
     private readonly memento;
     private readonly viewState;
     private viewPaneContainer;
@@ -52,7 +58,7 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private restoringSession;
     private readonly modelRef;
     private readonly activityBadge;
-    constructor(options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService, storageService: IStorageService, chatService: IChatService, chatAgentService: IChatAgentService, logService: ILogService, layoutService: IWorkbenchLayoutService, chatSessionsService: IChatSessionsService, telemetryService: ITelemetryService, lifecycleService: ILifecycleService, progressService: IProgressService, agentSessionsService: IAgentSessionsService, chatEntitlementService: IChatEntitlementService, commandService: ICommandService, activityService: IActivityService);
+    constructor(options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService, storageService: IStorageService, chatService: IChatService, chatAgentService: IChatAgentService, logService: ILogService, notificationService: INotificationService, layoutService: IWorkbenchLayoutService, chatSessionsService: IChatSessionsService, telemetryService: ITelemetryService, lifecycleService: ILifecycleService, progressService: IProgressService, agentSessionsService: IAgentSessionsService, chatEntitlementService: IChatEntitlementService, commandService: ICommandService, activityService: IActivityService, workbenchEnvironmentService: IWorkbenchEnvironmentService, hostService: IHostService);
     private updateContextKeys;
     private getViewPositionAndLocation;
     private getSessionHoverPosition;
@@ -97,6 +103,7 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private registerControlsListeners;
     private setupContextMenu;
     private applyModel;
+    private _applyModel;
     private showModel;
     private updateWidgetLockState;
     private clear;