@codingame/monaco-vscode-chat-service-override 5.3.0 → 6.0.1

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.js

@@ -1,18 +1,19 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import marked_1 from 'vscode/external/vscode-marked/lib/marked.esm.js';
 import { IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
-import { registerAction2, Action2, MenuId, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ResourceNotebookCellEdit } from 'vscode/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { CONTEXT_RESPONSE_VOTE, CONTEXT_RESPONSE, CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_RESPONSE_FILTERED, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT, CONTEXT_REQUEST, CONTEXT_CHAT_LOCATION, CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { InteractiveSessionVoteDirection } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
+import { CONTEXT_RESPONSE_VOTE, CONTEXT_RESPONSE, CONTEXT_CHAT_RESPONSE_SUPPORT_ISSUE_REPORTING, CONTEXT_RESPONSE_FILTERED, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT, CONTEXT_REQUEST } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatAgentVoteDirection } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { isResponseVM, isRequestVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
-import { NOTEBOOK_EDITOR_ID, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { NOTEBOOK_EDITOR_ID, CellEditType, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { NOTEBOOK_IS_ACTIVE_EDITOR } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
@@ -48,10 +49,10 @@ function registerChatTitleActions() {
                 result: item.result,
                 action: {
                     kind: 'vote',
-                    direction: InteractiveSessionVoteDirection.Up,
+                    direction: ChatAgentVoteDirection.Up,
                 }
             });
-            item.setVote(InteractiveSessionVoteDirection.Up);
+            item.setVote(ChatAgentVoteDirection.Up);
         }
     });
     registerAction2(class MarkUnhelpfulAction extends Action2 {
@@ -84,10 +85,10 @@ function registerChatTitleActions() {
                 result: item.result,
                 action: {
                     kind: 'vote',
-                    direction: InteractiveSessionVoteDirection.Down,
+                    direction: ChatAgentVoteDirection.Down,
                 }
             });
-            item.setVote(InteractiveSessionVoteDirection.Down);
+            item.setVote(ChatAgentVoteDirection.Down);
         }
     });
     registerAction2(class ReportIssueForBugAction extends Action2 {
@@ -164,7 +165,7 @@ function registerChatTitleActions() {
                 const bulkEditService = accessor.get(IBulkEditService);
                 await bulkEditService.apply([
                     ( (new ResourceNotebookCellEdit(notebookEditor.textModel.uri, {
-                        editType: 1 ,
+                        editType: CellEditType.Replace,
                         index: index,
                         count: 0,
                         cells: ( (splitContents.map(content => {
@@ -194,12 +195,12 @@ function registerChatTitleActions() {
                 category: CHAT_CATEGORY,
                 icon: Codicon.x,
                 keybinding: {
-                    primary: 20 ,
+                    primary: KeyCode.Delete,
                     mac: {
-                        primary: 2048  | 1 ,
+                        primary: KeyMod.CtrlCmd | KeyCode.Backspace,
                     },
                     when: ( (ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION,  (CONTEXT_IN_CHAT_INPUT.negate())))),
-                    weight: 200 ,
+                    weight: KeybindingWeight.WorkbenchContrib,
                 },
                 menu: {
                     id: MenuId.ChatMessageTitle,
@@ -224,85 +225,6 @@ function registerChatTitleActions() {
             }
         }
     });
-    const rerunMenu = MenuId.for('ChatMessageTitle#Rerun');
-    MenuRegistry.appendMenuItem(MenuId.ChatMessageTitle, {
-        submenu: rerunMenu,
-        title: ( localizeWithPath(_moduleId, 5, "Rerun...")),
-        icon: Codicon.refresh,
-        group: 'navigation',
-        order: -10,
-        when: ( (ContextKeyExpr.and(
-            CONTEXT_RESPONSE,
-             (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor))
-        )))
-    });
-    registerAction2(class RerunAction extends Action2 {
-        constructor() {
-            super({
-                id: 'workbench.action.chat.rerun',
-                title: ( localize2WithPath(_moduleId, 6, "Rerun Request")),
-                f1: false,
-                category: CHAT_CATEGORY,
-                icon: Codicon.refresh,
-                precondition: ( (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor))),
-                menu: {
-                    id: rerunMenu,
-                    group: 'navigation',
-                    order: -1,
-                }
-            });
-        }
-        async run(accessor, ...args) {
-            const chatWidgetService = accessor.get(IChatWidgetService);
-            const chatService = accessor.get(IChatService);
-            const widget = chatWidgetService.lastFocusedWidget;
-            let item = args[0];
-            if (!isResponseVM(item)) {
-                item = widget?.getFocus();
-            }
-            if (!isResponseVM(item) || !widget) {
-                return;
-            }
-            const request = chatService.getSession(item.sessionId)?.getRequests().find(candidate => candidate.id === item.requestId);
-            if (request) {
-                await chatService.resendRequest(request, { noCommandDetection: false, attempt: request.attempt + 1, location: widget.location, implicitVariablesEnabled: true });
-            }
-        }
-    });
-    registerAction2(class RerunWithoutCommandDetectionAction extends Action2 {
-        constructor() {
-            super({
-                id: 'workbench.action.chat.rerunWithoutCommandDetection',
-                title: ( localize2WithPath(_moduleId, 7, "Rerun without Command Detection")),
-                f1: false,
-                category: CHAT_CATEGORY,
-                icon: Codicon.refresh,
-                precondition: ( (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Editor))),
-                menu: {
-                    when: CONTEXT_RESPONSE_DETECTED_AGENT_COMMAND,
-                    id: rerunMenu,
-                    group: 'navigation',
-                    order: -1,
-                }
-            });
-        }
-        async run(accessor, ...args) {
-            const chatWidgetService = accessor.get(IChatWidgetService);
-            const chatService = accessor.get(IChatService);
-            const widget = chatWidgetService.lastFocusedWidget;
-            let item = args[0];
-            if (!isResponseVM(item)) {
-                item = widget?.getFocus();
-            }
-            if (!isResponseVM(item) || !widget) {
-                return;
-            }
-            const request = chatService.getSession(item.sessionId)?.getRequests().find(candidate => candidate.id === item.requestId);
-            if (request) {
-                await chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt, location: widget.location, implicitVariablesEnabled: true });
-            }
-        }
-    });
 }
 function splitMarkdownAndCodeBlocks(markdown) {
     const lexer = new marked_1.Lexer();

package/vscode/src/vs/workbench/contrib/chat/browser/chat.contribution.js

@@ -3,19 +3,18 @@ import { isMarkdownString, MarkdownString } from 'vscode/vscode/vs/base/common/h
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
-import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { AccessibleViewRegistry } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
-import { Extensions as Extensions$1, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions as Extensions$1, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
-import { IAccessibleViewService } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleView.service';
-import { AccessibleViewAction } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleViewActions';
-import { alertFocusChange } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleViewContributions';
+import { ChatAccessibilityHelp } from './actions/chatAccessibilityHelp.js';
 import { registerChatActions } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ACTION_ID_NEW_CHAT, registerNewChatActions } from './actions/chatClearActions.js';
 import { registerChatCodeBlockActions, registerChatCodeCompareBlockActions } from './actions/chatCodeblockActions.js';
@@ -26,33 +25,34 @@ import { registerChatExportActions } from './actions/chatImportExport.js';
 import { registerMoveActions } from './actions/chatMoveActions.js';
 import { registerQuickChatActions } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions';
 import { registerChatTitleActions } from './actions/chatTitleActions.js';
-import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import './chatAccessibilityService.js';
 import { ChatEditor } from './chatEditor.js';
 import { ChatEditorInput, ChatEditorInputSerializer } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { agentToMarkdown, agentSlashCommandToMarkdown } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer';
+import { ChatExtensionPointHandler } from './chatParticipantContributions.js';
 import './chatQuick.js';
+import { ChatResponseAccessibleView } from './chatResponseAccessibleView.js';
 import './chatVariables.js';
 import 'vscode/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import './contrib/chatHistoryVariables.js';
 import './contrib/chatInputEditorContrib.js';
+import './contrib/chatContextAttachments.js';
+import './contrib/chatInputCompletions.js';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { CONTEXT_IN_CHAT_SESSION } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ChatWelcomeMessageModel } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { chatVariableLeader } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import '../common/chatServiceImpl.js';
 import '../common/chatSlashCommands.js';
 import { IChatSlashCommandService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
 import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
-import { isResponseVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 import '../common/chatWidgetHistoryService.js';
-import 'vscode/vscode/vs/base/common/event';
+import 'vscode/vscode/vs/workbench/contrib/chat/common/languageModels';
 import '../common/languageModelStats.js';
-import '../common/voiceChat.js';
+import '../common/voiceChatService.js';
 import { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import 'vscode/vscode/vs/workbench/contrib/chat/common/chatColors';
-import { ChatExtensionPointHandler } from './chatParticipantContributions.js';
+import { registerChatContextActions } from './actions/chatContextActions.js';
 
 const _moduleId = "vs/workbench/contrib/chat/browser/chat.contribution";
 const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
@@ -98,6 +98,7 @@ configurationRegistry.registerConfiguration({
                 6,
                 "Controls whether a checkbox is shown to allow the user to determine which implicit context is included with a chat participant's prompt."
             )),
+            deprecated: true,
             default: false
         },
     }
@@ -127,87 +128,10 @@ ChatResolverContribution = ( (__decorate([
     ( (__param(0, IEditorResolverService))),
     ( (__param(1, IInstantiationService)))
 ], ChatResolverContribution)));
-class ChatAccessibleViewContribution extends Disposable {
-    constructor() {
-        super();
-        this._register(AccessibleViewAction.addImplementation(100, 'panelChat', accessor => {
-            const accessibleViewService = accessor.get(IAccessibleViewService);
-            const widgetService = accessor.get(IChatWidgetService);
-            const codeEditorService = accessor.get(ICodeEditorService);
-            return renderAccessibleView(accessibleViewService, widgetService, codeEditorService, true);
-            function renderAccessibleView(accessibleViewService, widgetService, codeEditorService, initialRender) {
-                const widget = widgetService.lastFocusedWidget;
-                if (!widget) {
-                    return false;
-                }
-                const chatInputFocused = initialRender && !!codeEditorService.getFocusedCodeEditor();
-                if (initialRender && chatInputFocused) {
-                    widget.focusLastMessage();
-                }
-                if (!widget) {
-                    return false;
-                }
-                const verifiedWidget = widget;
-                const focusedItem = verifiedWidget.getFocus();
-                if (!focusedItem) {
-                    return false;
-                }
-                widget.focus(focusedItem);
-                const isWelcome = focusedItem instanceof ChatWelcomeMessageModel;
-                let responseContent = isResponseVM(focusedItem) ? focusedItem.response.asString() : undefined;
-                if (isWelcome) {
-                    const welcomeReplyContents = [];
-                    for (const content of focusedItem.content) {
-                        if (Array.isArray(content)) {
-                            welcomeReplyContents.push(...( (content.map(m => m.message))));
-                        }
-                        else {
-                            welcomeReplyContents.push(content.value);
-                        }
-                    }
-                    responseContent = welcomeReplyContents.join('\n');
-                }
-                if (!responseContent && 'errorDetails' in focusedItem && focusedItem.errorDetails) {
-                    responseContent = focusedItem.errorDetails.message;
-                }
-                if (!responseContent) {
-                    return false;
-                }
-                const responses = verifiedWidget.viewModel?.getItems().filter(i => isResponseVM(i));
-                const length = responses?.length;
-                const responseIndex = responses?.findIndex(i => i === focusedItem);
-                accessibleViewService.show({
-                    id: "panelChat" ,
-                    verbositySettingKey: "accessibility.verbosity.panelChat" ,
-                    provideContent() { return responseContent; },
-                    onClose() {
-                        verifiedWidget.reveal(focusedItem);
-                        if (chatInputFocused) {
-                            verifiedWidget.focusInput();
-                        }
-                        else {
-                            verifiedWidget.focus(focusedItem);
-                        }
-                    },
-                    next() {
-                        verifiedWidget.moveFocus(focusedItem, 'next');
-                        alertFocusChange(responseIndex, length, 'next');
-                        renderAccessibleView(accessibleViewService, widgetService, codeEditorService);
-                    },
-                    previous() {
-                        verifiedWidget.moveFocus(focusedItem, 'previous');
-                        alertFocusChange(responseIndex, length, 'previous');
-                        renderAccessibleView(accessibleViewService, widgetService, codeEditorService);
-                    },
-                    options: { type: "view"  }
-                });
-                return true;
-            }
-        }, CONTEXT_IN_CHAT_SESSION));
-    }
-}
+AccessibleViewRegistry.register(( (new ChatResponseAccessibleView())));
+AccessibleViewRegistry.register(( (new ChatAccessibilityHelp())));
 let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommandsContribution extends Disposable {
-    constructor(slashCommandService, commandService, chatAgentService, chatVariablesService) {
+    constructor(slashCommandService, commandService, chatAgentService, chatVariablesService, instantiationService) {
         super();
         this._store.add(slashCommandService.registerSlashCommand({
             command: 'clear',
@@ -238,16 +162,12 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
                 .filter(a => a.id !== defaultAgent?.id)
                 .filter(a => a.locations.includes(ChatAgentLocation.Panel))
                 .map(async (a) => {
-                const agentWithLeader = `${chatAgentLeader}${a.name}`;
-                const actionArg = { inputValue: `${agentWithLeader} ${a.metadata.sampleRequest}` };
-                const urlSafeArg = encodeURIComponent(JSON.stringify(actionArg));
                 const description = a.description ? `- ${a.description}` : '';
-                const agentLine = `* [\`${agentWithLeader}\`](command:${SubmitAction.ID}?${urlSafeArg}) ${description}`;
+                const agentMarkdown = instantiationService.invokeFunction(accessor => agentToMarkdown(a, true, accessor));
+                const agentLine = `- ${agentMarkdown} ${description}`;
                 const commandText = ( (a.slashCommands.map(c => {
-                    const actionArg = { inputValue: `${agentWithLeader} ${chatSubcommandLeader}${c.name} ${c.sampleRequest ?? ''}` };
-                    const urlSafeArg = encodeURIComponent(JSON.stringify(actionArg));
                     const description = c.description ? `- ${c.description}` : '';
-                    return `\t* [\`${chatSubcommandLeader}${c.name}\`](command:${SubmitAction.ID}?${urlSafeArg}) ${description}`;
+                    return `\t* ${agentSlashCommandToMarkdown(a, c)} ${description}`;
                 }))).join('\n');
                 return (agentLine + '\n' + commandText).trim();
             }))))).join('\n');
@@ -285,14 +205,14 @@ ChatSlashStaticSlashCommandsContribution = ( (__decorate([
     ( (__param(0, IChatSlashCommandService))),
     ( (__param(1, ICommandService))),
     ( (__param(2, IChatAgentService))),
-    ( (__param(3, IChatVariablesService)))
+    ( (__param(3, IChatVariablesService))),
+    ( (__param(4, IInstantiationService)))
 ], ChatSlashStaticSlashCommandsContribution)));
 const workbenchContributionsRegistry = ( (Registry.as(Extensions$1.Workbench)));
-registerWorkbenchContribution2(ChatResolverContribution.ID, ChatResolverContribution, 1 );
-workbenchContributionsRegistry.registerWorkbenchContribution(ChatAccessibleViewContribution, 4 );
-workbenchContributionsRegistry.registerWorkbenchContribution(ChatSlashStaticSlashCommandsContribution, 4 );
+registerWorkbenchContribution2(ChatResolverContribution.ID, ChatResolverContribution, WorkbenchPhase.BlockStartup);
+workbenchContributionsRegistry.registerWorkbenchContribution(ChatSlashStaticSlashCommandsContribution, LifecyclePhase.Eventually);
 ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(ChatEditorInput.TypeID, ChatEditorInputSerializer);
-registerWorkbenchContribution2(ChatExtensionPointHandler.ID, ChatExtensionPointHandler, 1 );
+registerWorkbenchContribution2(ChatExtensionPointHandler.ID, ChatExtensionPointHandler, WorkbenchPhase.BlockStartup);
 registerChatActions();
 registerChatCopyActions();
 registerChatCodeBlockActions();
@@ -304,3 +224,4 @@ registerQuickChatActions();
 registerChatExportActions();
 registerMoveActions();
 registerNewChatActions();
+registerChatContextActions();

package/vscode/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.js

@@ -5,6 +5,8 @@ import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySign
 import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { AccessibilityProgressSignalScheduler } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler';
+import { renderStringAsPlaintext } from 'vscode/vscode/vs/base/browser/markdownRenderer';
+import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 
 const CHAT_RESPONSE_PENDING_ALLOWANCE_MS = 4000;
 let ChatAccessibilityService = class ChatAccessibilityService extends Disposable {
@@ -26,11 +28,12 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
         const isPanelChat = typeof response !== 'string';
         const responseContent = typeof response === 'string' ? response : response?.response.asString();
         this._accessibilitySignalService.playSignal(AccessibilitySignal.chatResponseReceived, { allowManyInParallel: true });
-        if (!response) {
+        if (!response || !responseContent) {
             return;
         }
         const errorDetails = isPanelChat && response.errorDetails ? ` ${response.errorDetails.message}` : '';
-        status(responseContent + errorDetails);
+        const plainTextResponse = renderStringAsPlaintext(( new MarkdownString(responseContent)));
+        status(plainTextResponse + errorDetails);
     }
 };
 ChatAccessibilityService = ( __decorate([

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

@@ -2,6 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import 'vscode/vscode/vs/platform/theme/common/colorUtils';
@@ -50,6 +51,10 @@ let ChatEditor = class ChatEditor extends EditorPane {
         this.widget.render(parent);
         this.widget.setVisible(true);
     }
+    setEditorVisible(visible) {
+        super.setEditorVisible(visible);
+        this.widget?.setVisible(visible);
+    }
     focus() {
         super.focus();
         this.widget?.focusInput();
@@ -71,7 +76,7 @@ let ChatEditor = class ChatEditor extends EditorPane {
     }
     updateModel(model, viewState) {
         this._memento = ( new Memento('interactive-session-editor-' + CHAT_PROVIDER_ID, this.storageService));
-        this._viewState = viewState ?? this._memento.getMemento(1 , 1 );
+        this._viewState = viewState ?? this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
         this.widget.setModel(model, { ...this._viewState });
     }
     saveState() {