@codingame/monaco-vscode-chat-service-override 32.0.2 → 33.0.4

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

@@ -5,8 +5,9 @@ import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marsh
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 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 { Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ChatContextKeys, ChatContextKeyExprs } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { ResponseModelState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
@@ -17,205 +18,210 @@ import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/
 import { ChatViewPaneTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
-function registerChatForkActions() {
-    registerAction2(class ForkConversationAction extends Action2 {
-        constructor() {
-            super({
-                id: "workbench.action.chat.forkConversation",
-                title: ( localize2(4996, "Fork Conversation")),
-                tooltip: ( localize2(4997, "Fork conversation from this point")),
-                f1: false,
-                category: CHAT_CATEGORY,
-                icon: Codicon.repoForked,
-                precondition: ChatContextKeys.enabled,
-                menu: [{
-                    id: MenuId.ChatMessageCheckpoint,
-                    group: "navigation",
-                    order: 3,
-                    when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ( ChatContextKeys.isFirstRequest.negate()), ( ContextKeyExpr.or(( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeyExprs.isAgentHostSession)), ChatContextKeys.chatSessionSupportsFork))))
-                }]
-            });
-            this.pendingFork = ( new Map());
-        }
-        async run(accessor, ...args) {
-            const chatWidgetService = accessor.get(IChatWidgetService);
-            const chatService = accessor.get(IChatService);
-            const chatSessionsService = accessor.get(IChatSessionsService);
-            const forkedTitlePrefix = ( localize(4998, "Forked: "));
-            if (URI.isUri(args[0])) {
-                const sourceSessionResource = args[0];
-                const contentProviderSchemes = chatSessionsService.getContentProviderSchemes();
-                if (contentProviderSchemes.includes(getChatSessionType(sourceSessionResource))) {
-                    return await this.forkContributedChatSession(
-                        sourceSessionResource,
-                        undefined,
-                        false,
-                        chatSessionsService,
-                        chatWidgetService
-                    );
-                }
-                const chatModel = chatService.getSession(sourceSessionResource);
-                if (!chatModel) {
-                    return;
-                }
-                const serializedData = chatModel.toJSON();
-                if (serializedData.requests.length === 0) {
-                    return;
-                }
-                const cleanData = revive(JSON.parse(JSON.stringify(serializedData)));
-                cleanData.sessionId = generateUuid();
-                const forkTimestamp = Date.now();
-                cleanData.creationDate = forkTimestamp;
-                cleanData.customTitle = chatModel.title.startsWith(forkedTitlePrefix) ? chatModel.title : ( localize(4999, "Forked: {0}", chatModel.title));
-                for (const [index, req] of cleanData.requests.entries()) {
-                    req.shouldBeRemovedOnSend = undefined;
-                    req.isHidden = undefined;
-                    req.requestId = generateUuid();
-                    req.responseId = req.responseId ? generateUuid() : undefined;
-                    req.timestamp = forkTimestamp + index;
-                    if (req.response) {
-                        req.modelState = {
-                            value: ResponseModelState.Complete,
-                            completedAt: forkTimestamp + index
-                        };
-                    }
-                }
-                const modelRef = chatService.loadSessionFromData(cleanData, "ChatForkActions#forkCleanSession");
-                const newSessionResource = modelRef.object.sessionResource;
-                setTimeout(async () => {
-                    try {
-                        await chatWidgetService.openSession(newSessionResource, ChatViewPaneTarget);
-                    } finally {
-                        modelRef.dispose();
-                    }
-                }, 0);
-                return;
-            }
-            const arg = args[0];
-            let item = isChatTreeItem(arg) ? arg : isChatTreeItem(arg?.element) ? arg.element : isChatTreeItem(arg?.context) ? arg.context : isChatTreeItem(arg?.item) ? arg.item : undefined;
-            const widget = (item && chatWidgetService.getWidgetBySessionResource(item.sessionResource)) || chatWidgetService.lastFocusedWidget;
-            if (!isResponseVM(item) && !isRequestVM(item)) {
-                item = widget?.getFocus();
-            }
-            if (!item) {
-                return;
-            }
-            const sessionResource = widget?.viewModel?.sessionResource ?? (isChatTreeItem(item) ? item.sessionResource : undefined);
-            if (!sessionResource) {
-                return;
-            }
-            const targetRequestId = isRequestVM(item) ? item.id : isResponseVM(item) ? item.requestId : undefined;
-            if (!targetRequestId) {
-                return;
-            }
+class ForkConversationAction extends Action2 {
+    constructor() {
+        super({
+            id: "workbench.action.chat.forkConversation",
+            title: ( localize2(5019, "Fork Conversation")),
+            tooltip: ( localize2(5020, "Fork conversation from this point")),
+            f1: false,
+            category: CHAT_CATEGORY,
+            icon: Codicon.repoForked,
+            precondition: ChatContextKeys.enabled,
+            menu: [{
+                id: MenuId.ChatMessageCheckpoint,
+                group: "navigation",
+                order: 3,
+                when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ( ChatContextKeys.isFirstRequest.negate()), ( ContextKeyExpr.or(( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeyExprs.isAgentHostSession)), ChatContextKeys.chatSessionSupportsFork))))
+            }]
+        });
+        this.pendingFork = ( new Map());
+    }
+    async run(accessor, ...args) {
+        const chatWidgetService = accessor.get(IChatWidgetService);
+        const instantiationService = accessor.get(IInstantiationService);
+        const chatService = accessor.get(IChatService);
+        const chatSessionsService = accessor.get(IChatSessionsService);
+        const forkedTitlePrefix = ( localize(5021, "Forked: "));
+        if (URI.isUri(args[0])) {
+            const sourceSessionResource = args[0];
             const contentProviderSchemes = chatSessionsService.getContentProviderSchemes();
-            if (contentProviderSchemes.includes(getChatSessionType(sessionResource))) {
-                const contributedSession = await chatSessionsService.getOrCreateChatSession(sessionResource, CancellationToken.None);
-                let request = contributedSession.history.find(entry => entry.type === "request" && entry.id === targetRequestId);
-                if (!request) {
-                    const chatModel = chatService.getSession(sessionResource);
-                    const serializedData = chatModel?.toJSON();
-                    for (const [, entry] of serializedData?.requests.entries() ?? []) {
-                        if (entry.requestId === targetRequestId) {
-                            request = {
-                                id: entry.requestId,
-                                type: "request",
-                                prompt: typeof entry.message === "string" ? entry.message : entry.message.text,
-                                participant: entry.agent?.id ?? "",
-                                variableData: entry.variableData,
-                                modelId: entry.modelId
-                            };
-                            break;
-                        }
-                    }
-                }
-                return await this.forkContributedChatSession(sessionResource, request, true, chatSessionsService, chatWidgetService);
+            if (contentProviderSchemes.includes(getChatSessionType(sourceSessionResource))) {
+                return await this.forkContributedChatSession(
+                    sourceSessionResource,
+                    undefined,
+                    false,
+                    chatSessionsService,
+                    chatWidgetService
+                );
             }
-            const chatModel = chatService.getSession(sessionResource);
+            const chatModel = chatService.getSession(sourceSessionResource);
             if (!chatModel) {
                 return;
             }
             const serializedData = chatModel.toJSON();
-            const isRequestItem = isRequestVM(item);
-            let targetIndex = -1;
-            if (widget?.viewModel) {
-                let requestIndex = -1;
-                for (const entry of widget.viewModel.getItems()) {
-                    if (isRequestVM(entry)) {
-                        requestIndex += 1;
-                    }
-                    if (entry.id === item?.id) {
-                        targetIndex = isRequestVM(entry) ? Math.max(0, requestIndex - 1) : requestIndex;
-                        break;
-                    }
-                }
-            }
-            if (targetIndex < 0) {
-                const requestIndex = chatModel.getRequests().findIndex(r => r.id === targetRequestId);
-                targetIndex = isRequestItem ? Math.max(0, requestIndex - 1) : requestIndex;
-            }
-            if (targetIndex < 0) {
+            if (serializedData.requests.length === 0) {
                 return;
             }
-            const forkedData = revive(JSON.parse(JSON.stringify({
-                ...serializedData,
-                requests: serializedData.requests.slice(0, targetIndex + 1)
-            })));
-            forkedData.sessionId = generateUuid();
-            const forkedTimestamp = Date.now();
-            forkedData.creationDate = forkedTimestamp;
-            forkedData.customTitle = chatModel.title.startsWith(forkedTitlePrefix) ? chatModel.title : ( localize(4999, "Forked: {0}", chatModel.title));
-            for (const [index, req] of forkedData.requests.entries()) {
+            const cleanData = revive(JSON.parse(JSON.stringify(serializedData)));
+            cleanData.sessionId = generateUuid();
+            const forkTimestamp = Date.now();
+            cleanData.creationDate = forkTimestamp;
+            cleanData.customTitle = chatModel.title.startsWith(forkedTitlePrefix) ? chatModel.title : ( localize(5022, "Forked: {0}", chatModel.title));
+            for (const [index, req] of cleanData.requests.entries()) {
                 req.shouldBeRemovedOnSend = undefined;
                 req.isHidden = undefined;
                 req.requestId = generateUuid();
                 req.responseId = req.responseId ? generateUuid() : undefined;
-                req.timestamp = forkedTimestamp + index;
+                req.timestamp = forkTimestamp + index;
                 if (req.response) {
                     req.modelState = {
                         value: ResponseModelState.Complete,
-                        completedAt: forkedTimestamp + index
+                        completedAt: forkTimestamp + index
                     };
                 }
             }
-            const modelRef = chatService.loadSessionFromData(forkedData, "ChatForkActions#forkSession");
-            if (!modelRef) {
-                return;
+            const modelRef = chatService.loadSessionFromData(cleanData, "ChatForkActions#forkCleanSession");
+            const newSessionResource = modelRef.object.sessionResource;
+            setTimeout(async () => {
+                try {
+                    await this._openForkedSession(instantiationService, chatModel.sessionResource, newSessionResource);
+                } finally {
+                    modelRef.dispose();
+                }
+            }, 0);
+            return;
+        }
+        const arg = args[0];
+        let item = isChatTreeItem(arg) ? arg : isChatTreeItem(arg?.element) ? arg.element : isChatTreeItem(arg?.context) ? arg.context : isChatTreeItem(arg?.item) ? arg.item : undefined;
+        const widget = (item && chatWidgetService.getWidgetBySessionResource(item.sessionResource)) || chatWidgetService.lastFocusedWidget;
+        if (!isResponseVM(item) && !isRequestVM(item)) {
+            item = widget?.getFocus();
+        }
+        if (!item) {
+            return;
+        }
+        const sessionResource = widget?.viewModel?.sessionResource ?? (isChatTreeItem(item) ? item.sessionResource : undefined);
+        if (!sessionResource) {
+            return;
+        }
+        const targetRequestId = isRequestVM(item) ? item.id : isResponseVM(item) ? item.requestId : undefined;
+        if (!targetRequestId) {
+            return;
+        }
+        const contentProviderSchemes = chatSessionsService.getContentProviderSchemes();
+        if (contentProviderSchemes.includes(getChatSessionType(sessionResource))) {
+            const contributedSession = await chatSessionsService.getOrCreateChatSession(sessionResource, CancellationToken.None);
+            let request = contributedSession.history.find(entry => entry.type === "request" && entry.id === targetRequestId);
+            if (!request) {
+                const chatModel = chatService.getSession(sessionResource);
+                const serializedData = chatModel?.toJSON();
+                for (const [, entry] of serializedData?.requests.entries() ?? []) {
+                    if (entry.requestId === targetRequestId) {
+                        request = {
+                            id: entry.requestId,
+                            type: "request",
+                            prompt: typeof entry.message === "string" ? entry.message : entry.message.text,
+                            participant: entry.agent?.id ?? "",
+                            variableData: entry.variableData,
+                            modelId: entry.modelId
+                        };
+                        break;
+                    }
+                }
+            }
+            return await this.forkContributedChatSession(sessionResource, request, true, chatSessionsService, chatWidgetService);
+        }
+        const chatModel = chatService.getSession(sessionResource);
+        if (!chatModel) {
+            return;
+        }
+        const serializedData = chatModel.toJSON();
+        const isRequestItem = isRequestVM(item);
+        let targetIndex = -1;
+        if (widget?.viewModel) {
+            let requestIndex = -1;
+            for (const entry of widget.viewModel.getItems()) {
+                if (isRequestVM(entry)) {
+                    requestIndex += 1;
+                }
+                if (entry.id === item?.id) {
+                    targetIndex = isRequestVM(entry) ? Math.max(0, requestIndex - 1) : requestIndex;
+                    break;
+                }
             }
-            try {
-                const newSessionResource = modelRef.object.sessionResource;
-                await chatWidgetService.openSession(newSessionResource, ChatViewPaneTarget);
-            } finally {
-                modelRef.dispose();
+        }
+        if (targetIndex < 0) {
+            const requestIndex = chatModel.getRequests().findIndex(r => r.id === targetRequestId);
+            targetIndex = isRequestItem ? Math.max(0, requestIndex - 1) : requestIndex;
+        }
+        if (targetIndex < 0) {
+            return;
+        }
+        const forkedData = revive(JSON.parse(JSON.stringify({
+            ...serializedData,
+            requests: serializedData.requests.slice(0, targetIndex + 1)
+        })));
+        forkedData.sessionId = generateUuid();
+        const forkedTimestamp = Date.now();
+        forkedData.creationDate = forkedTimestamp;
+        forkedData.customTitle = chatModel.title.startsWith(forkedTitlePrefix) ? chatModel.title : ( localize(5022, "Forked: {0}", chatModel.title));
+        for (const [index, req] of forkedData.requests.entries()) {
+            req.shouldBeRemovedOnSend = undefined;
+            req.isHidden = undefined;
+            req.requestId = generateUuid();
+            req.responseId = req.responseId ? generateUuid() : undefined;
+            req.timestamp = forkedTimestamp + index;
+            if (req.response) {
+                req.modelState = {
+                    value: ResponseModelState.Complete,
+                    completedAt: forkedTimestamp + index
+                };
             }
         }
-        async forkContributedChatSession(
+        const modelRef = chatService.loadSessionFromData(forkedData, "ChatForkActions#forkSession");
+        if (!modelRef) {
+            return;
+        }
+        try {
+            const newSessionResource = modelRef.object.sessionResource;
+            await this._openForkedSession(instantiationService, chatModel.sessionResource, newSessionResource);
+        } finally {
+            modelRef.dispose();
+        }
+    }
+    async _openForkedSession(instantiationService, parentSessionResource, forkedSessionResource) {
+        await instantiationService.invokeFunction(async accessor => {
+            const chatWidgetService = accessor.get(IChatWidgetService);
+            await chatWidgetService.openSession(forkedSessionResource, ChatViewPaneTarget);
+        });
+    }
+    async forkContributedChatSession(
+        sourceSessionResource,
+        request,
+        openForkedSessionImmediately,
+        chatSessionsService,
+        chatWidgetService
+    ) {
+        const pendingKey = `${( sourceSessionResource.toString())}@${request?.id ?? "full"}`;
+        const pending = this.pendingFork.get(pendingKey);
+        if (pending) {
+            return pending;
+        }
+        const forkPromise = forkContributedChatSession(
             sourceSessionResource,
             request,
             openForkedSessionImmediately,
             chatSessionsService,
             chatWidgetService
-        ) {
-            const pendingKey = `${( sourceSessionResource.toString())}@${request?.id ?? "full"}`;
-            const pending = this.pendingFork.get(pendingKey);
-            if (pending) {
-                return pending;
-            }
-            const forkPromise = forkContributedChatSession(
-                sourceSessionResource,
-                request,
-                openForkedSessionImmediately,
-                chatSessionsService,
-                chatWidgetService
-            );
-            this.pendingFork.set(pendingKey, forkPromise);
-            try {
-                await forkPromise;
-            } finally {
-                this.pendingFork.delete(pendingKey);
-            }
+        );
+        this.pendingFork.set(pendingKey, forkPromise);
+        try {
+            await forkPromise;
+        } finally {
+            this.pendingFork.delete(pendingKey);
         }
-    });
+    }
 }
 async function forkContributedChatSession(
     sourceSessionResource,
@@ -239,4 +245,4 @@ async function forkContributedChatSession(
     }
 }
 
-export { registerChatForkActions };
+export { ForkConversationAction };

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

@@ -17,7 +17,7 @@ import { ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/s
 
 const defaultFileName = "chat.json";
 const filters = [{
-    name: ( localize(5000, "Chat Session")),
+    name: ( localize(5023, "Chat Session")),
     extensions: ["json"]
 }];
 function registerChatExportActions() {
@@ -26,7 +26,7 @@ function registerChatExportActions() {
             super({
                 id: "workbench.action.chat.export",
                 category: CHAT_CATEGORY,
-                title: ( localize2(5001, "Export Chat...")),
+                title: ( localize2(5024, "Export Chat...")),
                 precondition: ChatContextKeys.enabled,
                 f1: true
             });
@@ -63,7 +63,7 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.import",
-                title: ( localize2(5002, "Import Chat...")),
+                title: ( localize2(5025, "Import Chat...")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true

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

@@ -21,7 +21,7 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
     constructor() {
         super({
             id: ManageLanguageModelAuthenticationAction.ID,
-            title: ( localize2(5003, "Manage Language Model Access...")),
+            title: ( localize2(5026, "Manage Language Model Access...")),
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.enabled,
             menu: [{
@@ -91,9 +91,9 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
         if (extensionAuth.size === 0) {
             dialogService.prompt({
                 type: "info",
-                message: ( localize(5004, "No language models requiring authentication found.")),
+                message: ( localize(5027, "No language models requiring authentication found.")),
                 detail: ( localize(
-                    5005,
+                    5028,
                     "There are currently no language models that require authentication."
                 ))
             });
@@ -108,10 +108,10 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
             items.push({
                 type: "separator",
                 id: ownerId,
-                label: ( localize(5006, "{0}", extension.displayName || extension.name)),
+                label: ( localize(5029, "{0}", extension.displayName || extension.name)),
                 buttons: [{
                     iconClass: ThemeIcon.asClassName(Codicon.info),
-                    tooltip: ( localize(5007, "Open Extension"))
+                    tooltip: ( localize(5030, "Open Extension"))
                 }]
             });
             let addedTrustedSeparator = false;
@@ -120,7 +120,7 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                     if (allowedExt.trusted && !addedTrustedSeparator) {
                         items.push({
                             type: "separator",
-                            label: ( localize(5008, "Trusted by Microsoft"))
+                            label: ( localize(5031, "Trusted by Microsoft"))
                         });
                         addedTrustedSeparator = true;
                     }
@@ -133,15 +133,15 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                         disabled: allowedExt.trusted,
                         buttons: [{
                             iconClass: ThemeIcon.asClassName(Codicon.info),
-                            tooltip: ( localize(5007, "Open Extension"))
+                            tooltip: ( localize(5030, "Open Extension"))
                         }]
                     });
                 }
             } else {
                 items.push({
-                    label: ( localize(5009, "No extensions have access")),
+                    label: ( localize(5032, "No extensions have access")),
                     description: ( localize(
-                        5010,
+                        5033,
                         "No extensions are currently allowed to use models from {0}",
                         ownerId
                     )),
@@ -164,8 +164,8 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                     void extensionsWorkbenchService.open(extId);
                 }
             },
-            title: ( localize(5011, "Manage Language Model Access")),
-            placeHolder: ( localize(5012, "Choose which extensions can access language models"))
+            title: ( localize(5034, "Manage Language Model Access")),
+            placeHolder: ( localize(5035, "Choose which extensions can access language models"))
         });
         if (!result) {
             return;
@@ -188,7 +188,7 @@ class ConfigureLanguageModelsGroupAction extends Action2 {
     constructor() {
         super({
             id: "lm.addLanguageModelsProviderGroup",
-            title: ( localize(5013, "Add Language Models Group"))
+            title: ( localize(5036, "Add Language Models Group"))
         });
     }
     async run(accessor, languageModelsProviderGroup) {
@@ -208,7 +208,7 @@ class MigrateLanguageModelsGroupAction extends Action2 {
     constructor() {
         super({
             id: "lm.migrateLanguageModelsProviderGroup",
-            title: ( localize(5014, "Migrate Language Models Group"))
+            title: ( localize(5037, "Migrate Language Models Group"))
         });
     }
     async run(accessor, languageModelsProviderGroup) {

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

@@ -28,7 +28,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.openInEditor",
-                title: ( localize2(5015, "Move Chat into Editor Area")),
+                title: ( localize2(5038, "Move Chat into Editor Area")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -53,7 +53,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.openInNewWindow",
-                title: ( localize2(5016, "Move Chat into New Window")),
+                title: ( localize2(5039, "Move Chat into New Window")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -78,7 +78,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.openInSidebar",
-                title: ( localize2(5017, "Move Chat into Side Bar")),
+                title: ( localize2(5040, "Move Chat into Side Bar")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true
@@ -101,9 +101,9 @@ function registerMoveActions() {
         });
     }
     [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].forEach(id => {
-        appendOpenChatInViewMenuItem(id, ( localize(5018, "Move Chat into Secondary Side Bar")), Codicon.layoutSidebarRightDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.AuxiliaryBar)));
-        appendOpenChatInViewMenuItem(id, ( localize(5019, "Move Chat into Primary Side Bar")), Codicon.layoutSidebarLeftDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Sidebar)));
-        appendOpenChatInViewMenuItem(id, ( localize(5020, "Move Chat into Panel")), Codicon.layoutPanelDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Panel)));
+        appendOpenChatInViewMenuItem(id, ( localize(5041, "Move Chat into Secondary Side Bar")), Codicon.layoutSidebarRightDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.AuxiliaryBar)));
+        appendOpenChatInViewMenuItem(id, ( localize(5042, "Move Chat into Primary Side Bar")), Codicon.layoutSidebarLeftDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Sidebar)));
+        appendOpenChatInViewMenuItem(id, ( localize(5043, "Move Chat into Panel")), Codicon.layoutPanelDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Panel)));
     });
 }
 async function executeMoveToAction(accessor, moveTo, sessionResource) {

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

@@ -39,7 +39,7 @@ function isNewEditSessionActionContext(arg) {
 function registerNewChatActions() {
     MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
         submenu: MenuId.ChatNewMenu,
-        title: ( localize2(5021, "New Chat")),
+        title: ( localize2(5044, "New Chat")),
         icon: Codicon.plus,
         when: ( ContextKeyExpr.equals("view", ChatViewId)),
         group: "navigation",
@@ -50,7 +50,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chatEditor.newChat",
-                title: ( localize2(5022, "New Chat")),
+                title: ( localize2(5045, "New Chat")),
                 icon: Codicon.plus,
                 f1: false,
                 precondition: ChatContextKeys.enabled
@@ -64,7 +64,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: ACTION_ID_NEW_CHAT,
-                title: ( localize2(5021, "New Chat")),
+                title: ( localize2(5044, "New Chat")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.plus,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)))),
@@ -114,7 +114,7 @@ function registerNewChatActions() {
             constructor() {
                 super({
                     id: ACTION_ID_NEW_CHAT + variant.idSuffix,
-                    title: ( localize2(5021, "New Chat")),
+                    title: ( localize2(5044, "New Chat")),
                     category: CHAT_CATEGORY,
                     icon: variant.icon,
                     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)))),
@@ -139,7 +139,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.newLocalChat",
-                title: ( localize2(5023, "New Local Chat")),
+                title: ( localize2(5046, "New Local Chat")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.plus,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)))),
@@ -155,7 +155,7 @@ function registerNewChatActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatViewSessionTitleNavigationToolbar, {
         command: {
             id: ACTION_ID_NEW_CHAT,
-            title: ( localize2(5024, "Go Back")),
+            title: ( localize2(5047, "Go Back")),
             icon: Codicon.arrowLeft
         },
         when: ( ChatContextKeys.agentSessionsViewerOrientation.notEqualsTo(AgentSessionsViewerOrientation.SideBySide)),
@@ -165,7 +165,7 @@ function registerNewChatActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatTitleBarMenu, {
         command: {
             id: ACTION_ID_NEW_CHAT,
-            title: ( localize2(5021, "New Chat"))
+            title: ( localize2(5044, "New Chat"))
         },
         when: ChatContextKeys.enabled,
         group: "b_new",
@@ -175,7 +175,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.undoEdit",
-                title: ( localize2(5025, "Undo Last Edit")),
+                title: ( localize2(5048, "Undo Last Edit")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.discard,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanUndo, ChatContextKeys.enabled)),
@@ -197,7 +197,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.redoEdit",
-                title: ( localize2(5026, "Redo Last Edit")),
+                title: ( localize2(5049, "Redo Last Edit")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.redo,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled)),
@@ -221,8 +221,8 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.redoEdit2",
-                title: ( localize2(5027, "Redo")),
-                tooltip: ( localize2(5028, "Reapply discarded workspace changes and chat")),
+                title: ( localize2(5050, "Redo")),
+                tooltip: ( localize2(5051, "Reapply discarded workspace changes and chat")),
                 category: CHAT_CATEGORY,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled)),
                 f1: true,
@@ -269,7 +269,7 @@ async function runNewChatAction(accessor, context, executeCommandContext, sessio
     await clearChatSessionPreservingType(widget, viewsService, sessionType);
     widget.attachmentModel.clear(true);
     widget.focusInput();
-    accessibilityService.alert(( localize(5029, "New chat")));
+    accessibilityService.alert(( localize(5052, "New chat")));
     if (!executeCommandContext) {
         return;
     }