@codingame/monaco-vscode-chat-service-override 16.1.0 → 17.0.0

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

@@ -1,37 +1,11 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { ChatRequestDynamicVariablePart, ChatRequestToolPart } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatAgentLocation, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { showEditsView, showChatView } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 
 let ChatVariablesService = class ChatVariablesService {
-    constructor(chatWidgetService, viewsService, configurationService) {
+    constructor(chatWidgetService) {
         this.chatWidgetService = chatWidgetService;
-        this.viewsService = viewsService;
-        this.configurationService = configurationService;
-    }
-    resolveVariables(prompt, attachedContextVariables) {
-        let resolvedVariables = [];
-        prompt.parts
-            .forEach((part, i) => {
-            if (part instanceof ChatRequestDynamicVariablePart || part instanceof ChatRequestToolPart) {
-                resolvedVariables[i] = part.toVariableEntry();
-            }
-        });
-        resolvedVariables = coalesce(resolvedVariables);
-        resolvedVariables.sort((a, b) => b.range.start - a.range.start);
-        if (attachedContextVariables) {
-            resolvedVariables.push(...attachedContextVariables);
-        }
-        return {
-            variables: resolvedVariables,
-        };
     }
     getDynamicVariables(sessionId) {
         const widget = this.chatWidgetService.getWidgetBySessionId(sessionId);
@@ -44,34 +18,16 @@ let ChatVariablesService = class ChatVariablesService {
         }
         return model.variables;
     }
-    async attachContext(name, value, location) {
-        if (location !== ChatAgentLocation.Panel && location !== ChatAgentLocation.EditingSession) {
-            return;
-        }
-        const unifiedViewEnabled = !!this.configurationService.getValue(ChatConfiguration.UnifiedChatView);
-        const widget = location === ChatAgentLocation.EditingSession && !unifiedViewEnabled
-            ? await showEditsView(this.viewsService)
-            : (this.chatWidgetService.lastFocusedWidget ?? (await showChatView(this.viewsService)));
-        if (!widget || !widget.viewModel) {
-            return;
-        }
-        const key = name.toLowerCase();
-        if (key === 'file' && typeof value !== 'string') {
-            const uri = URI.isUri(value) ? value : value.uri;
-            const range = 'range' in value ? value.range : undefined;
-            await widget.attachmentModel.addFile(uri, range);
-            return;
-        }
-        if (key === 'folder' && URI.isUri(value)) {
-            widget.attachmentModel.addFolder(value);
-            return;
+    getSelectedTools(sessionId) {
+        const widget = this.chatWidgetService.getWidgetBySessionId(sessionId);
+        if (!widget) {
+            return [];
         }
+        return widget.input.selectedToolsModel.tools.get();
     }
 };
 ChatVariablesService = ( __decorate([
-    ( __param(0, IChatWidgetService)),
-    ( __param(1, IViewsService)),
-    ( __param(2, IConfigurationService))
+    ( __param(0, IChatWidgetService))
 ], ChatVariablesService));
 
 export { ChatVariablesService };

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

@@ -0,0 +1,53 @@
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
+import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
+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 { ILayoutService } from "@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.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 { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
+import { IViewPaneOptions, ViewPane } from "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane";
+import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
+import { IChatViewTitleActionContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatActions";
+import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
+import { ChatWidget, IChatViewState } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
+import { IViewWelcomeDelegate } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController";
+export declare const CHAT_SIDEBAR_OLD_VIEW_PANEL_ID = "workbench.panel.chatSidebar";
+export declare const CHAT_SIDEBAR_PANEL_ID = "workbench.panel.chat";
+export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
+    private readonly chatOptions;
+    private readonly storageService;
+    private readonly chatService;
+    private readonly chatAgentService;
+    private readonly logService;
+    private readonly layoutService;
+    private _widget;
+    get widget(): ChatWidget;
+    private readonly modelDisposables;
+    private memento;
+    private readonly viewState;
+    private defaultParticipantRegistrationFailed;
+    private didUnregisterProvider;
+    private _restoringSession;
+    constructor(chatOptions: {
+        location: ChatAgentLocation.Panel;
+    }, 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: ILayoutService);
+    getActionsContext(): IChatViewTitleActionContext | undefined;
+    private updateModel;
+    shouldShowWelcome(): boolean;
+    private getTransferredOrPersistedSessionInfo;
+    protected renderBody(parent: HTMLElement): Promise<void>;
+    acceptInput(query?: string): void;
+    private clear;
+    loadSession(sessionId: string, viewState?: IChatViewState): Promise<void>;
+    focusInput(): void;
+    focus(): void;
+    protected layoutBody(height: number, width: number): void;
+    saveState(): void;
+    private updateViewState;
+}

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

@@ -0,0 +1,264 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { getWindow, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
+import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.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';
+import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
+import { ILayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
+import { editorBackground } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/menuColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/minimapColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
+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 { ViewPane } from '@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane';
+import { Memento } from '@codingame/monaco-vscode-c8227507-8e59-53d6-b50b-71c0ab384cf4-common/vscode/vs/workbench/common/memento';
+import { SIDE_BAR_FOREGROUND } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/theme';
+import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
+import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
+import { ChatModelInitState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { ChatAgentLocation, ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatWidget } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { ChatViewWelcomeController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController';
+
+const CHAT_SIDEBAR_PANEL_ID = 'workbench.panel.chat';
+let ChatViewPane = class ChatViewPane extends ViewPane {
+    get widget() { return this._widget; }
+    constructor(chatOptions, options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService, storageService, chatService, chatAgentService, logService, layoutService) {
+        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
+        this.chatOptions = chatOptions;
+        this.storageService = storageService;
+        this.chatService = chatService;
+        this.chatAgentService = chatAgentService;
+        this.logService = logService;
+        this.layoutService = layoutService;
+        this.modelDisposables = this._register(( new DisposableStore()));
+        this.defaultParticipantRegistrationFailed = false;
+        this.didUnregisterProvider = false;
+        this.memento = ( new Memento('interactive-session-view-' + CHAT_PROVIDER_ID, this.storageService));
+        this.viewState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        if (this.chatOptions.location === ChatAgentLocation.Panel && !this.viewState.hasMigratedCurrentSession) {
+            const editsMemento = ( new Memento(
+                'interactive-session-view-' + CHAT_PROVIDER_ID + `-edits`,
+                this.storageService
+            ));
+            const lastEditsState = editsMemento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            if (lastEditsState.sessionId) {
+                this.logService.trace(`ChatViewPane: last edits session was ${lastEditsState.sessionId}`);
+                if (!this.chatService.isPersistedSessionEmpty(lastEditsState.sessionId)) {
+                    this.logService.info(`ChatViewPane: migrating ${lastEditsState.sessionId} to unified view`);
+                    this.viewState.sessionId = lastEditsState.sessionId;
+                    this.viewState.inputValue = lastEditsState.inputValue;
+                    this.viewState.inputState = {
+                        ...lastEditsState.inputState,
+                        chatMode: lastEditsState.inputState?.chatMode ?? ChatMode.Edit
+                    };
+                    this.viewState.hasMigratedCurrentSession = true;
+                }
+            }
+        }
+        this._register(this.chatAgentService.onDidChangeAgents(() => {
+            if (this.chatAgentService.getDefaultAgent(this.chatOptions?.location)) {
+                if (!this._widget?.viewModel && !this._restoringSession) {
+                    const info = this.getTransferredOrPersistedSessionInfo();
+                    this._restoringSession =
+                        (info.sessionId ? this.chatService.getOrRestoreSession(info.sessionId) : Promise.resolve(undefined)).then(async (model) => {
+                            if (!this._widget) {
+                                return;
+                            }
+                            const wasVisible = this._widget.visible;
+                            try {
+                                this._widget.setVisible(false);
+                                await this.updateModel(model, info.inputValue || info.mode ? { inputState: { chatMode: info.mode }, inputValue: info.inputValue } : undefined);
+                                this.defaultParticipantRegistrationFailed = false;
+                                this.didUnregisterProvider = false;
+                                this._onDidChangeViewWelcomeState.fire();
+                            }
+                            finally {
+                                this.widget.setVisible(wasVisible);
+                            }
+                        });
+                    this._restoringSession.finally(() => this._restoringSession = undefined);
+                }
+            }
+            else if (this._widget?.viewModel?.initState === ChatModelInitState.Initialized) {
+                this.didUnregisterProvider = true;
+            }
+            this._onDidChangeViewWelcomeState.fire();
+        }));
+    }
+    getActionsContext() {
+        return this.widget?.viewModel ? {
+            sessionId: this.widget.viewModel.sessionId,
+            $mid: MarshalledId.ChatViewContext
+        } : undefined;
+    }
+    async updateModel(model, viewState) {
+        this.modelDisposables.clear();
+        model = model ?? (this.chatService.transferredSessionData?.sessionId && this.chatService.transferredSessionData?.location === this.chatOptions.location
+            ? await this.chatService.getOrRestoreSession(this.chatService.transferredSessionData.sessionId)
+            : this.chatService.startSession(this.chatOptions.location, CancellationToken.None));
+        if (!model) {
+            throw ( new Error('Could not start chat session'));
+        }
+        if (viewState) {
+            this.updateViewState(viewState);
+        }
+        this.viewState.sessionId = model.sessionId;
+        this._widget.setModel(model, { ...this.viewState });
+        this.updateActions();
+    }
+    shouldShowWelcome() {
+        const noPersistedSessions = !this.chatService.hasSessions();
+        const hasCoreAgent = ( this.chatAgentService.getAgents().some(
+            agent => agent.isCore && agent.locations.includes(this.chatOptions.location)
+        ));
+        const shouldShow = !hasCoreAgent && (this.didUnregisterProvider || !this._widget?.viewModel && noPersistedSessions || this.defaultParticipantRegistrationFailed);
+        this.logService.trace(`ChatViewPane#shouldShowWelcome(${this.chatOptions.location}) = ${shouldShow}: hasCoreAgent=${hasCoreAgent} didUnregister=${this.didUnregisterProvider} || noViewModel=${!this._widget?.viewModel} && noPersistedSessions=${noPersistedSessions} || defaultParticipantRegistrationFailed=${this.defaultParticipantRegistrationFailed}`);
+        return !!shouldShow;
+    }
+    getTransferredOrPersistedSessionInfo() {
+        if (this.chatService.transferredSessionData?.location === this.chatOptions.location) {
+            const sessionId = this.chatService.transferredSessionData.sessionId;
+            return {
+                sessionId,
+                inputValue: this.chatService.transferredSessionData.inputValue,
+                mode: this.chatService.transferredSessionData.mode
+            };
+        }
+        else {
+            return { sessionId: this.viewState.sessionId };
+        }
+    }
+    async renderBody(parent) {
+        try {
+            super.renderBody(parent);
+            this._register(this.instantiationService.createInstance(ChatViewWelcomeController, parent, this, this.chatOptions.location));
+            const scopedInstantiationService = this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.scopedContextKeyService]))));
+            const locationBasedColors = this.getLocationBasedColors();
+            const editorOverflowNode = this.layoutService.getContainer(getWindow(parent)).appendChild($('.chat-editor-overflow.monaco-editor'));
+            this._register({ dispose: () => editorOverflowNode.remove() });
+            this._widget = this._register(scopedInstantiationService.createInstance(ChatWidget, this.chatOptions.location, { viewId: this.id }, {
+                autoScroll: mode => mode !== ChatMode.Ask,
+                renderFollowups: this.chatOptions.location === ChatAgentLocation.Panel,
+                supportsFileReferences: true,
+                rendererOptions: {
+                    renderTextEditsAsSummary: (uri) => {
+                        return true;
+                    },
+                    referencesExpandedWhenEmptyResponse: false,
+                    progressMessageAtBottomOfResponse: mode => mode !== ChatMode.Ask,
+                },
+                editorOverflowWidgetsDomNode: editorOverflowNode,
+                enableImplicitContext: this.chatOptions.location === ChatAgentLocation.Panel,
+                enableWorkingSet: 'explicit',
+                supportsChangingModes: true,
+            }, {
+                listForeground: SIDE_BAR_FOREGROUND,
+                listBackground: locationBasedColors.background,
+                overlayBackground: locationBasedColors.overlayBackground,
+                inputEditorBackground: locationBasedColors.background,
+                resultEditorBackground: editorBackground,
+            }));
+            this._register(this.onDidChangeBodyVisibility(visible => {
+                this._widget.setVisible(visible);
+            }));
+            this._register(this._widget.onDidClear(() => this.clear()));
+            this._widget.render(parent);
+            const info = this.getTransferredOrPersistedSessionInfo();
+            const disposeListener = this._register(this.chatService.onDidDisposeSession((e) => {
+                if (e.reason === 'initializationFailed') {
+                    this.defaultParticipantRegistrationFailed = true;
+                    disposeListener?.dispose();
+                    this._onDidChangeViewWelcomeState.fire();
+                }
+            }));
+            const model = info.sessionId ? await this.chatService.getOrRestoreSession(info.sessionId) : undefined;
+            await this.updateModel(model, info.inputValue || info.mode ? { inputState: { chatMode: info.mode }, inputValue: info.inputValue } : undefined);
+        }
+        catch (e) {
+            this.logService.error(e);
+            throw e;
+        }
+    }
+    acceptInput(query) {
+        this._widget.acceptInput(query);
+    }
+    async clear() {
+        if (this.widget.viewModel) {
+            await this.chatService.clearSession(this.widget.viewModel.sessionId);
+        }
+        this.updateViewState();
+        await this.updateModel(undefined);
+        this.updateActions();
+    }
+    async loadSession(sessionId, viewState) {
+        if (this.widget.viewModel) {
+            await this.chatService.clearSession(this.widget.viewModel.sessionId);
+        }
+        const newModel = await this.chatService.getOrRestoreSession(sessionId);
+        await this.updateModel(newModel, viewState);
+    }
+    focusInput() {
+        this._widget.focusInput();
+    }
+    focus() {
+        super.focus();
+        this._widget.focusInput();
+    }
+    layoutBody(height, width) {
+        super.layoutBody(height, width);
+        this._widget.layout(height, width);
+    }
+    saveState() {
+        if (this._widget) {
+            this._widget.saveState();
+            this.updateViewState();
+            this.memento.saveMemento();
+        }
+        super.saveState();
+    }
+    updateViewState(viewState) {
+        const newViewState = viewState ?? this._widget.getViewState();
+        for (const [key, value] of Object.entries(newViewState)) {
+            this.viewState[key] = value;
+        }
+    }
+};
+ChatViewPane = ( __decorate([
+    ( __param(2, IKeybindingService)),
+    ( __param(3, IContextMenuService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, IContextKeyService)),
+    ( __param(6, IViewDescriptorService)),
+    ( __param(7, IInstantiationService)),
+    ( __param(8, IOpenerService)),
+    ( __param(9, IThemeService)),
+    ( __param(10, IHoverService)),
+    ( __param(11, IStorageService)),
+    ( __param(12, IChatService)),
+    ( __param(13, IChatAgentService)),
+    ( __param(14, ILogService)),
+    ( __param(15, ILayoutService))
+], ChatViewPane));
+
+export { CHAT_SIDEBAR_PANEL_ID, ChatViewPane };

package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockContextProviderService.d.ts

@@ -1,5 +1,5 @@
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ICodeBlockActionContextProvider } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import { ICodeBlockActionContextProvider } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IChatCodeBlockContextProviderService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 export declare class ChatCodeBlockContextProviderService implements IChatCodeBlockContextProviderService {
     _serviceBrand: undefined;

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

@@ -1,9 +1,11 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
-import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, MutableDisposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { themeColorFromId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
+import { TrackedRangeStickiness } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
@@ -18,11 +20,11 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quic
 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 { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { chatSlashCommandBackground, chatSlashCommandForeground } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatColors';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
-import { ChatWidget } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { chatSlashCommandBackground, chatSlashCommandForeground } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/chatColors';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestParser } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
+import { ChatWidget } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 
 const decorationDescription = 'chat';
 const placeholderDecorationType = 'chat-session-detail';
@@ -42,8 +44,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         this.previouslyUsedAgents = ( new Set());
         this.viewModelDisposables = this._register(( new MutableDisposable()));
         this.codeEditorService.registerDecorationType(decorationDescription, placeholderDecorationType, {});
-        this._register(this.themeService.onDidColorThemeChange(() => this.updateRegisteredDecorationTypes()));
-        this.updateRegisteredDecorationTypes();
+        this.registeredDecorationTypes();
         this.updateInputEditorDecorations();
         this._register(this.widget.inputEditor.onDidChangeModelContent(() => this.updateInputEditorDecorations()));
         this._register(this.widget.onDidChangeParsedInput(() => this.updateInputEditorDecorations()));
@@ -65,27 +66,28 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
             }
         });
     }
