@codingame/monaco-vscode-chat-service-override 9.0.3 → 10.0.1

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { isAncestorOfActiveElement, $ } from 'vscode/vscode/vs/base/browser/dom';
-import { Sash, Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
+import { Sash } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
 import { disposableTimeout } from 'vscode/vscode/vs/base/common/async';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
@@ -27,6 +27,7 @@ import { ChatWidget } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
+import { EDITOR_DRAG_AND_DROP_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
 
 var QuickChat_1;
 let QuickChatService = class QuickChatService extends Disposable {
@@ -181,6 +182,7 @@ let QuickChat = class QuickChat extends Disposable {
         this.widget = this._register(scopedInstantiationService.createInstance(ChatWidget, ChatAgentLocation.Panel, { isQuickChat: true }, { renderInputOnTop: true, renderStyle: 'compact', menus: { inputSideToolbar: MenuId.ChatInputSide } }, {
             listForeground: quickInputForeground,
             listBackground: quickInputBackground,
+            overlayBackground: EDITOR_DRAG_AND_DROP_BACKGROUND,
             inputEditorBackground: inputBackground,
             resultEditorBackground: editorBackground
         }));
@@ -191,7 +193,7 @@ let QuickChat = class QuickChat extends Disposable {
         this.sash = this._register(( new Sash(
             parent,
             { getHorizontalSashTop: () => parent.offsetHeight },
-            { orientation: Orientation.HORIZONTAL }
+            { orientation: 1  }
         )));
         this.registerListeners(parent);
     }

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

@@ -1,18 +1,15 @@
 import { renderMarkdownAsPlaintext } from 'vscode/vscode/vs/base/browser/markdownRenderer';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
-import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
-import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 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 { isResponseVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
 class ChatResponseAccessibleView {
     constructor() {
         this.priority = 100;
         this.name = 'panelChat';
-        this.type = AccessibleViewType.View;
+        this.type = "view" ;
         this.when = CONTEXT_IN_CHAT_SESSION;
     }
     getProvider(accessor) {
@@ -38,29 +35,16 @@ class ChatResponseAccessibleProvider extends Disposable {
         super();
         this._widget = _widget;
         this._chatInputFocused = _chatInputFocused;
-        this.id = AccessibleViewProviderId.Chat;
-        this.verbositySettingKey = AccessibilityVerbositySettingId.Chat;
-        this.options = { type: AccessibleViewType.View };
+        this.id = "panelChat" ;
+        this.verbositySettingKey = "accessibility.verbosity.panelChat" ;
+        this.options = { type: "view"  };
         this._focusedItem = item;
     }
     provideContent() {
         return this._getContent(this._focusedItem);
     }
     _getContent(item) {
-        const isWelcome = item instanceof ChatWelcomeMessageModel;
         let responseContent = isResponseVM(item) ? ( item.response.toString()) : '';
-        if (isWelcome) {
-            const welcomeReplyContents = [];
-            for (const content of item.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 item && item.errorDetails) {
             responseContent = item.errorDetails.message;
         }

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

@@ -1,25 +1,23 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { basename } from 'vscode/vscode/vs/base/common/path';
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { onUnexpectedExternalError } from 'vscode/vscode/vs/base/common/errors';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { basename } from 'vscode/vscode/vs/base/common/path';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
+import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
+import { ChatRequestVariablePart, ChatRequestDynamicVariablePart, ChatRequestToolPart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { showChatView } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { ChatContextAttachments } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatContextAttachments';
 import { ChatDynamicVariableModel } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
-import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { ChatRequestVariablePart, ChatRequestDynamicVariablePart, ChatRequestToolPart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatContextAttachments } from './contrib/chatContextAttachments.js';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
-import { ILanguageModelToolsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
-import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 
 let ChatVariablesService = class ChatVariablesService {
-    constructor(chatWidgetService, viewsService, toolsService) {
+    constructor(chatWidgetService, viewsService) {
         this.chatWidgetService = chatWidgetService;
         this.viewsService = viewsService;
-        this.toolsService = toolsService;
         this._resolver = ( new Map());
     }
     async resolveVariables(prompt, attachedContextVariables, model, progress, token) {
@@ -46,13 +44,10 @@ let ChatVariablesService = class ChatVariablesService {
                 }
             }
             else if (part instanceof ChatRequestDynamicVariablePart) {
-                resolvedVariables[i] = { id: part.id, name: part.referenceText, range: part.range, value: part.data, };
+                resolvedVariables[i] = { id: part.id, name: part.referenceText, range: part.range, value: part.data, fullName: part.fullName, icon: part.icon };
             }
             else if (part instanceof ChatRequestToolPart) {
-                const tool = this.toolsService.getTool(part.toolId);
-                if (tool) {
-                    resolvedVariables[i] = { id: part.toolId, name: part.toolName, range: part.range, value: undefined, isTool: true, icon: ThemeIcon.isThemeIcon(tool.icon) ? tool.icon : undefined, fullName: tool.displayName };
-                }
+                resolvedVariables[i] = { id: part.toolId, name: part.toolName, range: part.range, value: undefined, isTool: true, icon: ThemeIcon.isThemeIcon(part.icon) ? part.icon : undefined, fullName: part.displayName };
             }
         });
         const resolvedAttachedContext = [];
@@ -130,7 +125,7 @@ let ChatVariablesService = class ChatVariablesService {
         if (location !== ChatAgentLocation.Panel) {
             return;
         }
-        const widget = await showChatView(this.viewsService);
+        const widget = this.chatWidgetService.lastFocusedWidget ?? (await showChatView(this.viewsService));
         if (!widget || !widget.viewModel) {
             return;
         }
@@ -150,8 +145,7 @@ let ChatVariablesService = class ChatVariablesService {
 };
 ChatVariablesService = ( __decorate([
     ( __param(0, IChatWidgetService)),
-    ( __param(1, IViewsService)),
-    ( __param(2, ILanguageModelToolsService))
+    ( __param(1, IViewsService))
 ], ChatVariablesService));
 
 export { ChatVariablesService };

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

@@ -10,7 +10,6 @@ import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/commo
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
-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';
@@ -29,12 +28,12 @@ import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPan
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { SIDE_BAR_FOREGROUND } from 'vscode/vscode/vs/workbench/common/theme';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
-import { ChatWidget } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { CHAT_PROVIDER_ID } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
 import { ChatModelInitState } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { CHAT_PROVIDER_ID } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { ChatWidget } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 
 const CHAT_SIDEBAR_PANEL_ID = 'workbench.panel.chatSidebar';
 let ChatViewPane = class ChatViewPane extends ViewPane {
@@ -48,13 +47,16 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.modelDisposables = this._register(( new DisposableStore()));
         this.didProviderRegistrationFail = false;
         this.didUnregisterProvider = false;
+        this.isInitialized = false;
         this.memento = ( new Memento('interactive-session-view-' + CHAT_PROVIDER_ID, this.storageService));
-        this.viewState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        this.viewState = this.memento.getMemento(1 , 1 );
         this._register(this.chatAgentService.onDidChangeAgents(() => {
+            this.isInitialized = true;
             if (this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel)) {
                 if (!this._widget?.viewModel) {
                     const sessionId = this.getSessionId();
                     const model = sessionId ? this.chatService.getOrRestoreSession(sessionId) : undefined;
+                    const wasVisible = this._widget.visible;
                     try {
                         this._widget.setVisible(false);
                         this.updateModel(model);
@@ -63,7 +65,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                         this._onDidChangeViewWelcomeState.fire();
                     }
                     finally {
-                        this.widget.setVisible(true);
+                        this.widget.setVisible(wasVisible);
                     }
                 }
             }
@@ -78,7 +80,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             chatView: this
         };
     }
-    updateModel(model) {
+    updateModel(model, viewState) {
         this.modelDisposables.clear();
         model = model ?? (this.chatService.transferredSessionData?.sessionId
             ? this.chatService.getOrRestoreSession(this.chatService.transferredSessionData.sessionId)
@@ -86,15 +88,18 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         if (!model) {
             throw ( new Error('Could not start chat session'));
         }
-        this._widget.setModel(model, { ...this.viewState });
+        if (viewState) {
+            this.updateViewState(viewState);
+        }
         this.viewState.sessionId = model.sessionId;
+        this._widget.setModel(model, { ...this.viewState });
     }
     shouldShowWelcome() {
         if (!this.chatAgentService.getContributedDefaultAgent(ChatAgentLocation.Panel)) {
             return true;
         }
         const noPersistedSessions = !this.chatService.hasSessions();
-        return this.didUnregisterProvider || !this._widget?.viewModel && (noPersistedSessions || this.didProviderRegistrationFail);
+        return this.didUnregisterProvider || !this._widget?.viewModel && (noPersistedSessions || this.didProviderRegistrationFail) || !this.isInitialized;
     }
     getSessionId() {
         let sessionId;
@@ -115,6 +120,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             this._widget = this._register(scopedInstantiationService.createInstance(ChatWidget, ChatAgentLocation.Panel, { viewId: this.id }, { supportsFileReferences: true }, {
                 listForeground: SIDE_BAR_FOREGROUND,
                 listBackground: locationBasedColors.background,
+                overlayBackground: locationBasedColors.overlayBackground,
                 inputEditorBackground: locationBasedColors.background,
                 resultEditorBackground: editorBackground
             }));
@@ -149,12 +155,12 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.updateViewState();
         this.updateModel(undefined);
     }
-    loadSession(sessionId) {
+    loadSession(sessionId, viewState) {
         if (this.widget.viewModel) {
             this.chatService.clearSession(this.widget.viewModel.sessionId);
         }
         const newModel = this.chatService.getOrRestoreSession(sessionId);
-        this.updateModel(newModel);
+        this.updateModel(newModel, viewState);
     }
     focusInput() {
         this._widget.focusInput();
@@ -175,10 +181,11 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         }
         super.saveState();
     }
-    updateViewState() {
-        const widgetViewState = this._widget.getViewState();
-        this.viewState.inputValue = widgetViewState.inputValue;
-        this.viewState.inputState = widgetViewState.inputState;
+    updateViewState(viewState) {
+        const newViewState = viewState ?? this._widget.getViewState();
+        this.viewState.inputValue = newViewState.inputValue;
+        this.viewState.inputState = newViewState.inputState;
+        this.viewState.selectedLanguageModelId = newViewState.selectedLanguageModelId;
     }
 };
 ChatViewPane = ( __decorate([

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
-import { RenderedHoverParts, HoverAnchorType, HoverParticipantRegistry } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverTypes';
+import { RenderedHoverParts, HoverParticipantRegistry } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverTypes';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
@@ -61,7 +61,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         );
     }
     getAccessibleContent(hoverPart) {
-        return ( localize(7162, 'There is a chat agent hover part here.'));
+        return ( localize(7381, 'There is a chat agent hover part here.'));
     }
 };
 ChatAgentHoverParticipant = ( (__decorate([
@@ -76,7 +76,7 @@ class ChatAgentHoverPart {
         this.agent = agent;
     }
     isValidForHoverAnchor(anchor) {
-        return (anchor.type === HoverAnchorType.Range
+        return (anchor.type === 1
             && this.range.startColumn <= anchor.range.startColumn
             && this.range.endColumn >= anchor.range.endColumn);
     }

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

@@ -1,7 +1,13 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/editorHoverWrapper.css.js';
 import { $ as $$1, h as h$1 } from 'vscode/vscode/vs/base/browser/dom';
-import 'vscode/vscode/vs/base/browser/ui/hover/hoverWidget';
+import 'vscode/vscode/vs/base/browser/browser';
+import 'vscode/vscode/vs/base/common/keyCodes';
+import 'vscode/vscode/vs/base/common/platform';
+import 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
+import 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/base/browser/ui/hover/hoverWidget.css';
+import 'vscode/vscode/vs/nls';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 
 const $ = $$1;

package/vscode/src/vs/workbench/contrib/chat/common/chatCodeMapperService.js

@@ -0,0 +1,27 @@
+class CodeMapperService {
+    constructor() {
+        this.providers = [];
+    }
+    registerCodeMapperProvider(handle, provider) {
+        this.providers.push(provider);
+        return {
+            dispose: () => {
+                const index = this.providers.indexOf(provider);
+                if (index >= 0) {
+                    this.providers.splice(index, 1);
+                }
+            }
+        };
+    }
+    async mapCode(request, response, token) {
+        for (const provider of this.providers) {
+            const result = await provider.mapCode(request, response, token);
+            if (result) {
+                return result;
+            }
+        }
+        return undefined;
+    }
+}
+
+export { CodeMapperService };

package/vscode/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.js

@@ -0,0 +1,52 @@
+import { DeferredPromise } from 'vscode/vscode/vs/base/common/async';
+
+class ChatToolInvocation {
+    get isComplete() {
+        return this._isComplete;
+    }
+    get isCanceled() {
+        return this._isCanceled;
+    }
+    get confirmed() {
+        return this._confirmDeferred;
+    }
+    get isConfirmed() {
+        return this._isConfirmed;
+    }
+    constructor(invocationMessage, _confirmationMessages) {
+        this.invocationMessage = invocationMessage;
+        this._confirmationMessages = _confirmationMessages;
+        this.kind = 'toolInvocation';
+        this._isComplete = false;
+        this._confirmDeferred = ( new DeferredPromise());
+        if (!_confirmationMessages) {
+            this._isConfirmed = true;
+            this._confirmDeferred.complete(true);
+        }
+        this._confirmDeferred.p.then(confirmed => {
+            this._isConfirmed = confirmed;
+            this._confirmationMessages = undefined;
+            if (!confirmed) {
+                this.complete();
+            }
+        });
+    }
+    complete() {
+        if (this._isComplete) {
+            throw ( new Error('Invocation is already complete.'));
+        }
+        this._isComplete = true;
+    }
+    get confirmationMessages() {
+        return this._confirmationMessages;
+    }
+    toJSON() {
+        return {
+            kind: 'toolInvocationSerialized',
+            invocationMessage: this.invocationMessage,
+            isConfirmed: this._isConfirmed ?? false
+        };
+    }
+}
+
+export { ChatToolInvocation };

package/vscode/src/vs/workbench/contrib/chat/common/chatServiceImpl.js

@@ -16,22 +16,19 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
-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 { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
+import { IWorkbenchAssignmentService } from 'vscode/vscode/vs/workbench/services/assignment/common/assignmentService.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 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_VOTE_UP_ENABLED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { normalizeSerializableChatData, ChatModel, ChatWelcomeMessageModel, ChatRequestRemovalReason, updateRanges, ChatRequestModel } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { normalizeSerializableChatData, ChatModel, updateRanges, toChatHistoryContent, ChatRequestModel } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { ChatServiceTelemetry } from './chatServiceTelemetry.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 { ChatMessageRole } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModels';
-import { IWorkbenchAssignmentService } from 'vscode/vscode/vs/workbench/services/assignment/common/assignmentService.service';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 
 const serializedChatKey = 'interactive.sessions';
 const globalChatKey = 'chat.workspaceTransfer';
@@ -75,7 +72,7 @@ let ChatService = class ChatService extends Disposable {
         this._sessionFollowupCancelTokens = this._register(( (new DisposableMap())));
         this._chatServiceTelemetry = this.instantiationService.createInstance(ChatServiceTelemetry);
         const isEmptyWindow = !workspaceContextService.getWorkspace().folders.length;
-        const sessionData = storageService.get(serializedChatKey, isEmptyWindow ? StorageScope.APPLICATION : StorageScope.WORKSPACE, '');
+        const sessionData = storageService.get(serializedChatKey, isEmptyWindow ? -1  : 1 , '');
         if (sessionData) {
             this._persistedSessions = this.deserializeChats(sessionData);
             const countsForLog = ( (Object.keys(this._persistedSessions))).length;
@@ -94,9 +91,6 @@ let ChatService = class ChatService extends Disposable {
             this._transferredSessionData = { sessionId: transferredChat.sessionId, inputValue: transferredData.inputValue };
         }
         this._register(storageService.onWillSaveState(() => this.saveState()));
-        const voteUpEnabled = CONTEXT_VOTE_UP_ENABLED.bindTo(contextKeyService);
-        workbenchAssignmentService.getTreatment('chatVoteUpEnabled')
-            .then(value => voteUpEnabled.set(!!value));
     }
     isEnabled(location) {
         return this.chatAgentService.getContributedDefaultAgent(location) !== undefined;
@@ -123,12 +117,12 @@ let ChatService = class ChatService extends Disposable {
             if (allSessions.length) {
                 this.trace('onWillSaveState', `Persisting ${serialized.length} chars`);
             }
-            this.storageService.store(serializedChatKey, serialized, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            this.storageService.store(serializedChatKey, serialized, 1 , 1 );
         }
         this._deletedChatIds.clear();
     }
     syncEmptyWindowChats(thisWindowChats) {
-        const sessionData = this.storageService.get(serializedChatKey, StorageScope.APPLICATION, '');
+        const sessionData = this.storageService.get(serializedChatKey, -1 , '');
         const originalPersistedSessions = this._persistedSessions;
         let persistedSessions;
         if (sessionData) {
@@ -161,7 +155,7 @@ let ChatService = class ChatService extends Disposable {
         sessionsList.sort((a, b) => (b.creationDate ?? 0) - (a.creationDate ?? 0));
         sessionsList = sessionsList.slice(0, maxPersistedSessions);
         const data = JSON.stringify(sessionsList);
-        this.storageService.store(serializedChatKey, data, StorageScope.APPLICATION, StorageTarget.MACHINE);
+        this.storageService.store(serializedChatKey, data, -1 , 1 );
     }
     notifyUserAction(action) {
         this._chatServiceTelemetry.notifyUserAction(action);
@@ -222,7 +216,7 @@ let ChatService = class ChatService extends Disposable {
         }
     }
     getTransferredSessionData() {
-        const data = this.storageService.getObject(globalChatKey, StorageScope.PROFILE, []);
+        const data = this.storageService.getObject(globalChatKey, 0 , []);
         const workspaceUri = this.workspaceContextService.getWorkspace().folders[0]?.uri;
         if (!workspaceUri) {
             return;
@@ -231,7 +225,7 @@ let ChatService = class ChatService extends Disposable {
         const currentTime = Date.now();
         const transferred = data.find(item => ( (URI.revive(item.toWorkspace).toString())) === thisWorkspace && (currentTime - item.timestampInMilliseconds < SESSION_TRANSFER_EXPIRATION_IN_MILLISECONDS));
         const filtered = data.filter(item => ( (URI.revive(item.toWorkspace).toString())) !== thisWorkspace && (currentTime - item.timestampInMilliseconds < SESSION_TRANSFER_EXPIRATION_IN_MILLISECONDS));
-        this.storageService.store(globalChatKey, JSON.stringify(filtered), StorageScope.PROFILE, StorageTarget.MACHINE);
+        this.storageService.store(globalChatKey, JSON.stringify(filtered), 0 , 1 );
         return transferred;
     }
     getHistory() {
@@ -252,7 +246,7 @@ let ChatService = class ChatService extends Disposable {
         const liveSessionItems = ( (Array.from(( (this._sessionModels.values())))
             .filter(session => !session.isImported)
             .map(session => {
-            const title = session.title || ( localize(3050, "New Chat"));
+            const title = session.title || ( localize(3154, "New Chat"));
             return {
                 sessionId: session.sessionId,
                 title,
@@ -298,11 +292,9 @@ let ChatService = class ChatService extends Disposable {
             if (!defaultAgent) {
                 throw ( (new ErrorNoTelemetry('No default agent registered')));
             }
-            const welcomeMessage = model.welcomeMessage ? undefined : (await defaultAgent.provideWelcomeMessage?.(model.initialLocation, token)) ?? undefined;
-            const welcomeModel = welcomeMessage && this.instantiationService.createInstance(ChatWelcomeMessageModel, ( (welcomeMessage.map(
-                item => typeof item === 'string' ? ( (new MarkdownString(item))) : item
-            ))), (await defaultAgent.provideSampleQuestions?.(model.initialLocation, token)) ?? []);
-            model.initialize(welcomeModel);
+            const welcomeMessage = (await defaultAgent.provideWelcomeMessage?.(token)) ?? undefined;
+            const sampleQuestions = (await defaultAgent.provideSampleQuestions?.(model.initialLocation, token)) ?? undefined;
+            model.initialize(welcomeMessage, sampleQuestions);
         }
         catch (err) {
             this.trace('startSession', `initializeSession failed: ${err}`);
@@ -347,7 +339,7 @@ let ChatService = class ChatService extends Disposable {
         const attempt = options?.attempt ?? 0;
         const enableCommandDetection = !options?.noCommandDetection;
         const defaultAgent = this.chatAgentService.getDefaultAgent(location);
-        model.removeRequest(request.id, ChatRequestRemovalReason.Resend);
+        model.removeRequest(request.id, 1 );
         const resendOptions = {
             ...options,
             locationData: request.locationData,
@@ -453,7 +445,8 @@ let ChatService = class ChatService extends Disposable {
                     location,
                     citations: request?.response?.codeCitations.length ?? 0,
                     numCodeBlocks: getCodeBlocks(request.response?.response.toString() ?? '').length,
-                    isParticipantDetected: !!detectedAgent
+                    isParticipantDetected: !!detectedAgent,
+                    enableCommandDetection
                 });
                 model.cancelRequest(request);
             });
@@ -483,6 +476,7 @@ let ChatService = class ChatService extends Disposable {
                             locationData: request.locationData,
                             acceptedConfirmationData: options?.acceptedConfirmationData,
                             rejectedConfirmationData: options?.rejectedConfirmationData,
+                            userSelectedModelId: options?.userSelectedModelId
                         };
                     };
                     if (this.configurationService.getValue('chat.experimental.detectParticipant.enabled') !== false && this.chatAgentService.hasChatParticipantDetectionProviders() && !agentPart && !commandPart && enableCommandDetection) {
@@ -518,8 +512,8 @@ let ChatService = class ChatService extends Disposable {
                         if (!request.response) {
                             continue;
                         }
-                        history.push({ role: ChatMessageRole.User, content: [{ type: 'text', value: request.message.text }] });
-                        history.push({ role: ChatMessageRole.Assistant, content: [{ type: 'text', value: ( (request.response.response.toString())) }] });
+                        history.push({ role: 1 , content: [{ type: 'text', value: request.message.text }] });
+                        history.push({ role: 2 , content: [{ type: 'text', value: ( (request.response.response.toString())) }] });
                     }
                     const message = parsedRequest.text;
                     const commandResult = await this.chatSlashCommandService.executeCommand(commandPart.slashCommand.command, message.substring(commandPart.slashCommand.command.length + 1).trimStart(), ( (new Progress(p => {
@@ -537,7 +531,7 @@ let ChatService = class ChatService extends Disposable {
                 else {
                     if (!rawResult) {
                         this.trace('sendRequest', `Provider returned no response for session ${model.sessionId}`);
-                        rawResult = { errorDetails: { message: ( localize(3051, "Provider returned null response")) } };
+                        rawResult = { errorDetails: { message: ( localize(3155, "Provider returned null response")) } };
                     }
                     const result = rawResult.errorDetails?.responseIsFiltered ? 'filtered' :
                         rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
@@ -553,6 +547,7 @@ let ChatService = class ChatService extends Disposable {
                         agentExtensionId: agentPart?.agent.extensionId.value ?? '',
                         slashCommand: commandForTelemetry,
                         chatSessionId: model.sessionId,
+                        enableCommandDetection,
                         isParticipantDetected: !!detectedAgent,
                         location,
                         citations: request.response?.codeCitations.length ?? 0,
@@ -589,6 +584,7 @@ let ChatService = class ChatService extends Disposable {
                     location,
                     citations: 0,
                     numCodeBlocks: 0,
+                    enableCommandDetection,
                     isParticipantDetected: !!detectedAgent
                 });
                 this.logService.error(`Error while handling chat request: ${toErrorMessage(err, true)}`);
@@ -633,7 +629,7 @@ let ChatService = class ChatService extends Disposable {
                 variables: updateRanges(request.variableData, promptTextResult.diff),
                 location: ChatAgentLocation.Panel
             };
-            history.push({ request: historyRequest, response: request.response.response.value, result: request.response.result ?? {} });
+            history.push({ request: historyRequest, response: toChatHistoryContent(request.response.response.value), result: request.response.result ?? {} });
         }
         return history;
     }
@@ -725,14 +721,14 @@ let ChatService = class ChatService extends Disposable {
                 `Failed to transfer session. Unknown session ID: ${transferredSessionData.sessionId}`
             )));
         }
-        const existingRaw = this.storageService.getObject(globalChatKey, StorageScope.PROFILE, []);
+        const existingRaw = this.storageService.getObject(globalChatKey, 0 , []);
         existingRaw.push({
             chat: model.toJSON(),
             timestampInMilliseconds: Date.now(),
             toWorkspace: toWorkspace,
             inputValue: transferredSessionData.inputValue,
         });
-        this.storageService.store(globalChatKey, JSON.stringify(existingRaw), StorageScope.PROFILE, StorageTarget.MACHINE);
+        this.storageService.store(globalChatKey, JSON.stringify(existingRaw), 0 , 1 );
         this.trace('transferChatSession', `Transferred session ${model.sessionId} to workspace ${( (toWorkspace.toString()))}`);
     }
 };

package/vscode/src/vs/workbench/contrib/chat/common/chatServiceTelemetry.js

@@ -26,10 +26,17 @@ let ChatServiceTelemetry = class ChatServiceTelemetry {
         else if (action.action.kind === 'insert') {
             this.telemetryService.publicLog2('interactiveSessionInsert', {
                 newFile: !!action.action.newFile,
-                userAction: action.action.userAction,
+                agentId: action.agentId ?? '',
+                command: action.command,
+            });
+        }
+        else if (action.action.kind === 'apply') {
+            this.telemetryService.publicLog2('interactiveSessionApply', {
+                newFile: !!action.action.newFile,
                 codeMapper: action.action.codeMapper,
                 agentId: action.agentId ?? '',
                 command: action.command,
+                editsProposed: !!action.action.editsProposed,
             });
         }
         else if (action.action.kind === 'command') {

package/vscode/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.js

@@ -1,6 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
@@ -11,7 +10,7 @@ let ChatWidgetHistoryService = class ChatWidgetHistoryService {
         this._onDidClearHistory = ( new Emitter());
         this.onDidClearHistory = this._onDidClearHistory.event;
         this.memento = ( new Memento('interactive-session', storageService));
-        const loadedState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        const loadedState = this.memento.getMemento(1 , 1 );
         for (const provider in loadedState.history) {
             loadedState.history[provider] = ( loadedState.history[provider].map(entry => typeof entry === 'string' ? { text: entry } : entry));
         }