@codingame/monaco-vscode-chat-service-override 23.3.0 → 24.1.0

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

@@ -0,0 +1,152 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { TimeoutTimer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { RawContextKey, ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IExtensionGalleryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
+import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
+import { IWorkbenchExtensionManagementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
+import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+
+const INSTALL_CONTEXT_PREFIX = 'chat.installRecommendationAvailable';
+let ChatAgentRecommendation = class ChatAgentRecommendation extends Disposable {
+    static { this.ID = 'workbench.contrib.chatAgentRecommendation'; }
+    constructor(productService, extensionGalleryService, extensionManagementService, contextKeyService) {
+        super();
+        this.productService = productService;
+        this.extensionGalleryService = extensionGalleryService;
+        this.extensionManagementService = extensionManagementService;
+        this.contextKeyService = contextKeyService;
+        this.availabilityContextKeys = ( new Map());
+        this.refreshRequestId = 0;
+        const recommendations = this.productService.chatSessionRecommendations;
+        if (!recommendations?.length || !this.extensionGalleryService.isEnabled()) {
+            return;
+        }
+        for (const recommendation of recommendations) {
+            this.registerRecommendation(recommendation);
+        }
+        const refresh = () => this.refreshInstallAvailability();
+        this._register(this.extensionManagementService.onProfileAwareDidInstallExtensions(refresh));
+        this._register(this.extensionManagementService.onProfileAwareDidUninstallExtension(refresh));
+        this._register(this.extensionManagementService.onDidChangeProfile(refresh));
+        this.refreshInstallAvailability();
+    }
+    registerRecommendation(recommendation) {
+        const extensionKey = ExtensionIdentifier.toKey(recommendation.extensionId);
+        const commandId = `chat.installRecommendation.${extensionKey}.${recommendation.name}`;
+        const availabilityContextId = `${INSTALL_CONTEXT_PREFIX}.${extensionKey}`;
+        const availabilityContext = ( new RawContextKey(availabilityContextId, false)).bindTo(this.contextKeyService);
+        this.availabilityContextKeys.set(extensionKey, availabilityContext);
+        const title = ( localize2(4668, "New {0}", recommendation.displayName));
+        this._register(registerAction2(class extends Action2 {
+            constructor() {
+                super({
+                    id: commandId,
+                    title,
+                    tooltip: recommendation.description,
+                    f1: false,
+                    category: CHAT_CATEGORY,
+                    icon: Codicon.extensions,
+                    menu: [
+                        {
+                            id: MenuId.AgentSessionsInstallMenu,
+                            group: '0_install',
+                            when: ( ContextKeyExpr.equals(availabilityContextId, true))
+                        },
+                        {
+                            id: MenuId.AgentSessionsViewTitle,
+                            group: 'navigation@98',
+                            when: ( ContextKeyExpr.equals(availabilityContextId, true))
+                        },
+                        {
+                            id: MenuId.ChatNewMenu,
+                            group: '4_recommendations',
+                            when: ( ContextKeyExpr.equals(availabilityContextId, true))
+                        }
+                    ]
+                });
+            }
+            async run(accessor) {
+                const commandService = accessor.get(ICommandService);
+                const productService = accessor.get(IProductService);
+                const chatService = accessor.get(IChatService);
+                const installPreReleaseVersion = productService.quality !== 'stable';
+                await commandService.executeCommand('workbench.extensions.installExtension', recommendation.extensionId, {
+                    installPreReleaseVersion
+                });
+                await runPostInstallCommand(commandService, chatService, recommendation.postInstallCommand);
+            }
+        }));
+    }
+    refreshInstallAvailability() {
+        if (!this.availabilityContextKeys.size) {
+            return;
+        }
+        const currentRequest = ++this.refreshRequestId;
+        this.extensionManagementService.getInstalled().then(installedExtensions => {
+            if (currentRequest !== this.refreshRequestId) {
+                return;
+            }
+            const installed = ( new Set(( installedExtensions.map(ext => ExtensionIdentifier.toKey(ext.identifier.id)))));
+            for (const [extensionKey, context] of this.availabilityContextKeys) {
+                context.set(!( installed.has(extensionKey)));
+            }
+        }, () => {
+            if (currentRequest !== this.refreshRequestId) {
+                return;
+            }
+            for (const [, context] of this.availabilityContextKeys) {
+                context.set(false);
+            }
+        });
+    }
+};
+ChatAgentRecommendation = ( __decorate([
+    ( __param(0, IProductService)),
+    ( __param(1, IExtensionGalleryService)),
+    ( __param(2, IWorkbenchExtensionManagementService)),
+    ( __param(3, IContextKeyService))
+], ChatAgentRecommendation));
+async function runPostInstallCommand(commandService, chatService, commandId) {
+    if (!commandId) {
+        return;
+    }
+    await waitForCommandRegistration(commandId);
+    await chatService.activateDefaultAgent(ChatAgentLocation.Chat);
+    try {
+        await commandService.executeCommand(commandId);
+    }
+    catch {
+    }
+}
+function waitForCommandRegistration(commandId) {
+    if (( CommandsRegistry.getCommands().has(commandId))) {
+        return Promise.resolve();
+    }
+    return ( new Promise(resolve => {
+        const timer = ( new TimeoutTimer());
+        const listener = CommandsRegistry.onDidRegisterCommand((id) => {
+            if (id === commandId) {
+                listener.dispose();
+                timer.dispose();
+                resolve();
+            }
+        });
+        timer.cancelAndSet(() => {
+            listener.dispose();
+            resolve();
+        }, 10_000);
+    }));
+}
+
+export { ChatAgentRecommendation };

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

@@ -3,8 +3,8 @@ import { IActionViewItemService } from "@codingame/monaco-vscode-api/vscode/vs/p
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
-import { IChatResponseViewModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatViewModel";
-import { ICodeBlockActionContext, ICodeCompareBlockActionContext } from "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart";
+import { IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { ICodeBlockActionContext, ICodeCompareBlockActionContext } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart";
 export interface IChatCodeBlockActionContext extends ICodeBlockActionContext {
     element: IChatResponseViewModel;
 }

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

@@ -22,16 +22,16 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { accessibleViewInCodeBlock } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
 import { EditDeltaInfo } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource';
-import { reviewEdits } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { reviewEdits } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { ITerminalService, ITerminalEditorService, ITerminalGroupService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ChatCopyKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IChatWidgetService, IChatCodeBlockContextProviderService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { DefaultChatTextEditor } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { DefaultChatTextEditor } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ApplyCodeBlockOperation, InsertCodeBlockOperation } from './codeBlockOperations.js';
 
 const shellLangIds = [
@@ -83,7 +83,7 @@ let CodeBlockActionRendering = class CodeBlockActionRendering extends Disposable
                     const context = this._context;
                     if (isCodeBlockActionContext(context) && context.codemapperUri) {
                         const label = labelService.getUriLabel(context.codemapperUri, { relative: true });
-                        return localize(4647, "Apply to {0}", label);
+                        return localize(4671, "Apply to {0}", label);
                     }
                     return super.getTooltip();
                 }
@@ -106,7 +106,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyCodeBlock',
-                title: ( localize2(4648, "Copy")),
+                title: ( localize2(4672, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -231,7 +231,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: APPLY_IN_EDITOR_ID,
-                title: ( localize2(4649, "Apply in Editor")),
+                title: ( localize2(4673, "Apply in Editor")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -267,7 +267,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertCodeBlock',
-                title: ( localize2(4650, "Insert At Cursor")),
+                title: ( localize2(4674, "Insert At Cursor")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -301,7 +301,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
-                title: ( localize2(4651, "Insert into New File")),
+                title: ( localize2(4675, "Insert into New File")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -361,7 +361,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
-                title: ( localize2(4652, "Insert into Terminal")),
+                title: ( localize2(4676, "Insert into Terminal")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -455,7 +455,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextCodeBlock',
-                title: ( localize2(4653, "Next Code Block")),
+                title: ( localize2(4677, "Next Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
@@ -475,7 +475,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousCodeBlock',
-                title: ( localize2(4654, "Previous Code Block")),
+                title: ( localize2(4678, "Previous Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp, },
@@ -534,7 +534,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyCompareEdits',
-                title: ( localize2(4655, "Apply Edits")),
+                title: ( localize2(4679, "Apply Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.gitPullRequestGoToChanges,
@@ -576,7 +576,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.discardCompareEdits',
-                title: ( localize2(4656, "Discard Edits")),
+                title: ( localize2(4680, "Discard Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.trash,

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

@@ -1,4 +1,5 @@
 
+import { asArray } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { isThenable, DeferredPromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
@@ -12,7 +13,7 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
-import { AbstractGotoSymbolQuickAccessProvider } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess';
+import { AbstractGotoSymbolQuickAccessProvider } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
@@ -25,30 +26,27 @@ import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { resolveCommandsContext } from '@codingame/monaco-vscode-0b011daf-0f15-57de-bd5b-8953592c556c-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
+import { resolveCommandsContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
 import { ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { isEditorCommandsContext, EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { ExplorerFolderContext } from '@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common/vscode/vs/workbench/contrib/files/common/files';
-import { CTX_INLINE_CHAT_V2_ENABLED } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
-import { AnythingQuickAccessProvider } from '@codingame/monaco-vscode-64322fa2-7385-5f46-935b-8f243d98004b-common/vscode/vs/workbench/contrib/search/browser/anythingQuickAccess';
-import { isSearchTreeFileMatch, isSearchTreeMatch } from '@codingame/monaco-vscode-85f7fb0f-70f5-5a5e-831b-15c743a8bd11-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon';
-import { SymbolsQuickAccessProvider } from '@codingame/monaco-vscode-bc8c28cd-7a80-54a9-af1a-e6b1e7a7f34a-common/vscode/vs/workbench/contrib/search/browser/symbolsQuickAccess';
-import { SearchContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/search/common/constants';
+import { ExplorerFolderContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/files/common/files';
+import { CTX_INLINE_CHAT_V2_ENABLED } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { AnythingQuickAccessProvider } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/browser/anythingQuickAccess';
+import { isSearchTreeFileMatch, isSearchTreeMatch } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon';
+import { SymbolsQuickAccessProvider } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/browser/symbolsQuickAccess';
+import { SearchContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/common/constants';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { OmittedState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
 import { ChatAgentLocation, isSupportedChatFileScheme } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { showChatView } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService, IQuickChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { isChatContextPickerPickItem } from '@codingame/monaco-vscode-2c64d2c2-fdf7-5675-a2fe-f6f65fbdedbf-common/vscode/vs/workbench/contrib/chat/browser/chatContextPickService';
+import { isChatContextPickerPickItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService';
 import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service';
-import { isQuickChat } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { resizeImage } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { isQuickChat } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 import { registerPromptActions } from '../promptSyntax/promptFileActions.js';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -61,12 +59,10 @@ function registerChatContextActions() {
     registerPromptActions();
 }
 async function withChatView(accessor) {
-    const viewsService = accessor.get(IViewsService);
     const chatWidgetService = accessor.get(IChatWidgetService);
-    const layoutService = accessor.get(IWorkbenchLayoutService);
     const lastFocusedWidget = chatWidgetService.lastFocusedWidget;
     if (!lastFocusedWidget || lastFocusedWidget.location === ChatAgentLocation.Chat) {
-        return showChatView(viewsService, layoutService);
+        return chatWidgetService.revealWidget();
     }
     return lastFocusedWidget;
 }
@@ -118,7 +114,7 @@ class AttachFileToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFileToChatAction.ID,
-            title: ( localize2(4667, "Add File to Chat")),
+            title: ( localize2(4691, "Add File to Chat")),
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.enabled,
             f1: true,
@@ -167,7 +163,7 @@ class AttachFolderToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFolderToChatAction.ID,
-            title: ( localize2(4668, "Add Folder to Chat")),
+            title: ( localize2(4692, "Add Folder to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
             menu: {
@@ -196,7 +192,7 @@ class AttachSelectionToChatAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionToChatAction.ID,
-            title: ( localize2(4669, "Add Selection to Chat")),
+            title: ( localize2(4693, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ChatContextKeys.enabled,
@@ -261,7 +257,7 @@ class AttachSearchResultAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.insertSearchResults',
-            title: ( localize2(4670, 'Add Search Results to Chat')),
+            title: ( localize2(4694, 'Add Search Results to Chat')),
             category: CHAT_CATEGORY,
             f1: false,
             menu: [{
@@ -327,7 +323,7 @@ class AttachContextAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.attachContext',
-            title: ( localize2(4671, "Add Context...")),
+            title: ( localize2(4695, "Add Context...")),
             icon: Codicon.attach,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -410,7 +406,7 @@ class AttachContextAction extends Action2 {
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: placeholder ?? ( localize(4672, 'Search attachments')),
+            placeholder: placeholder ?? ( localize(4696, 'Search attachments')),
             providerOptions,
         });
     }
@@ -478,7 +474,7 @@ class AttachContextAction extends Action2 {
         const pickerConfig = item.asPicker(widget);
         const store = ( new DisposableStore());
         const goBackItem = {
-            label: ( localize(4673, 'Go back ↩')),
+            label: ( localize(4697, 'Go back ↩')),
             alwaysShow: true
         };
         const configureItem = pickerConfig.configure ? {
@@ -519,22 +515,34 @@ class AttachContextAction extends Action2 {
             }));
         }
         if (cts.token.isCancellationRequested) {
+            pickerConfig.dispose?.();
             return true;
         }
         const defer = ( new DeferredPromise());
         const addPromises = [];
-        store.add(qp.onDidAccept(e => {
+        store.add(qp.onDidAccept(async (e) => {
+            const noop = 'noop';
             const [selected] = qp.selectedItems;
             if (isChatContextPickerPickItem(selected)) {
                 const attachment = selected.asAttachment();
+                if (!attachment || attachment === noop) {
+                    return;
+                }
                 if (isThenable(attachment)) {
-                    addPromises.push(attachment.then(v => widget.attachmentModel.addContext(v)));
+                    addPromises.push(attachment.then(v => {
+                        if (v !== noop) {
+                            widget.attachmentModel.addContext(...asArray(v));
+                        }
+                    }));
                 }
                 else {
-                    widget.attachmentModel.addContext(attachment);
+                    widget.attachmentModel.addContext(...asArray(attachment));
                 }
             }
             if (selected === goBackItem) {
+                if (pickerConfig.goBack?.()) {
+                    return;
+                }
                 defer.complete(false);
             }
             if (selected === configureItem) {
@@ -547,6 +555,7 @@ class AttachContextAction extends Action2 {
         }));
         store.add(qp.onDidHide(() => {
             defer.complete(true);
+            pickerConfig.dispose?.();
         }));
         try {
             const result = await defer.p;

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

@@ -3,18 +3,18 @@ import { getActiveWindow, isAncestor, getActiveElement, isHTMLElement } from '@c
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
-import { CHAT_CATEGORY, stringifyItem } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { katexContainerClassName, katexContainerLatexAttributeName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/markdown/common/markedKatexExtension';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isRequestVM, isResponseVM, isChatTreeItem } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
-import { katexContainerClassName, katexContainerLatexAttributeName } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/markdown/common/markedKatexExtension';
+import { isRequestVM, isResponseVM, isChatTreeItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { CHAT_CATEGORY, stringifyItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 
 function registerChatCopyActions() {
     registerAction2(class CopyAllAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyAll',
-                title: ( localize2(4674, "Copy All")),
+                title: ( localize2(4703, "Copy All")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -24,10 +24,10 @@ function registerChatCopyActions() {
                 }
             });
         }
-        run(accessor, ...args) {
+        run(accessor, context) {
             const clipboardService = accessor.get(IClipboardService);
             const chatWidgetService = accessor.get(IChatWidgetService);
-            const widget = chatWidgetService.lastFocusedWidget;
+            const widget = (context?.sessionResource && chatWidgetService.getWidgetBySessionResource(context.sessionResource)) || chatWidgetService.lastFocusedWidget;
             if (widget) {
                 const viewModel = widget.viewModel;
                 const sessionAsText = viewModel?.getItems()
@@ -44,7 +44,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyItem',
-                title: ( localize2(4675, "Copy")),
+                title: ( localize2(4704, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -79,7 +79,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyKatexMathSource',
-                title: ( localize2(4676, "Copy Math Source")),
+                title: ( localize2(4705, "Copy Math Source")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {

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

@@ -16,7 +16,7 @@ class LogChatInputHistoryAction extends Action2 {
     constructor() {
         super({
             id: LogChatInputHistoryAction.ID,
-            title: ( localize2(4677, "Log Chat Input History")),
+            title: ( localize2(4706, "Log Chat Input History")),
             icon: Codicon.attach,
             category: Categories.Developer,
             f1: true,
@@ -33,7 +33,7 @@ class LogChatIndexAction extends Action2 {
     constructor() {
         super({
             id: LogChatIndexAction.ID,
-            title: ( localize2(4678, "Log Chat Index")),
+            title: ( localize2(4707, "Log Chat Index")),
             icon: Codicon.attach,
             category: Categories.Developer,
             f1: true,

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

@@ -3,17 +3,17 @@ import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isResponseVM } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
 function registerChatFileTreeActions() {
     registerAction2(class NextFileTreeAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextFileTree',
-                title: ( localize2(4713, "Next File Tree")),
+                title: ( localize2(4733, "Next File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,
@@ -32,7 +32,7 @@ function registerChatFileTreeActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousFileTree',
-                title: ( localize2(4714, "Previous File Tree")),
+                title: ( localize2(4734, "Previous File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,

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

@@ -4,19 +4,17 @@ import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IExtensionManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
-import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
+import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 export declare class ChatGettingStartedContribution extends Disposable implements IWorkbenchContribution {
     private readonly productService;
     private readonly extensionService;
-    private readonly viewsService;
     private readonly extensionManagementService;
     private readonly storageService;
-    private readonly layoutService;
+    private readonly chatWidgetService;
     static readonly ID = "workbench.contrib.chatGettingStarted";
     private recentlyInstalled;
     private static readonly hideWelcomeView;
-    constructor(productService: IProductService, extensionService: IExtensionService, viewsService: IViewsService, extensionManagementService: IExtensionManagementService, storageService: IStorageService, layoutService: IWorkbenchLayoutService);
+    constructor(productService: IProductService, extensionService: IExtensionService, extensionManagementService: IExtensionManagementService, storageService: IStorageService, chatWidgetService: IChatWidgetService);
     private registerListeners;
     private onDidInstallChat;
 }