-    updateRegisteredDecorationTypes() {
-        this.codeEditorService.removeDecorationType(variableTextDecorationType);
-        this.codeEditorService.removeDecorationType(dynamicVariableDecorationType);
-        this.codeEditorService.removeDecorationType(slashCommandTextDecorationType);
-        const theme = this.themeService.getColorTheme();
+    registeredDecorationTypes() {
         this.codeEditorService.registerDecorationType(decorationDescription, slashCommandTextDecorationType, {
-            color: theme.getColor(chatSlashCommandForeground)?.toString(),
-            backgroundColor: theme.getColor(chatSlashCommandBackground)?.toString(),
+            color: themeColorFromId(chatSlashCommandForeground),
+            backgroundColor: themeColorFromId(chatSlashCommandBackground),
             borderRadius: '3px'
         });
         this.codeEditorService.registerDecorationType(decorationDescription, variableTextDecorationType, {
-            color: theme.getColor(chatSlashCommandForeground)?.toString(),
-            backgroundColor: theme.getColor(chatSlashCommandBackground)?.toString(),
+            color: themeColorFromId(chatSlashCommandForeground),
+            backgroundColor: themeColorFromId(chatSlashCommandBackground),
             borderRadius: '3px'
         });
         this.codeEditorService.registerDecorationType(decorationDescription, dynamicVariableDecorationType, {
-            color: theme.getColor(chatSlashCommandForeground)?.toString(),
-            backgroundColor: theme.getColor(chatSlashCommandBackground)?.toString(),
-            borderRadius: '3px'
+            color: themeColorFromId(chatSlashCommandForeground),
+            backgroundColor: themeColorFromId(chatSlashCommandBackground),
+            borderRadius: '3px',
+            rangeBehavior: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
         });
-        this.updateInputEditorDecorations();
+        this._register(toDisposable(() => {
+            this.codeEditorService.removeDecorationType(variableTextDecorationType);
+            this.codeEditorService.removeDecorationType(dynamicVariableDecorationType);
+            this.codeEditorService.removeDecorationType(slashCommandTextDecorationType);
+        }));
     }
     getPlaceholderColor() {
         const theme = this.themeService.getColorTheme();
@@ -124,6 +126,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         const agentPart = parsedRequest.find((p) => p instanceof ChatRequestAgentPart);
         const agentSubcommandPart = parsedRequest.find((p) => p instanceof ChatRequestAgentSubcommandPart);
         const slashCommandPart = parsedRequest.find((p) => p instanceof ChatRequestSlashCommandPart);
+        const slashPromptPart = parsedRequest.find((p) => p instanceof ChatRequestSlashPromptPart);
         const exactlyOneSpaceAfterPart = (part) => {
             const partIdx = parsedRequest.indexOf(part);
             if (parsedRequest.length > partIdx + 2) {
@@ -195,6 +198,9 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         if (slashCommandPart) {
             textDecorations.push({ range: slashCommandPart.editorRange });
         }
+        if (slashPromptPart) {
+            textDecorations.push({ range: slashPromptPart.editorRange });
+        }
         this.widget.inputEditor.setDecorationsByType(decorationDescription, slashCommandTextDecorationType, textDecorations);
         const varDecorations = [];
         const toolParts = parsedRequest.filter((p) => p instanceof ChatRequestToolPart);
@@ -259,7 +265,7 @@ let ChatTokenDeleter = class ChatTokenDeleter extends Disposable {
             const change = e.changes[0];
             if (!change.text && this.widget.viewModel) {
                 const previousParsedValue = parser.parseChatRequest(this.widget.viewModel.sessionId, previousInputValue, widget.location, { selectedAgent: previousSelectedAgent, mode: this.widget.input.currentMode });
-                const deletableTokens = previousParsedValue.parts.filter(p => p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart || p instanceof ChatRequestSlashCommandPart || p instanceof ChatRequestToolPart);
+                const deletableTokens = previousParsedValue.parts.filter(p => p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart || p instanceof ChatRequestSlashCommandPart || p instanceof ChatRequestSlashPromptPart || p instanceof ChatRequestToolPart);
                 deletableTokens.forEach(token => {
                     const deletedRangeOfToken = Range.intersectRanges(token.editorRange, change.range);
                     if (deletedRangeOfToken && Range.compareRangesUsingStarts(token.editorRange, change.range) < 0) {

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover.d.ts

@@ -5,7 +5,7 @@ import { HoverAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHover
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatAgentData } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatAgentData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
 export declare class ChatAgentHoverParticipant implements IEditorHoverParticipant<ChatAgentHoverPart> {
     private readonly editor;
     private readonly instantiationService;

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

@@ -6,9 +6,9 @@ import { RenderedHoverParts, HoverAnchorType, HoverParticipantRegistry } from '@
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatAgentHover, getChatAgentHoverOptions } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatAgentHover';
+import { ChatAgentHover, getChatAgentHoverOptions } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatAgentHover';
 import { ChatEditorHoverWrapper } from './editorHoverWrapper.js';
-import { extractAgentAndCommand } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { extractAgentAndCommand } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 
 let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
@@ -58,7 +58,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(4902, 'There is a chat agent hover part here.');
+        return localize(4967, 'There is a chat agent hover part here.');
     }
 };
 ChatAgentHoverParticipant = ( __decorate([

package/vscode/src/vs/workbench/contrib/chat/browser/languageModelToolsService.d.ts

@@ -45,7 +45,8 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     invokeTool(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
     private prepareToolInvocation;
     private ensureToolDetails;
-    private toolResultToString;
+    private formatToolInput;
+    private toolResultToIO;
     private shouldAutoConfirm;
     private cleanupCallDisposables;
     cancelToolCallsForRequest(requestId: string): void;