@codingame/monaco-vscode-chat-service-override 26.2.1 → 27.0.0

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

@@ -58,7 +58,7 @@ let ChatAgentRecommendation = class ChatAgentRecommendation extends Disposable {
         const availabilityContextId = `${INSTALL_CONTEXT_PREFIX}.${extensionKey}`;
         const availabilityContext = ( new RawContextKey(availabilityContextId, false)).bindTo(this.contextKeyService);
         this.availabilityContextKeys.set(extensionKey, availabilityContext);
-        const title = ( localize2(4708, "New {0}", recommendation.displayName));
+        const title = ( localize2(4826, "New {0}", recommendation.displayName));
         this._register(registerAction2(class extends Action2 {
             constructor() {
                 super({

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

@@ -39,7 +39,7 @@ function isCodeBlockActionContext(thing) {
     return typeof thing === "object" && thing !== null && "code" in thing && "element" in thing;
 }
 function isCodeCompareBlockActionContext(thing) {
-    return typeof thing === "object" && thing !== null && "element" in thing;
+    return typeof thing === "object" && thing !== null && "element" in thing && "diffEditor" in thing && "toggleDiffViewMode" in thing;
 }
 function isResponseFiltered(context) {
     return isResponseVM(context.element) && context.element.errorDetails?.responseIsFiltered;
@@ -79,7 +79,7 @@ let CodeBlockActionRendering = class CodeBlockActionRendering extends Disposable
                         const label = labelService.getUriLabel(context.codemapperUri, {
                             relative: true
                         });
-                        return localize(4709, "Apply to {0}", label);
+                        return localize(4827, "Apply to {0}", label);
                     }
                     return super.getTooltip();
                 }
@@ -98,7 +98,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.copyCodeBlock",
-                title: ( localize2(4710, "Copy")),
+                title: ( localize2(4828, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -221,7 +221,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: APPLY_IN_EDITOR_ID,
-                title: ( localize2(4711, "Apply in Editor")),
+                title: ( localize2(4829, "Apply in Editor")),
                 precondition: ChatContextKeys.enabled,
                 f1: false,
                 category: CHAT_CATEGORY,
@@ -256,7 +256,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.insertCodeBlock",
-                title: ( localize2(4712, "Insert At Cursor")),
+                title: ( localize2(4830, "Insert At Cursor")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -292,7 +292,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.insertIntoNewFile",
-                title: ( localize2(4713, "Insert into New File")),
+                title: ( localize2(4831, "Insert into New File")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -356,7 +356,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.runInTerminal",
-                title: ( localize2(4714, "Insert into Terminal")),
+                title: ( localize2(4832, "Insert into Terminal")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -452,7 +452,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.nextCodeBlock",
-                title: ( localize2(4715, "Next Code Block")),
+                title: ( localize2(4833, "Next Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
                     mac: {
@@ -474,7 +474,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.previousCodeBlock",
-                title: ( localize2(4716, "Previous Code Block")),
+                title: ( localize2(4834, "Previous Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
                     mac: {
@@ -535,15 +535,16 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.applyCompareEdits",
-                title: ( localize2(4717, "Apply Edits")),
+                title: ( localize2(4835, "Apply Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.gitPullRequestGoToChanges,
-                precondition: ( ContextKeyExpr.and(EditorContextKeys.hasChanges, ( ChatContextKeys.editApplied.negate()))),
+                precondition: ( ContextKeyExpr.and(EditorContextKeys.hasChanges, ( ChatContextKeys.editApplied.negate()), ( EditorContextKeys.readOnly.negate()))),
                 menu: {
                     id: MenuId.ChatCompareBlock,
                     group: "navigation",
-                    order: 1
+                    order: 10,
+                    when: ( EditorContextKeys.readOnly.negate())
                 }
             });
         }
@@ -579,15 +580,16 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.discardCompareEdits",
-                title: ( localize2(4718, "Discard Edits")),
+                title: ( localize2(4836, "Discard Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.trash,
-                precondition: ( ContextKeyExpr.and(EditorContextKeys.hasChanges, ( ChatContextKeys.editApplied.negate()))),
+                precondition: ( ContextKeyExpr.and(EditorContextKeys.hasChanges, ( ChatContextKeys.editApplied.negate()), ( EditorContextKeys.readOnly.negate()))),
                 menu: {
                     id: MenuId.ChatCompareBlock,
                     group: "navigation",
-                    order: 2
+                    order: 11,
+                    when: ( EditorContextKeys.readOnly.negate())
                 }
             });
         }
@@ -597,6 +599,60 @@ function registerChatCodeCompareBlockActions() {
             editor.discard(context.element, context.edit);
         }
     });
+    registerAction2(class ToggleDiffViewModeAction extends ChatCompareCodeBlockAction {
+        constructor() {
+            super({
+                id: "workbench.action.chat.toggleCompareBlockDiffViewMode",
+                title: ( localize2(4837, "Toggle Inline/Side-by-Side Diff")),
+                f1: false,
+                category: CHAT_CATEGORY,
+                icon: Codicon.diffSingle,
+                toggled: {
+                    condition: EditorContextKeys.diffEditorInlineMode,
+                    icon: Codicon.diff
+                },
+                menu: {
+                    id: MenuId.ChatCompareBlock,
+                    group: "navigation",
+                    order: 1
+                }
+            });
+        }
+        runWithContext(_accessor, context) {
+            context.toggleDiffViewMode();
+        }
+    });
+    registerAction2(class OpenCompareBlockInDiffEditor extends ChatCompareCodeBlockAction {
+        constructor() {
+            super({
+                id: "workbench.action.chat.openCompareBlockInDiffEditor",
+                title: ( localize2(4838, "Open in Diff Editor")),
+                f1: false,
+                category: CHAT_CATEGORY,
+                icon: Codicon.goToFile,
+                menu: {
+                    id: MenuId.ChatCompareBlock,
+                    group: "navigation",
+                    order: 2
+                }
+            });
+        }
+        async runWithContext(accessor, context) {
+            const editorService = accessor.get(IEditorService);
+            const model = context.diffEditor.getModel();
+            if (!model) {
+                return;
+            }
+            await editorService.openEditor({
+                original: {
+                    resource: model.original.uri
+                },
+                modified: {
+                    resource: model.modified.uri
+                }
+            });
+        }
+    });
 }
 
 export { CodeBlockActionRendering, isCodeBlockActionContext, isCodeCompareBlockActionContext, registerChatCodeBlockActions, registerChatCodeCompareBlockActions };

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

@@ -118,8 +118,9 @@ class AttachFileToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFileToChatAction.ID,
-            title: ( localize2(4727, "Add File to Chat")),
+            title: ( localize2(4847, "Add File to Chat")),
             category: CHAT_CATEGORY,
+            icon: Codicon.attach,
             precondition: ChatContextKeys.enabled,
             f1: true,
             menu: [{
@@ -145,11 +146,16 @@ class AttachFileToChatAction extends AttachResourceAction {
                 id: MenuId.EditorContext,
                 group: "1_chat",
                 order: 2,
-                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(( ResourceContextKey.Scheme.isEqualTo(Schemas.file)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeRemote)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.untitled)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeUserData))))))
+                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( EditorContextKeys.hasNonEmptySelection.negate()), ( ContextKeyExpr.or(( ResourceContextKey.Scheme.isEqualTo(Schemas.file)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeRemote)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.untitled)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeUserData))))))
             }, {
-                id: MenuId.ChatEditorInlineGutter,
-                group: "2_chat",
-                order: 2,
+                id: MenuId.InlineChatEditorAffordance,
+                group: "0_chat",
+                order: 3,
+                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( EditorContextKeys.hasNonEmptySelection.negate())))
+            }, {
+                id: MenuId.ChatEditorInlineMenu,
+                group: "0_chat",
+                order: 3,
                 when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( EditorContextKeys.hasNonEmptySelection.negate())))
             }]
         });
