@codingame/monaco-vscode-chat-service-override 10.1.3 → 11.0.0

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

@@ -30,29 +30,33 @@ import { SIDE_BAR_FOREGROUND } from 'vscode/vscode/vs/workbench/common/theme';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.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 { ChatModelInitState } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { CHAT_PROVIDER_ID } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { ChatModelInitState } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/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';
+import { ChatWidget } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { ChatViewWelcomeController } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController';
 
-const CHAT_SIDEBAR_PANEL_ID = 'workbench.panel.chatSidebar';
+const CHAT_SIDEBAR_PANEL_ID = 'workbench.panel.chat';
+const CHAT_EDITING_SIDEBAR_PANEL_ID = 'workbench.panel.chatEditing';
 let ChatViewPane = class ChatViewPane extends ViewPane {
     get widget() { return this._widget; }
-    constructor(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService, storageService, chatService, chatAgentService, logService) {
+    constructor(chatOptions, options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService, storageService, chatService, chatAgentService, logService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+        this.chatOptions = chatOptions;
         this.storageService = storageService;
         this.chatService = chatService;
         this.chatAgentService = chatAgentService;
         this.logService = logService;
         this.modelDisposables = this._register(( new DisposableStore()));
-        this.didProviderRegistrationFail = false;
+        this.defaultParticipantRegistrationFailed = false;
         this.didUnregisterProvider = false;
-        this.isInitialized = false;
-        this.memento = ( new Memento('interactive-session-view-' + CHAT_PROVIDER_ID, this.storageService));
+        this.memento = ( new Memento(
+            'interactive-session-view-' + CHAT_PROVIDER_ID + (this.chatOptions.location === ChatAgentLocation.EditingSession ? `-edits` : ''),
+            this.storageService
+        ));
         this.viewState = this.memento.getMemento(1 , 1 );
         this._register(this.chatAgentService.onDidChangeAgents(() => {
-            this.isInitialized = true;
-            if (this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel)) {
+            if (this.chatAgentService.getDefaultAgent(this.chatOptions?.location)) {
                 if (!this._widget?.viewModel) {
                     const sessionId = this.getSessionId();
                     const model = sessionId ? this.chatService.getOrRestoreSession(sessionId) : undefined;
@@ -60,7 +64,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                     try {
                         this._widget.setVisible(false);
                         this.updateModel(model);
-                        this.didProviderRegistrationFail = false;
+                        this.defaultParticipantRegistrationFailed = false;
                         this.didUnregisterProvider = false;
                         this._onDidChangeViewWelcomeState.fire();
                     }
@@ -76,15 +80,16 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         }));
     }
     getActionsContext() {
-        return {
-            chatView: this
-        };
+        return this.widget?.viewModel ? {
+            sessionId: this.widget.viewModel.sessionId,
+            $mid: 19
+        } : undefined;
     }
     updateModel(model, viewState) {
         this.modelDisposables.clear();
         model = model ?? (this.chatService.transferredSessionData?.sessionId
             ? this.chatService.getOrRestoreSession(this.chatService.transferredSessionData.sessionId)
-            : this.chatService.startSession(ChatAgentLocation.Panel, CancellationToken.None));
+            : this.chatService.startSession(this.chatOptions.location, CancellationToken.None));
         if (!model) {
             throw ( new Error('Could not start chat session'));
         }
@@ -93,13 +98,13 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         }
         this.viewState.sessionId = model.sessionId;
         this._widget.setModel(model, { ...this.viewState });
+        this.updateActions();
     }
     shouldShowWelcome() {
-        if (!this.chatAgentService.getContributedDefaultAgent(ChatAgentLocation.Panel)) {
-            return true;
-        }
         const noPersistedSessions = !this.chatService.hasSessions();
-        return this.didUnregisterProvider || !this._widget?.viewModel && (noPersistedSessions || this.didProviderRegistrationFail) || !this.isInitialized;
+        const shouldShow = this.didUnregisterProvider || !this._widget?.viewModel && noPersistedSessions || this.defaultParticipantRegistrationFailed;
+        this.logService.trace(`ChatViewPane#shouldShowWelcome(${this.chatOptions.location}) = ${shouldShow}: didUnregister=${this.didUnregisterProvider} || noViewModel:${!this._widget?.viewModel} && noPersistedSessions=${noPersistedSessions} || defaultParticipantRegistrationFailed=${this.defaultParticipantRegistrationFailed}`);
+        return shouldShow;
     }
     getSessionId() {
         let sessionId;
@@ -115,14 +120,27 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
     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();
-            this._widget = this._register(scopedInstantiationService.createInstance(ChatWidget, ChatAgentLocation.Panel, { viewId: this.id }, { supportsFileReferences: true }, {
+            this._widget = this._register(scopedInstantiationService.createInstance(ChatWidget, this.chatOptions.location, { viewId: this.id }, {
+                autoScroll: this.chatOptions.location === ChatAgentLocation.EditingSession,
+                renderFollowups: this.chatOptions.location === ChatAgentLocation.Panel,
+                supportsFileReferences: true,
+                supportsAdditionalParticipants: this.chatOptions.location === ChatAgentLocation.Panel,
+                rendererOptions: {
+                    renderCodeBlockPills: this.chatOptions.location === ChatAgentLocation.EditingSession,
+                    renderTextEditsAsSummary: (uri) => {
+                        return this.chatOptions.location === ChatAgentLocation.EditingSession;
+                    },
+                },
+                enableImplicitContext: this.chatOptions.location === ChatAgentLocation.Panel
+            }, {
                 listForeground: SIDE_BAR_FOREGROUND,
                 listBackground: locationBasedColors.background,
                 overlayBackground: locationBasedColors.overlayBackground,
                 inputEditorBackground: locationBasedColors.background,
-                resultEditorBackground: editorBackground
+                resultEditorBackground: editorBackground,
             }));
             this._register(this.onDidChangeBodyVisibility(visible => {
                 this._widget.setVisible(visible);
@@ -130,13 +148,13 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             this._register(this._widget.onDidClear(() => this.clear()));
             this._widget.render(parent);
             const sessionId = this.getSessionId();
-            const disposeListener = sessionId ? this._register(this.chatService.onDidDisposeSession((e) => {
+            const disposeListener = this._register(this.chatService.onDidDisposeSession((e) => {
                 if (e.reason === 'initializationFailed') {
-                    this.didProviderRegistrationFail = true;
+                    this.defaultParticipantRegistrationFailed = true;
                     disposeListener?.dispose();
                     this._onDidChangeViewWelcomeState.fire();
                 }
-            })) : undefined;
+            }));
             const model = sessionId ? this.chatService.getOrRestoreSession(sessionId) : undefined;
             this.updateModel(model);
         }
@@ -154,6 +172,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         }
         this.updateViewState();
         this.updateModel(undefined);
+        this.updateActions();
     }
     loadSession(sessionId, viewState) {
         if (this.widget.viewModel) {
@@ -183,26 +202,26 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
     }
     updateViewState(viewState) {
         const newViewState = viewState ?? this._widget.getViewState();
-        this.viewState.inputValue = newViewState.inputValue;
-        this.viewState.inputState = newViewState.inputState;
-        this.viewState.selectedLanguageModelId = newViewState.selectedLanguageModelId;
+        for (const [key, value] of Object.entries(newViewState)) {
+            this.viewState[key] = value;
+        }
     }
 };
 ChatViewPane = ( __decorate([
-    ( __param(1, IKeybindingService)),
-    ( __param(2, IContextMenuService)),
-    ( __param(3, IConfigurationService)),
-    ( __param(4, IContextKeyService)),
-    ( __param(5, IViewDescriptorService)),
-    ( __param(6, IInstantiationService)),
-    ( __param(7, IOpenerService)),
-    ( __param(8, IThemeService)),
-    ( __param(9, ITelemetryService)),
-    ( __param(10, IHoverService)),
-    ( __param(11, IStorageService)),
-    ( __param(12, IChatService)),
-    ( __param(13, IChatAgentService)),
-    ( __param(14, ILogService))
+    ( __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, ITelemetryService)),
+    ( __param(11, IHoverService)),
+    ( __param(12, IStorageService)),
+    ( __param(13, IChatService)),
+    ( __param(14, IChatAgentService)),
+    ( __param(15, ILogService))
 ], ChatViewPane));
 
-export { CHAT_SIDEBAR_PANEL_ID, ChatViewPane };
+export { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID, ChatViewPane };

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

@@ -16,12 +16,12 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
-import { ChatWidget } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { dynamicVariableDecorationType } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { ChatWidget } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { chatSlashCommandForeground, chatSlashCommandBackground } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatColors';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
+import { chatSlashCommandForeground, chatSlashCommandBackground } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatColors';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestParser } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 
 const decorationDescription = 'chat';
 const placeholderDecorationType = 'chat-session-detail';

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

@@ -5,9 +5,9 @@ import { RenderedHoverParts, HoverParticipantRegistry } from 'vscode/vscode/vs/e
 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';
-import { ChatAgentHover, getChatAgentHoverOptions } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatAgentHover';
+import { ChatAgentHover, getChatAgentHoverOptions } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatAgentHover';
 import { ChatEditorHoverWrapper } from './editorHoverWrapper.js';
-import { extractAgentAndCommand } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { extractAgentAndCommand } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { localize } from 'vscode/vscode/vs/nls';
 
 let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
@@ -61,7 +61,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         );
     }
     getAccessibleContent(hoverPart) {
-        return ( localize(7381, 'There is a chat agent hover part here.'));
+        return ( localize(7638, 'There is a chat agent hover part here.'));
     }
 };
 ChatAgentHoverParticipant = ( (__decorate([

package/vscode/src/vs/workbench/contrib/chat/{common → browser}/languageModelToolsService.js

@@ -1,4 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { renderStringAsPlaintext } from 'vscode/vscode/vs/base/browser/markdownRenderer';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { CancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
@@ -6,16 +7,18 @@ import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localize } from 'vscode/vscode/vs/nls';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { ChatToolInvocation } from './chatProgressTypes/chatToolInvocation.js';
+import { ChatToolInvocation } from '../common/chatProgressTypes/chatToolInvocation.js';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
 
 let LanguageModelToolsService = class LanguageModelToolsService extends Disposable {
-    constructor(_extensionService, _contextKeyService, _chatService) {
+    constructor(_extensionService, _contextKeyService, _chatService, _dialogService) {
         super();
         this._extensionService = _extensionService;
         this._contextKeyService = _contextKeyService;
         this._chatService = _chatService;
+        this._dialogService = _dialogService;
         this._onDidChangeTools = ( (new Emitter()));
         this.onDidChangeTools = this._onDidChangeTools.event;
         this._onDidChangeToolsScheduler = ( (new RunOnceScheduler(() => this._onDidChangeTools.fire(), 750)));
@@ -31,9 +34,6 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         if (( (this._tools.has(toolData.id)))) {
             throw ( (new Error(`Tool "${toolData.id}" is already registered.`)));
         }
-        if (!toolData.supportedContentTypes.includes('text/plain')) {
-            toolData.supportedContentTypes.push('text/plain');
-        }
         this._tools.set(toolData.id, { data: toolData });
         this._onDidChangeToolsScheduler.schedule();
         toolData.when?.keys().forEach(key => this._toolContextKeys.add(key));
@@ -80,7 +80,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
     }
     getToolByName(name) {
         for (const toolData of this.getTools()) {
-            if (toolData.name === name) {
+            if (toolData.toolReferenceName === name) {
                 return toolData;
             }
         }
@@ -102,50 +102,47 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         if (dto.context) {
             const model = this._chatService.getSession(dto.context?.sessionId);
             const request = model.getRequests().at(-1);
-            const participantName = request.response?.agent?.fullName ?? '';
-            const getConfirmationMessages = async () => {
-                if (!tool.data.requiresConfirmation) {
-                    return undefined;
-                }
-                return (await tool.impl.provideToolConfirmationMessages(participantName, dto.parameters, token)) ?? {
-                    title: ( localize(3185, "Use {0}?", `"${tool.data.displayName ?? tool.data.id}"`)),
-                    message: ( localize(
-                        3186,
-                        "{0} will use {1}.",
-                        participantName,
-                        `"${tool.data.displayName ?? tool.data.id}"`
-                    )),
-                };
-            };
-            const [invocationMessage, confirmationMessages] = await Promise.all([
-                tool.impl.provideToolInvocationMessage(dto.parameters, token),
-                getConfirmationMessages()
-            ]);
-            const defaultMessage = ( localize(3187, "Using {0}", `"${tool.data.displayName ?? tool.data.id}"`));
-            toolInvocation = ( (new ChatToolInvocation(invocationMessage ?? defaultMessage, confirmationMessages)));
+            const prepared = tool.impl.prepareToolInvocation ?
+                await tool.impl.prepareToolInvocation(dto.parameters, token)
+                : undefined;
+            const defaultMessage = ( localize(2733, "Using {0}", `"${tool.data.displayName}"`));
+            const invocationMessage = prepared?.invocationMessage ?? defaultMessage;
+            toolInvocation = ( (new ChatToolInvocation(invocationMessage, prepared?.confirmationMessages)));
             token.onCancellationRequested(() => {
                 toolInvocation.confirmed.complete(false);
             });
             model.acceptResponseProgress(request, toolInvocation);
-            if (tool.data.requiresConfirmation) {
+            if (prepared?.confirmationMessages) {
                 const userConfirmed = await toolInvocation.confirmed.p;
                 if (!userConfirmed) {
                     throw ( (new CancellationError()));
                 }
             }
         }
+        else {
+            const prepared = tool.impl.prepareToolInvocation ?
+                await tool.impl.prepareToolInvocation(dto.parameters, token)
+                : undefined;
+            if (prepared?.confirmationMessages) {
+                const result = await this._dialogService.confirm({ message: prepared.confirmationMessages.title, detail: renderStringAsPlaintext(prepared.confirmationMessages.message) });
+                if (!result.confirmed) {
+                    throw ( (new CancellationError()));
+                }
+            }
+        }
         try {
-            return tool.impl.invoke(dto, countTokens, token);
+            return await tool.impl.invoke(dto, countTokens, token);
         }
         finally {
-            toolInvocation?.complete();
+            toolInvocation?.isCompleteDeferred.complete();
         }
     }
 };
 LanguageModelToolsService = ( (__decorate([
     ( (__param(0, IExtensionService))),
     ( (__param(1, IContextKeyService))),
-    ( (__param(2, IChatService)))
+    ( (__param(2, IChatService))),
+    ( (__param(3, IDialogService)))
 ], LanguageModelToolsService)));
 
 export { LanguageModelToolsService };

package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcomeContributions.js

@@ -0,0 +1,75 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
+import { localize } from 'vscode/vscode/vs/nls';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { checkProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
+
+const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
+    extensionPoint: 'chatViewsWelcome',
+    jsonSchema: {
+        description: ( localize(7639, 'Contributes a welcome message to a chat view')),
+        type: 'array',
+        items: {
+            additionalProperties: false,
+            type: 'object',
+            properties: {
+                icon: {
+                    type: 'string',
+                    description: ( localize(7640, 'The icon for the welcome message.')),
+                },
+                title: {
+                    type: 'string',
+                    description: ( localize(7641, 'The title of the welcome message.')),
+                },
+                content: {
+                    type: 'string',
+                    description: ( localize(
+                        7642,
+                        'The content of the welcome message. The first command link will be rendered as a button.'
+                    )),
+                },
+                when: {
+                    type: 'string',
+                    description: ( localize(7643, 'Condition when the welcome message is shown.')),
+                }
+            }
+        },
+        required: ['icon', 'title', 'contents', 'when'],
+    }
+});
+let ChatViewsWelcomeHandler = class ChatViewsWelcomeHandler {
+    static { this.ID = 'workbench.contrib.chatViewsWelcomeHandler'; }
+    constructor(logService) {
+        this.logService = logService;
+        chatViewsWelcomeExtensionPoint.setHandler((extensions, delta) => {
+            for (const extension of delta.added) {
+                for (const providerDescriptor of extension.value) {
+                    checkProposedApiEnabled(extension.description, 'chatParticipantPrivate');
+                    const when = ContextKeyExpr.deserialize(providerDescriptor.when);
+                    if (!when) {
+                        this.logService.error(`Could not deserialize 'when' clause for chatViewsWelcome contribution: ${providerDescriptor.when}`);
+                        continue;
+                    }
+                    const descriptor = {
+                        ...providerDescriptor,
+                        when,
+                        icon: ThemeIcon.fromString(providerDescriptor.icon),
+                        content: ( (new MarkdownString(providerDescriptor.content, { isTrusted: true }))),
+                    };
+                    ( (Registry.as(
+                        "workbench.registry.chat.viewsWelcome"
+                    ))).register(descriptor);
+                }
+            }
+        });
+    }
+};
+ChatViewsWelcomeHandler = ( (__decorate([
+    ( (__param(0, ILogService)))
+], ChatViewsWelcomeHandler)));
+
+export { ChatViewsWelcomeHandler };

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

@@ -1,3 +1,9 @@
+import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
+import { splitLinesIncludeSeparators } from 'vscode/vscode/vs/base/common/strings';
+import { isString } from 'vscode/vscode/vs/base/common/types';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { isLocation } from 'vscode/vscode/vs/editor/common/languages';
+
 class CodeMapperService {
     constructor() {
         this.providers = [];
@@ -22,6 +28,119 @@ class CodeMapperService {
         }
         return undefined;
     }
+    async mapCodeFromResponse(responseModel, response, token) {
+        const fenceLanguageRegex = /^`{3,}/;
+        const codeBlocks = [];
+        const currentBlock = [];
+        const markdownBeforeBlock = [];
+        let currentBlockUri = undefined;
+        let fence = undefined;
+        for (const lineOrUri of iterateLinesOrUris(responseModel)) {
+            if (isString(lineOrUri)) {
+                const fenceLanguageIdMatch = lineOrUri.match(fenceLanguageRegex);
+                if (fenceLanguageIdMatch) {
+                    if (fence !== undefined && fenceLanguageIdMatch[0] === fence) {
+                        fence = undefined;
+                        if (currentBlockUri) {
+                            codeBlocks.push({ code: currentBlock.join(''), resource: currentBlockUri, markdownBeforeBlock: markdownBeforeBlock.join('') });
+                            currentBlock.length = 0;
+                            markdownBeforeBlock.length = 0;
+                            currentBlockUri = undefined;
+                        }
+                    }
+                    else {
+                        fence = fenceLanguageIdMatch[0];
+                    }
+                }
+                else {
+                    if (fence !== undefined) {
+                        currentBlock.push(lineOrUri);
+                    }
+                    else {
+                        markdownBeforeBlock.push(lineOrUri);
+                    }
+                }
+            }
+            else {
+                currentBlockUri = lineOrUri;
+            }
+        }
+        const conversation = [];
+        for (const request of responseModel.session.getRequests()) {
+            const response = request.response;
+            if (!response || response === responseModel) {
+                break;
+            }
+            conversation.push({
+                type: 'request',
+                message: request.message.text
+            });
+            conversation.push({
+                type: 'response',
+                message: response.response.getMarkdown(),
+                result: response.result,
+                references: getReferencesAsDocumentContext(response.contentReferences)
+            });
+        }
+        return this.mapCode({ codeBlocks, conversation }, response, token);
+    }
+}
+function iterateLinesOrUris(responseModel) {
+    return {
+        *[Symbol.iterator]() {
+            let lastIncompleteLine = undefined;
+            for (const part of responseModel.response.value) {
+                if (part.kind === 'markdownContent' || part.kind === 'markdownVuln') {
+                    const lines = splitLinesIncludeSeparators(part.content.value);
+                    if (lines.length > 0) {
+                        if (lastIncompleteLine !== undefined) {
+                            lines[0] = lastIncompleteLine + lines[0];
+                        }
+                        lastIncompleteLine = isLineIncomplete(lines[lines.length - 1]) ? lines.pop() : undefined;
+                        for (const line of lines) {
+                            yield line;
+                        }
+                    }
+                }
+                else if (part.kind === 'codeblockUri') {
+                    yield part.uri;
+                }
+            }
+            if (lastIncompleteLine !== undefined) {
+                yield lastIncompleteLine;
+            }
+        }
+    };
+}
+function isLineIncomplete(line) {
+    const lastChar = line.charCodeAt(line.length - 1);
+    return lastChar !== 10  && lastChar !== 13 ;
+}
+function getReferencesAsDocumentContext(res) {
+    const map = ( new ResourceMap());
+    for (const r of res) {
+        let uri;
+        let range;
+        if (URI.isUri(r.reference)) {
+            uri = r.reference;
+        }
+        else if (isLocation(r.reference)) {
+            uri = r.reference.uri;
+            range = r.reference.range;
+        }
+        if (uri) {
+            const item = map.get(uri);
+            if (item) {
+                if (range) {
+                    item.ranges.push(range);
+                }
+            }
+            else {
+                map.set(uri, { uri, version: -1, ranges: range ? [range] : [] });
+            }
+        }
+    }
+    return [...( map.values())];
 }
 
-export { CodeMapperService };
+export { CodeMapperService, getReferencesAsDocumentContext };

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

@@ -4,6 +4,9 @@ class ChatToolInvocation {
     get isComplete() {
         return this._isComplete;
     }
+    get isCompleteDeferred() {
+        return this._isCompleteDeferred;
+    }
     get isCanceled() {
         return this._isCanceled;
     }
@@ -18,6 +21,7 @@ class ChatToolInvocation {
         this._confirmationMessages = _confirmationMessages;
         this.kind = 'toolInvocation';
         this._isComplete = false;
+        this._isCompleteDeferred = ( new DeferredPromise());
         this._confirmDeferred = ( new DeferredPromise());
         if (!_confirmationMessages) {
             this._isConfirmed = true;
@@ -27,15 +31,12 @@ class ChatToolInvocation {
             this._isConfirmed = confirmed;
             this._confirmationMessages = undefined;
             if (!confirmed) {
-                this.complete();
+                this._isCompleteDeferred.complete();
             }
         });
-    }
-    complete() {
-        if (this._isComplete) {
-            throw ( new Error('Invocation is already complete.'));
-        }
-        this._isComplete = true;
+        this._isCompleteDeferred.p.then(() => {
+            this._isComplete = true;
+        });
     }
     get confirmationMessages() {
         return this._confirmationMessages;
@@ -44,7 +45,8 @@ class ChatToolInvocation {
         return {
             kind: 'toolInvocationSerialized',
             invocationMessage: this.invocationMessage,
-            isConfirmed: this._isConfirmed ?? false
+            isConfirmed: this._isConfirmed ?? false,
+            isComplete: this._isComplete,
         };
     }
 }