@codingame/monaco-vscode-chat-service-override 30.0.0 → 31.0.0

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

@@ -52,14 +52,16 @@ import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 function registerChatContextActions() {
-    registerAction2(AttachContextAction);
-    registerAction2(AttachFileToChatAction);
-    registerAction2(AttachFolderToChatAction);
-    registerAction2(AttachSelectionToChatAction);
-    registerAction2(AttachSearchResultAction);
-    registerAction2(AttachPinnedEditorsToChatAction);
+    const store = ( new DisposableStore());
+    store.add(registerAction2(AttachContextAction));
+    store.add(registerAction2(AttachFileToChatAction));
+    store.add(registerAction2(AttachFolderToChatAction));
+    store.add(registerAction2(AttachSelectionToChatAction));
+    store.add(registerAction2(AttachSearchResultAction));
+    store.add(registerAction2(AttachPinnedEditorsToChatAction));
+    store.add(registerCreatePluginAction());
     registerPromptActions();
-    registerCreatePluginAction();
+    return store;
 }
 async function withChatView(accessor) {
     const chatWidgetService = accessor.get(IChatWidgetService);
@@ -120,7 +122,7 @@ class AttachFileToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFileToChatAction.ID,
-            title: ( localize2(4872, "Add File to Chat")),
+            title: ( localize2(4873, "Add File to Chat")),
             category: CHAT_CATEGORY,
             icon: Codicon.attach,
             precondition: ChatContextKeys.enabled,
@@ -182,7 +184,7 @@ class AttachFolderToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFolderToChatAction.ID,
-            title: ( localize2(4873, "Add Folder to Chat")),
+            title: ( localize2(4874, "Add Folder to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
             menu: {
@@ -213,7 +215,7 @@ class AttachPinnedEditorsToChatAction extends Action2 {
     constructor() {
         super({
             id: AttachPinnedEditorsToChatAction.ID,
-            title: ( localize2(4874, "Add Pinned Editors to Chat")),
+            title: ( localize2(4875, "Add Pinned Editors to Chat")),
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.enabled,
             f1: true
@@ -255,7 +257,7 @@ class AttachSelectionToChatAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionToChatAction.ID,
-            title: ( localize2(4875, "Add Selection to Chat")),
+            title: ( localize2(4876, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
             icon: Codicon.attach,
             f1: true,
@@ -335,7 +337,7 @@ class AttachSearchResultAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.insertSearchResults",
-            title: ( localize2(4876, "Add Search Results to Chat")),
+            title: ( localize2(4877, "Add Search Results to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
             menu: [{
@@ -398,7 +400,7 @@ class AttachContextAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.attachContext",
-            title: ( localize2(4877, "Add Context...")),
+            title: ( localize2(4878, "Add Context...")),
             icon: Codicon.add,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -489,7 +491,7 @@ class AttachContextAction extends Action2 {
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: placeholder ?? ( localize(4878, "Search attachments")),
+            placeholder: placeholder ?? ( localize(4879, "Search attachments")),
             providerOptions
         });
     }
@@ -562,7 +564,7 @@ class AttachContextAction extends Action2 {
         const pickerConfig = item.asPicker(widget);
         const store = ( new DisposableStore());
         const goBackItem = {
-            label: ( localize(4879, "Go back ↩")),
+            label: ( localize(4880, "Go back ↩")),
             alwaysShow: true
         };
         const configureItem = pickerConfig.configure ? {

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

@@ -1 +1,9 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IActionViewItemService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/actionViewItemService.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+export declare class ChatCopyActionRendering extends Disposable implements IWorkbenchContribution {
+    static readonly ID = "chat.copyActionRendering";
+    constructor(actionViewItemService: IActionViewItemService, instantiationService: IInstantiationService);
+}
 export declare function registerChatCopyActions(): void;

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

@@ -1,22 +1,126 @@
 
-import { getActiveWindow, isAncestor, getActiveElement, isHTMLElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { status } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
+import { append, $, getActiveWindow, isAncestor, getActiveElement, isHTMLElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-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 { MutableDisposable, Disposable, markAsSingleton } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IActionViewItemService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/actionViewItemService.service';
+import { MenuEntryActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { MenuId, MenuItemAction, registerAction2, Action2 } 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 { 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 { 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/actions/chatContextKeys';
 import { isRequestVM, isResponseVM, isChatTreeItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/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';
 
+const CopyItemActionId = "workbench.action.chat.copyItem";
+const copyFeedbackDuration = 1200;
+const copyIconClasses = ThemeIcon.asClassNameArray(Codicon.copy);
+const copiedIconClasses = ThemeIcon.asClassNameArray(Codicon.check);
+class ChatCopyActionViewItem extends MenuEntryActionViewItem {
+    constructor() {
+        super(...arguments);
+        this.copiedStateReset = this._register(( new MutableDisposable()));
+        this.actionRunnerListener = this._register(( new MutableDisposable()));
+        this.copied = false;
+    }
+    get actionRunner() {
+        return super.actionRunner;
+    }
+    set actionRunner(actionRunner) {
+        super.actionRunner = actionRunner;
+        this.bindActionRunner(actionRunner);
+    }
+    render(container) {
+        super.render(container);
+        this.bindActionRunner(super.actionRunner);
+        if (!this.element || !this.label) {
+            return;
+        }
+        this.element.classList.add("chat-copy-action");
+        this.clearLabelIconClasses();
+        this.label.style.backgroundImage = "";
+        this.label.classList.remove("icon");
+        this.label.textContent = "";
+        this.label.setAttribute("aria-hidden", "true");
+        const iconContainer = append(this.label, $(".chat-copy-action-icons"));
+        const copyIcon = append(iconContainer, $(".chat-copy-action-icon.chat-copy-action-icon-copy"));
+        copyIcon.classList.add(...copyIconClasses);
+        copyIcon.setAttribute("aria-hidden", "true");
+        const copiedIcon = append(
+            iconContainer,
+            $(".chat-copy-action-icon.chat-copy-action-icon-copied")
+        );
+        copiedIcon.classList.add(...copiedIconClasses);
+        copiedIcon.setAttribute("aria-hidden", "true");
+        this.renderCopiedState();
+    }
+    getTooltip() {
+        return this.copied ? ( localize(4886, "Copied")) : super.getTooltip();
+    }
+    updateAriaLabel() {
+        this.element?.setAttribute("aria-label", this.copied ? ( localize(4887, "Copied")) : ( localize(4888, "Copy")));
+    }
+    updateClass() {
+        super.updateClass();
+        this.clearLabelIconClasses();
+        if (this.label) {
+            this.label.style.backgroundImage = "";
+            this.label.classList.remove("icon");
+        }
+    }
+    clearLabelIconClasses() {
+        this.label?.classList.remove(...copyIconClasses, ...copiedIconClasses);
+    }
+    renderCopiedState() {
+        this.element?.classList.toggle("copied", this.copied);
+        this.updateTooltip();
+    }
+    bindActionRunner(actionRunner) {
+        this.actionRunnerListener.value = actionRunner.onDidRun(e => {
+            if (e.action !== this.action || e.error) {
+                return;
+            }
+            this.copied = true;
+            this.renderCopiedState();
+            this.copiedStateReset.value = disposableTimeout(() => {
+                this.copied = false;
+                this.renderCopiedState();
+            }, copyFeedbackDuration);
+            status(( localize(4889, "Copied to clipboard")));
+        });
+    }
+}
+let ChatCopyActionRendering = class ChatCopyActionRendering extends Disposable {
+    static {
+        this.ID = "chat.copyActionRendering";
+    }
+    constructor(actionViewItemService, instantiationService) {
+        super();
+        const disposable = this._register(
+            actionViewItemService.register(MenuId.ChatMessageFooter, CopyItemActionId, (action, options) => {
+                if (!(action instanceof MenuItemAction)) {
+                    return undefined;
+                }
+                return instantiationService.createInstance(ChatCopyActionViewItem, action, options);
+            })
+        );
+        markAsSingleton(disposable);
+    }
+};
+ChatCopyActionRendering = ( __decorate([( __param(0, IActionViewItemService)), ( __param(1, IInstantiationService))], ChatCopyActionRendering));
 function registerChatCopyActions() {
     registerAction2(class CopyAllAction extends Action2 {
         constructor() {
             super({
                 id: "workbench.action.chat.copyAll",
-                title: ( localize2(4885, "Copy All")),
+                title: ( localize2(4890, "Copy All")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -44,8 +148,8 @@ function registerChatCopyActions() {
     registerAction2(class CopyItemAction extends Action2 {
         constructor() {
             super({
-                id: "workbench.action.chat.copyItem",
-                title: ( localize2(4886, "Copy")),
+                id: CopyItemActionId,
+                title: ( localize2(4891, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -89,7 +193,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.copyFinalResponse",
-                title: ( localize2(4887, "Copy Final Response")),
+                title: ( localize2(4892, "Copy Final Response")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -123,7 +227,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.copyKatexMathSource",
-                title: ( localize2(4888, "Copy Math Source")),
+                title: ( localize2(4893, "Copy Math Source")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -166,4 +270,4 @@ function registerChatCopyActions() {
     });
 }
 
-export { registerChatCopyActions };
+export { ChatCopyActionRendering, registerChatCopyActions };

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

@@ -1,10 +1,13 @@
 
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { fromNow } from '@codingame/monaco-vscode-api/vscode/vs/base/common/date';
 import { URI, isUriComponents } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.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';
@@ -23,8 +26,55 @@ function registerChatDeveloperActions() {
     registerAction2(LogChatInputHistoryAction);
     registerAction2(LogChatIndexAction);
     registerAction2(InspectChatModelAction);
+    registerAction2(InspectChatModelReferencesAction);
     registerAction2(ClearRecentlyUsedLanguageModelsAction);
 }
+function formatChatModelReferenceInspection(accessor) {
+    const chatService = accessor.get(IChatService);
+    const agentSessionsService = accessor.get(IAgentSessionsService);
+    const debugInfo = chatService.getChatModelReferenceDebugInfo();
+    const referencedModels = debugInfo.models.filter(model => model.referenceCount > 0);
+    const pendingEditModels = debugInfo.models.filter(model => model.hasPendingEdits);
+    const pendingDisposalModels = debugInfo.models.filter(model => model.pendingDisposal);
+    let output = "# Chat Model References\n\n";
+    output += `- Live models: ${debugInfo.totalModels}\n`;
+    output += `- Live references: ${debugInfo.totalReferences}\n`;
+    output += `- Models with active references: ${referencedModels.length}\n`;
+    output += `- Models with pending edits: ${pendingEditModels.length}\n`;
+    output += `- Models pending disposal: ${pendingDisposalModels.length}\n\n`;
+    output += "Created by shows who loaded or created the model. Holders shows who currently keeps the model alive.\n\n";
+    if (!debugInfo.models.length) {
+        output += "No live chat models.\n";
+        return output;
+    }
+    for (const model of debugInfo.models) {
+        const liveModel = chatService.getSession(model.sessionResource);
+        const agentSession = agentSessionsService.getSession(model.sessionResource);
+        const archived = agentSession ? agentSession.isArchived() : "unknown";
+        const age = liveModel ? fromNow(liveModel.timing.created, true, true, true) : "unknown";
+        output += `## ${model.title || "(untitled)"}\n\n`;
+        output += `- Session: ${( model.sessionResource.toString())}\n`;
+        output += `- Created by: ${model.createdBy}\n`;
+        output += `- Archived: ${archived}\n`;
+        output += `- Age: ${age}\n`;
+        output += `- Initial location: ${model.initialLocation}\n`;
+        output += `- Imported: ${model.isImported}\n`;
+        output += `- Pending edits: ${model.hasPendingEdits}\n`;
+        output += `- Background keep-alive enabled: ${model.willKeepAlive}\n`;
+        output += `- Pending disposal: ${model.pendingDisposal}\n`;
+        output += `- Reference count: ${model.referenceCount}\n`;
+        if (model.holders.length) {
+            output += "- Holders:\n";
+            for (const holder of model.holders) {
+                output += `  - ${holder.holder}: ${holder.count}\n`;
+            }
+        } else {
+            output += "- Holders: none\n";
+        }
+        output += "\n";
+    }
+    return output;
+}
 class LogChatInputHistoryAction extends Action2 {
     static {
         this.ID = "workbench.action.chat.logInputHistory";
@@ -32,7 +82,7 @@ class LogChatInputHistoryAction extends Action2 {
     constructor() {
         super({
             id: LogChatInputHistoryAction.ID,
-            title: ( localize2(4889, "Log Chat Input History")),
+            title: ( localize2(4894, "Log Chat Input History")),
             icon: Codicon.attach,
             category: Categories.Developer,
             f1: true,
@@ -51,7 +101,7 @@ class LogChatIndexAction extends Action2 {
     constructor() {
         super({
             id: LogChatIndexAction.ID,
-            title: ( localize2(4890, "Log Chat Index")),
+            title: ( localize2(4895, "Log Chat Index")),
             icon: Codicon.attach,
             category: Categories.Developer,
             f1: true,
@@ -70,7 +120,7 @@ class InspectChatModelAction extends Action2 {
     constructor() {
         super({
             id: InspectChatModelAction.ID,
-            title: ( localize2(4891, "Inspect Chat Model")),
+            title: ( localize2(4896, "Inspect Chat Model")),
             icon: Codicon.inspect,
             category: Categories.Developer,
             f1: true,
@@ -107,6 +157,33 @@ class InspectChatModelAction extends Action2 {
         });
     }
 }
+class InspectChatModelReferencesAction extends Action2 {
+    static {
+        this.ID = "workbench.action.chat.inspectChatModelReferences";
+    }
+    constructor() {
+        super({
+            id: InspectChatModelReferencesAction.ID,
+            title: ( localize2(4897, "Inspect Chat Model References")),
+            icon: Codicon.inspect,
+            category: Categories.Developer,
+            f1: true,
+            precondition: ChatContextKeys.enabled
+        });
+    }
+    async run(accessor) {
+        const instantiationService = accessor.get(IInstantiationService);
+        const editorService = accessor.get(IEditorService);
+        await editorService.openEditor({
+            resource: undefined,
+            contents: instantiationService.invokeFunction(formatChatModelReferenceInspection),
+            languageId: "markdown",
+            options: {
+                pinned: true
+            }
+        });
+    }
+}
 class ClearRecentlyUsedLanguageModelsAction extends Action2 {
     static {
         this.ID = "workbench.action.chat.clearRecentlyUsedLanguageModels";
@@ -114,7 +191,7 @@ class ClearRecentlyUsedLanguageModelsAction extends Action2 {
     constructor() {
         super({
             id: ClearRecentlyUsedLanguageModelsAction.ID,
-            title: ( localize2(4892, "Clear Recently Used Language Models")),
+            title: ( localize2(4898, "Clear Recently Used Language Models")),
             category: Categories.Developer,
             f1: true,
             precondition: ChatContextKeys.enabled

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(4927, "Next File Tree")),
+                title: ( localize2(4933, "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(4928, "Previous File Tree")),
+                title: ( localize2(4934, "Previous File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,

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

@@ -7,8 +7,7 @@ import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common
 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 { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+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';
 import { isChatTreeItem, isResponseVM, isRequestVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
@@ -22,8 +21,8 @@ function registerChatForkActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.forkConversation",
-                title: ( localize2(4929, "Fork Conversation")),
-                tooltip: ( localize2(4930, "Fork conversation from this point")),
+                title: ( localize2(4935, "Fork Conversation")),
+                tooltip: ( localize2(4936, "Fork conversation from this point")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.repoForked,
@@ -32,27 +31,27 @@ function registerChatForkActions() {
                     id: MenuId.ChatMessageCheckpoint,
                     group: "navigation",
                     order: 3,
-                    when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ( ChatContextKeys.isFirstRequest.negate()), ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeys.chatSessionSupportsFork))))
+                    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);
-            accessor.get(IProgressService);
-            const forkedTitlePrefix = ( localize(4931, "Forked: "));
+            const forkedTitlePrefix = ( localize(4937, "Forked: "));
             if (URI.isUri(args[0])) {
                 const sourceSessionResource = args[0];
                 const contentProviderSchemes = chatSessionsService.getContentProviderSchemes();
                 if (contentProviderSchemes.includes(sourceSessionResource.scheme)) {
-                    await forkContributedChatSession(
+                    return await this.forkContributedChatSession(
                         sourceSessionResource,
                         undefined,
                         false,
                         chatSessionsService,
-                        chatWidgetService);
-                    return;
+                        chatWidgetService
+                    );
                 }
                 const chatModel = chatService.getSession(sourceSessionResource);
                 if (!chatModel) {
@@ -66,7 +65,7 @@ function registerChatForkActions() {
                 cleanData.sessionId = generateUuid();
                 const forkTimestamp = Date.now();
                 cleanData.creationDate = forkTimestamp;
-                cleanData.customTitle = chatModel.title.startsWith(forkedTitlePrefix) ? chatModel.title : ( localize(4932, "Forked: {0}", chatModel.title));
+                cleanData.customTitle = chatModel.title.startsWith(forkedTitlePrefix) ? chatModel.title : ( localize(4938, "Forked: {0}", chatModel.title));
                 for (const [index, req] of cleanData.requests.entries()) {
                     req.shouldBeRemovedOnSend = undefined;
                     req.isHidden = undefined;
@@ -80,7 +79,7 @@ function registerChatForkActions() {
                         };
                     }
                 }
-                const modelRef = chatService.loadSessionFromData(cleanData);
+                const modelRef = chatService.loadSessionFromData(cleanData, "ChatForkActions#forkCleanSession");
                 const newSessionResource = modelRef.object.sessionResource;
                 setTimeout(async () => {
                     try {
@@ -129,13 +128,7 @@ function registerChatForkActions() {
                         }
                     }
                 }
-                await forkContributedChatSession(
-                    sessionResource,
-                    request,
-                    true,
-                    chatSessionsService,
-                    chatWidgetService);
-                return;
+                return await this.forkContributedChatSession(sessionResource, request, true, chatSessionsService, chatWidgetService);
             }
             const chatModel = chatService.getSession(sessionResource);
             if (!chatModel) {
@@ -170,7 +163,7 @@ function registerChatForkActions() {
             forkedData.sessionId = generateUuid();
             const forkedTimestamp = Date.now();
             forkedData.creationDate = forkedTimestamp;
-            forkedData.customTitle = chatModel.title.startsWith(forkedTitlePrefix) ? chatModel.title : ( localize(4932, "Forked: {0}", chatModel.title));
+            forkedData.customTitle = chatModel.title.startsWith(forkedTitlePrefix) ? chatModel.title : ( localize(4938, "Forked: {0}", chatModel.title));
             for (const [index, req] of forkedData.requests.entries()) {
                 req.shouldBeRemovedOnSend = undefined;
                 req.isHidden = undefined;
@@ -184,13 +177,42 @@ function registerChatForkActions() {
                     };
                 }
             }
-            const modelRef = chatService.loadSessionFromData(forkedData);
+            const modelRef = chatService.loadSessionFromData(forkedData, "ChatForkActions#forkSession");
             if (!modelRef) {
                 return;
             }
-            const newSessionResource = modelRef.object.sessionResource;
-            await chatWidgetService.openSession(newSessionResource, ChatViewPaneTarget);
-            modelRef.dispose();
+            try {
+                const newSessionResource = modelRef.object.sessionResource;
+                await chatWidgetService.openSession(newSessionResource, ChatViewPaneTarget);
+            } finally {
+                modelRef.dispose();
+            }
+        }
+        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
+            );
+            this.pendingFork.set(pendingKey, forkPromise);
+            try {
+                await forkPromise;
+            } finally {
+                this.pendingFork.delete(pendingKey);
+            }
         }
     });
 }
@@ -199,8 +221,7 @@ async function forkContributedChatSession(
     request,
     openForkedSessionImmediately,
     chatSessionsService,
-    chatWidgetService,
-    progressService
+    chatWidgetService
 ) {
     const cts = ( new CancellationTokenSource());
     try {

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(4933, "Chat Session")),
+    name: ( localize(4939, "Chat Session")),
     extensions: ["json"]
 }];
 function registerChatExportActions() {
@@ -26,7 +26,7 @@ function registerChatExportActions() {
             super({
                 id: "workbench.action.chat.export",
                 category: CHAT_CATEGORY,
-                title: ( localize2(4934, "Export Chat...")),
+                title: ( localize2(4940, "Export Chat...")),
                 precondition: ChatContextKeys.enabled,
                 f1: true
             });
@@ -63,7 +63,7 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.import",
-                title: ( localize2(4935, "Import Chat...")),
+                title: ( localize2(4941, "Import Chat...")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true
@@ -97,12 +97,17 @@ function registerChatExportActions() {
                 let resolvedTarget;
                 let options;
                 if (opts?.target === "chatViewPane") {
-                    const modelRef = chatService.loadSessionFromData(data);
-                    sessionResource = modelRef.object.sessionResource;
-                    resolvedTarget = ChatViewPaneTarget;
-                    options = {
-                        pinned: true
-                    };
+                    const modelRef = chatService.loadSessionFromData(data, "ChatImportExport#importToChatView");
+                    try {
+                        sessionResource = modelRef.object.sessionResource;
+                        resolvedTarget = ChatViewPaneTarget;
+                        options = {
+                            pinned: true
+                        };
+                        await widgetService.openSession(sessionResource, resolvedTarget, options);
+                    } finally {
+                        modelRef.dispose();
+                    }
                 } else {
                     sessionResource = ChatEditorInput.getNewEditorUri();
                     resolvedTarget = ACTIVE_GROUP;
@@ -112,8 +117,8 @@ function registerChatExportActions() {
                         },
                         pinned: true
                     };
+                    await widgetService.openSession(sessionResource, resolvedTarget, options);
                 }
-                await widgetService.openSession(sessionResource, resolvedTarget, options);
             } catch (err) {
                 throw err;
             }