@@ -174,7 +180,7 @@ class AttachFolderToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFolderToChatAction.ID,
-            title: ( localize2(4728, "Add Folder to Chat")),
+            title: ( localize2(4848, "Add Folder to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
             menu: {
@@ -205,7 +211,7 @@ class AttachPinnedEditorsToChatAction extends Action2 {
     constructor() {
         super({
             id: AttachPinnedEditorsToChatAction.ID,
-            title: ( localize2(4729, "Add Pinned Editors to Chat")),
+            title: ( localize2(4849, "Add Pinned Editors to Chat")),
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.enabled,
             f1: true
@@ -247,8 +253,9 @@ class AttachSelectionToChatAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionToChatAction.ID,
-            title: ( localize2(4730, "Add Selection to Chat")),
+            title: ( localize2(4850, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
+            icon: Codicon.attach,
             f1: true,
             precondition: ChatContextKeys.enabled,
             menu: [{
@@ -261,9 +268,14 @@ class AttachSelectionToChatAction extends Action2 {
                     ( ContextKeyExpr.or(( ResourceContextKey.Scheme.isEqualTo(Schemas.file)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeRemote)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.untitled)), ( ResourceContextKey.Scheme.isEqualTo(Schemas.vscodeUserData))))
                 ))
             }, {
-                id: MenuId.ChatEditorInlineGutter,
-                group: "2_chat",
-                order: 1,
+                id: MenuId.InlineChatEditorAffordance,
+                group: "0_chat",
+                order: 2,
+                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, EditorContextKeys.hasNonEmptySelection))
+            }, {
+                id: MenuId.ChatEditorInlineMenu,
+                group: "0_chat",
+                order: 2,
                 when: ( ContextKeyExpr.and(ChatContextKeys.enabled, EditorContextKeys.hasNonEmptySelection))
             }]
         });
@@ -321,7 +333,7 @@ class AttachSearchResultAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.insertSearchResults",
-            title: ( localize2(4731, "Add Search Results to Chat")),
+            title: ( localize2(4851, "Add Search Results to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
             menu: [{
@@ -384,20 +396,30 @@ class AttachContextAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.attachContext",
-            title: ( localize2(4732, "Add Context...")),
-            icon: Codicon.attach,
+            title: ( localize2(4852, "Add Context...")),
+            icon: Codicon.add,
             category: CHAT_CATEGORY,
             keybinding: {
                 when: ( ContextKeyExpr.and(ChatContextKeys.inChatInput, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)))),
                 primary: KeyMod.CtrlCmd | KeyCode.Slash,
                 weight: KeybindingWeight.EditorContrib
             },
-            menu: {
-                when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)), ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditorInline)), CTX_INLINE_CHAT_V2_ENABLED)))), ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeys.agentSupportsAttachments)))),
-                id: MenuId.ChatInputAttachmentToolbar,
+            menu: [{
+                when: ( ContextKeyExpr.and(( ChatContextKeys.inQuickChat.negate()), ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)), ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeys.agentSupportsAttachments)))),
+                id: MenuId.ChatInput,
                 group: "navigation",
-                order: 3
-            }
+                order: -1
+            }, {
+                when: ( ContextKeyExpr.and(( ChatContextKeys.inQuickChat.negate()), ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditorInline)), CTX_INLINE_CHAT_V2_ENABLED, ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeys.agentSupportsAttachments)))),
+                id: MenuId.ChatInput,
+                group: "navigation",
+                order: 2
+            }, {
+                when: ( ContextKeyExpr.and(ChatContextKeys.inQuickChat, ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeys.agentSupportsAttachments)))),
+                id: MenuId.ChatExecute,
+                group: "navigation",
+                order: -1
+            }]
         });
     }
     async run(accessor, ...args) {
@@ -465,7 +487,7 @@ class AttachContextAction extends Action2 {
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: placeholder ?? ( localize(4733, "Search attachments")),
+            placeholder: placeholder ?? ( localize(4853, "Search attachments")),
             providerOptions
         });
     }
@@ -538,7 +560,7 @@ class AttachContextAction extends Action2 {
         const pickerConfig = item.asPicker(widget);
         const store = ( new DisposableStore());
         const goBackItem = {
-            label: ( localize(4734, "Go back ↩")),
+            label: ( localize(4854, "Go back ↩")),
             alwaysShow: true
         };
         const configureItem = pickerConfig.configure ? {

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

@@ -14,7 +14,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.copyAll",
-                title: ( localize2(4740, "Copy All")),
+                title: ( localize2(4860, "Copy All")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -43,7 +43,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.copyItem",
-                title: ( localize2(4741, "Copy")),
+                title: ( localize2(4861, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -81,7 +81,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.copyKatexMathSource",
-                title: ( localize2(4742, "Copy Math Source")),
+                title: ( localize2(4862, "Copy Math Source")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {

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

@@ -7,6 +7,7 @@ import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
 function uriReplacer(_key, value) {
@@ -22,6 +23,7 @@ function registerChatDeveloperActions() {
     registerAction2(LogChatInputHistoryAction);
     registerAction2(LogChatIndexAction);
     registerAction2(InspectChatModelAction);
+    registerAction2(ClearRecentlyUsedLanguageModelsAction);
 }
 class LogChatInputHistoryAction extends Action2 {
     static {
@@ -30,7 +32,7 @@ class LogChatInputHistoryAction extends Action2 {
     constructor() {
         super({
             id: LogChatInputHistoryAction.ID,
-            title: ( localize2(4775, "Log Chat Input History")),
+            title: ( localize2(4863, "Log Chat Input History")),
             icon: Codicon.attach,
             category: Categories.Developer,
             f1: true,
@@ -49,7 +51,7 @@ class LogChatIndexAction extends Action2 {
     constructor() {
         super({
             id: LogChatIndexAction.ID,
-            title: ( localize2(4776, "Log Chat Index")),
+            title: ( localize2(4864, "Log Chat Index")),
             icon: Codicon.attach,
             category: Categories.Developer,
             f1: true,
@@ -68,7 +70,7 @@ class InspectChatModelAction extends Action2 {
     constructor() {
         super({
             id: InspectChatModelAction.ID,
-            title: ( localize2(4777, "Inspect Chat Model")),
+            title: ( localize2(4865, "Inspect Chat Model")),
             icon: Codicon.inspect,
             category: Categories.Developer,
             f1: true,
@@ -105,5 +107,22 @@ class InspectChatModelAction extends Action2 {
         });
     }
 }
+class ClearRecentlyUsedLanguageModelsAction extends Action2 {
+    static {
+        this.ID = "workbench.action.chat.clearRecentlyUsedLanguageModels";
+    }
+    constructor() {
+        super({
+            id: ClearRecentlyUsedLanguageModelsAction.ID,
+            title: ( localize2(4866, "Clear Recently Used Language Models")),
+            category: Categories.Developer,
+            f1: true,
+            precondition: ChatContextKeys.enabled
+        });
+    }
+    run(accessor) {
+        accessor.get(ILanguageModelsService).clearRecentlyUsedList();
+    }
+}
 
 export { registerChatDeveloperActions };

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

@@ -13,7 +13,7 @@ function registerChatFileTreeActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.nextFileTree",
-                title: ( localize2(4808, "Next File Tree")),
+                title: ( localize2(4897, "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(4809, "Previous File Tree")),
+                title: ( localize2(4898, "Previous File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,

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

@@ -0,0 +1 @@
+export declare function registerChatForkActions(): void;

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

@@ -0,0 +1,154 @@
+
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
+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 { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { ChatContextKeys } 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';
+import { isChatTreeItem, isResponseVM, isRequestVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+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(4899, "Fork Conversation")),
+                tooltip: ( localize2(4900, "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.lockedToCodingAgent.negate())))
+                }]
+            });
+        }
+        async run(accessor, ...args) {
+            const chatWidgetService = accessor.get(IChatWidgetService);
+            const chatService = accessor.get(IChatService);
+            const forkedTitlePrefix = ( localize(4901, "Forked: "));
+            if (URI.isUri(args[0])) {
+                const sourceSessionResource = args[0];
+                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(4902, "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);
+                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 chatModel = chatService.getSession(sessionResource);
+            if (!chatModel) {
+                return;
+            }
+            const targetRequestId = isRequestVM(item) ? item.id : isResponseVM(item) ? item.requestId : undefined;
+            if (!targetRequestId) {
+                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) {
+                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(4902, "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
+                    };
+                }
+            }
+            const modelRef = chatService.loadSessionFromData(forkedData);
+            if (!modelRef) {
+                return;
+            }
+            const newSessionResource = modelRef.object.sessionResource;
+            await chatWidgetService.openSession(newSessionResource, ChatViewPaneTarget);
+            modelRef.dispose();
+        }
+    });
+}
+
+export { registerChatForkActions };

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

@@ -13,10 +13,11 @@ import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { isExportableSessionData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
+import { ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 
 const defaultFileName = "chat.json";
 const filters = [{
-    name: ( localize(4810, "Chat Session")),
+    name: ( localize(4903, "Chat Session")),
     extensions: ["json"]
 }];
 function registerChatExportActions() {
@@ -25,7 +26,7 @@ function registerChatExportActions() {
             super({
                 id: "workbench.action.chat.export",
                 category: CHAT_CATEGORY,
-                title: ( localize2(4811, "Export Chat...")),
+                title: ( localize2(4904, "Export Chat...")),
                 precondition: ChatContextKeys.enabled,
                 f1: true
             });
@@ -62,7 +63,7 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.import",
-                title: ( localize2(4812, "Import Chat...")),
+                title: ( localize2(4905, "Import Chat...")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true
@@ -96,10 +97,7 @@ function registerChatExportActions() {
                 let resolvedTarget;
                 let options;
                 if (opts?.target === "chatViewPane") {
-                    const modelRef = chatService.loadSessionFromContent(data);
-                    if (!modelRef) {
-                        return;
-                    }
+                    const modelRef = chatService.loadSessionFromData(data);
                     sessionResource = modelRef.object.sessionResource;
                     resolvedTarget = ChatViewPaneTarget;
                     options = {
@@ -107,7 +105,7 @@ function registerChatExportActions() {
                     };
                 } else {
                     sessionResource = ChatEditorInput.getNewEditorUri();
-                    resolvedTarget = undefined;
+                    resolvedTarget = ACTIVE_GROUP;
                     options = {
                         target: {
                             data