@codingame/monaco-vscode-chat-service-override 37.1.0 → 37.3.0

package/vscode/src/vs/sessions/browser/parts/mobile/contributions/mobileMultiDiffVirtualizer.d.ts

@@ -0,0 +1,35 @@
+export interface IMobileMultiDiffVirtualizerMetrics {
+    readonly fileHeaderHeight: number;
+    readonly hunkHeaderHeight: number;
+    readonly rowHeight: number;
+    readonly bodyVerticalPadding: number;
+    readonly placeholderHeight: number;
+}
+export interface IMobileMultiDiffVirtualItem {
+    readonly collapsed?: boolean;
+    readonly state: "unloaded" | "loading" | "loaded" | "empty" | "error";
+    readonly estimatedHunkCount?: number;
+    readonly estimatedRowCount?: number;
+    readonly hunkCount?: number;
+    readonly rowCount?: number;
+}
+export interface IMobileMultiDiffVirtualLayoutOptions {
+    readonly viewportHeight: number;
+    readonly scrollTop: number;
+    readonly overscan?: number;
+    readonly metrics: IMobileMultiDiffVirtualizerMetrics;
+}
+export interface IMobileMultiDiffVirtualItemLayout {
+    readonly index: number;
+    readonly virtualTop: number;
+    readonly virtualHeight: number;
+    readonly renderTop: number;
+    readonly renderHeight: number;
+    readonly innerOffset: number;
+}
+export interface IMobileMultiDiffVirtualLayout {
+    readonly totalHeight: number;
+    readonly items: readonly IMobileMultiDiffVirtualItemLayout[];
+}
+export declare function computeMobileMultiDiffItemHeight(item: IMobileMultiDiffVirtualItem, metrics: IMobileMultiDiffVirtualizerMetrics): number;
+export declare function computeMobileMultiDiffVirtualLayout(items: readonly IMobileMultiDiffVirtualItem[], options: IMobileMultiDiffVirtualLayoutOptions): IMobileMultiDiffVirtualLayout;

package/vscode/src/vs/sessions/browser/parts/mobile/contributions/mobileMultiDiffVirtualizer.js

@@ -0,0 +1,67 @@
+
+
+function computeMobileMultiDiffItemHeight(item, metrics) {
+    if (item.collapsed) {
+        return metrics.fileHeaderHeight;
+    }
+    if (item.state !== 'loaded') {
+        if (item.state === 'unloaded' || item.state === 'loading') {
+            const estimatedHeight = computeDiffBodyHeight(item.estimatedHunkCount, item.estimatedRowCount, metrics);
+            if (estimatedHeight !== undefined) {
+                return metrics.fileHeaderHeight + estimatedHeight;
+            }
+        }
+        return metrics.fileHeaderHeight + metrics.placeholderHeight;
+    }
+    const bodyHeight = computeDiffBodyHeight(item.hunkCount, item.rowCount, metrics);
+    if (bodyHeight === undefined) {
+        return metrics.fileHeaderHeight + metrics.placeholderHeight;
+    }
+    return metrics.fileHeaderHeight + bodyHeight;
+}
+function computeDiffBodyHeight(hunkCount, rowCount, metrics) {
+    const normalizedHunkCount = Math.max(0, hunkCount ?? 0);
+    const normalizedRowCount = Math.max(0, rowCount ?? 0);
+    if (normalizedHunkCount === 0 && normalizedRowCount === 0) {
+        return undefined;
+    }
+    return metrics.bodyVerticalPadding
+        + normalizedHunkCount * metrics.hunkHeaderHeight
+        + normalizedRowCount * metrics.rowHeight;
+}
+function computeMobileMultiDiffVirtualLayout(items, options) {
+    const viewportHeight = Math.max(0, options.viewportHeight);
+    const scrollTop = Math.max(0, options.scrollTop);
+    const overscan = Math.max(0, options.overscan ?? 0);
+    const visibleStart = Math.max(0, scrollTop - overscan);
+    const visibleEnd = scrollTop + viewportHeight + overscan;
+    let totalHeight = 0;
+    const visibleItems = [];
+    for (let index = 0; index < items.length; index++) {
+        const virtualTop = totalHeight;
+        const virtualHeight = computeMobileMultiDiffItemHeight(items[index], options.metrics);
+        const virtualBottom = virtualTop + virtualHeight;
+        totalHeight = virtualBottom;
+        if (virtualHeight <= 0 || virtualTop >= visibleEnd || virtualBottom <= visibleStart) {
+            continue;
+        }
+        const innerOffset = clamp(scrollTop - virtualTop, 0, virtualHeight);
+        visibleItems.push({
+            index,
+            virtualTop,
+            virtualHeight,
+            renderTop: virtualTop,
+            renderHeight: virtualHeight,
+            innerOffset,
+        });
+    }
+    return {
+        totalHeight,
+        items: visibleItems,
+    };
+}
+function clamp(value, min, max) {
+    return Math.min(Math.max(value, min), max);
+}
+
+export { computeMobileMultiDiffItemHeight, computeMobileMultiDiffVirtualLayout };

package/vscode/src/vs/sessions/contrib/chat/browser/agentHostDelegation.d.ts

@@ -0,0 +1 @@
+export {};

package/vscode/src/vs/sessions/contrib/chat/browser/agentHostDelegation.js

@@ -0,0 +1,41 @@
+
+import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { CHAT_DELEGATE_TO_AGENT_HOST_SESSION_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
+import { LOCAL_AGENT_HOST_PROVIDER_ID } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/agentHostSessionsProvider';
+import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service';
+import { ISessionsManagementService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement.service';
+
+CommandsRegistry.registerCommand(CHAT_DELEGATE_TO_AGENT_HOST_SESSION_COMMAND_ID, async (accessor, request) => {
+    const logService = accessor.get(ILogService);
+    if (!request?.type || !request.prompt) {
+        logService.warn('[Sessions] Agent host delegation skipped: missing request payload');
+        return;
+    }
+    const sessionsService = accessor.get(ISessionsService);
+    const sessionsManagementService = accessor.get(ISessionsManagementService);
+    const sourceSession = sessionsService.activeSession.get();
+    if (!sourceSession) {
+        logService.warn('[Sessions] Agent host delegation skipped: no active session');
+        return;
+    }
+    const folderUri = sourceSession.workspace.get()?.folders.at(0)?.root;
+    if (!folderUri) {
+        logService.warn('[Sessions] Agent host delegation skipped: no active session workspace folder');
+        return;
+    }
+    const isLocalAgentHostTarget = request.type.startsWith('agent-host-');
+    const sessionTypeId = isLocalAgentHostTarget
+        ? request.type.slice('agent-host-'.length)
+        : request.type;
+    const providerId = isLocalAgentHostTarget ? LOCAL_AGENT_HOST_PROVIDER_ID : undefined;
+    try {
+        const session = sessionsManagementService.createNewSession(folderUri, { providerId, sessionTypeId });
+        sessionsService.insertAt(session, sourceSession.sessionId, 'right', true);
+        await sessionsManagementService.sendNewChatRequest(session, { query: request.prompt, attachedContext: request.attachedContext });
+    }
+    catch (e) {
+        logService.error(`[Sessions] Agent host delegation to '${sessionTypeId}' failed`, e);
+        throw e;
+    }
+});

package/vscode/src/vs/sessions/contrib/chat/browser/aiCustomizationWorkspaceService.d.ts

@@ -0,0 +1,85 @@
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { AICustomizationManagementSection } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService";
+import { IAICustomizationWorkspaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.service";
+import { IChatPromptSlashCommand } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
+import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
+import { ISessionsService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { PromptsType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
+import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
+/**
+ * Agent Sessions override of IAICustomizationWorkspaceService.
+ * Delegates to ISessionsService to provide the active session's
+ * worktree/repository as the project root, and supports worktree commit.
+ *
+ * Customization files are always committed to the main repository so they
+ * persist across worktrees. When a worktree is active the file is also
+ * copied into the worktree and committed there so the running session
+ * picks it up immediately.
+ */
+export declare class SessionsAICustomizationWorkspaceService implements IAICustomizationWorkspaceService {
+    private readonly sessionsService;
+    private readonly instantiationService;
+    private readonly promptsService;
+    private readonly commandService;
+    private readonly logService;
+    private readonly fileService;
+    private readonly notificationService;
+    private readonly labelService;
+    readonly _serviceBrand: undefined;
+    readonly activeProjectRoot: IObservable<URI | undefined>;
+    readonly activeProjectLabel: IObservable<string | undefined>;
+    readonly hasOverrideProjectRoot: IObservable<boolean>;
+    /**
+     * Transient override for the project root. When set, `activeProjectRoot`
+     * returns this value instead of the session-derived root.
+     */
+    private readonly _overrideRoot;
+    constructor(sessionsService: ISessionsService, instantiationService: IInstantiationService, promptsService: IPromptsService, commandService: ICommandService, logService: ILogService, fileService: IFileService, notificationService: INotificationService, labelService: ILabelService);
+    getActiveProjectRoot(): URI | undefined;
+    setOverrideProjectRoot(root: URI): void;
+    clearOverrideProjectRoot(): void;
+    readonly managementSections: readonly AICustomizationManagementSection[];
+    readonly isSessionsWindow = true;
+    readonly welcomePageFeatures: {
+        showGettingStartedBanner: boolean;
+    };
+    /**
+     * Commits customization files. Always commits to the main repository
+     * so the change persists across worktrees. When a worktree is active
+     * the file is also committed there so the session sees it immediately.
+     */
+    commitFiles(_projectRoot: URI, fileUris: URI[]): Promise<void>;
+    /**
+     * Commits the deletion of files that have already been removed from disk.
+     * Always stages + commits the removal in the main repository, and also
+     * in the worktree if one is active.
+     */
+    deleteFiles(_projectRoot: URI, fileUris: URI[]): Promise<void>;
+    /**
+     * Computes the repository-relative path for a file. The file may be
+     * located under the worktree or the repository root.
+     */
+    private getRelativePath;
+    /**
+     * Commits a single file to the main repository and optionally the worktree.
+     * Copies the file content between trees when needed.
+     */
+    private commitFileToRepos;
+    /**
+     * Commits the deletion of a file to the main repository and optionally
+     * the worktree. The file is already deleted from disk before this is called;
+     * `git add` on a deleted path stages the removal.
+     */
+    private commitDeletionToRepos;
+    generateCustomization(type: PromptsType): Promise<void>;
+    getFilteredPromptSlashCommands(token: CancellationToken): Promise<readonly IChatPromptSlashCommand[]>;
+    private static readonly _skillUIIntegrations;
+    getSkillUIIntegrations(): ReadonlyMap<string, string>;
+}

package/vscode/src/vs/sessions/contrib/chat/browser/aiCustomizationWorkspaceService.js

@@ -0,0 +1,247 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { relativePath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { AICustomizationManagementSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService';
+import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
+import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { CustomizationCreatorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/aiCustomization/customizationCreatorService';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
+import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { AGENT_HOST_SCHEME } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostUri';
+import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
+
+var SessionsAICustomizationWorkspaceService_1;
+let SessionsAICustomizationWorkspaceService = class SessionsAICustomizationWorkspaceService {
+    static {
+        SessionsAICustomizationWorkspaceService_1 = this;
+    }
+    constructor(
+        sessionsService,
+        instantiationService,
+        promptsService,
+        commandService,
+        logService,
+        fileService,
+        notificationService,
+        labelService
+    ) {
+        this.sessionsService = sessionsService;
+        this.instantiationService = instantiationService;
+        this.promptsService = promptsService;
+        this.commandService = commandService;
+        this.logService = logService;
+        this.fileService = fileService;
+        this.notificationService = notificationService;
+        this.labelService = labelService;
+        this.managementSections = [
+            AICustomizationManagementSection.Plugins,
+            AICustomizationManagementSection.McpServers,
+            AICustomizationManagementSection.Skills,
+            AICustomizationManagementSection.Instructions,
+            AICustomizationManagementSection.Agents,
+            AICustomizationManagementSection.Hooks,
+            AICustomizationManagementSection.Tools,
+            AICustomizationManagementSection.Automations,
+            AICustomizationManagementSection.HarnessSettings
+        ];
+        this.isSessionsWindow = true;
+        this.welcomePageFeatures = {
+            showGettingStartedBanner: true
+        };
+        this._overrideRoot = observableValue(this, undefined);
+        this.activeProjectRoot = derived(reader => {
+            const override = this._overrideRoot.read(reader);
+            if (override) {
+                return override;
+            }
+            const session = this.sessionsService.activeSession.read(reader);
+            const folder = session?.workspace.read(reader)?.folders[0];
+            const root = folder?.workingDirectory;
+            if (root?.scheme === AGENT_HOST_SCHEME) {
+                return undefined;
+            }
+            return root;
+        });
+        this.activeProjectLabel = derived(reader => {
+            const override = this._overrideRoot.read(reader);
+            if (override) {
+                return this.labelService.getUriBasenameLabel(override);
+            }
+            const session = this.sessionsService.activeSession.read(reader);
+            return session?.workspace.read(reader)?.folders[0]?.name;
+        });
+        this.hasOverrideProjectRoot = derived(reader => {
+            return this._overrideRoot.read(reader) !== undefined;
+        });
+    }
+    getActiveProjectRoot() {
+        const override = this._overrideRoot.get();
+        if (override) {
+            return override;
+        }
+        const session = this.sessionsService.activeSession.get();
+        const folder = session?.workspace.get()?.folders[0];
+        const root = folder?.workingDirectory;
+        if (root?.scheme === AGENT_HOST_SCHEME) {
+            return undefined;
+        }
+        return root;
+    }
+    setOverrideProjectRoot(root) {
+        this._overrideRoot.set(root, undefined);
+    }
+    clearOverrideProjectRoot() {
+        this._overrideRoot.set(undefined, undefined);
+    }
+    async commitFiles(_projectRoot, fileUris) {
+        const session = this.sessionsService.activeSession.get();
+        const folder = session?.workspace.get()?.folders[0];
+        if (!folder?.root) {
+            return;
+        }
+        for (const fileUri of fileUris) {
+            await this.commitFileToRepos(fileUri, folder.root, folder.workingDirectory);
+        }
+    }
+    async deleteFiles(_projectRoot, fileUris) {
+        const session = this.sessionsService.activeSession.get();
+        const folder = session?.workspace.get()?.folders[0];
+        if (!folder?.root) {
+            return;
+        }
+        for (const fileUri of fileUris) {
+            await this.commitDeletionToRepos(fileUri, folder.root, folder.workingDirectory);
+        }
+    }
+    getRelativePath(fileUri, repositoryUri, worktreeUri) {
+        if (worktreeUri) {
+            const rel = relativePath(worktreeUri, fileUri);
+            if (rel) {
+                return rel;
+            }
+        }
+        return relativePath(repositoryUri, fileUri);
+    }
+    async commitFileToRepos(fileUri, repositoryUri, worktreeUri) {
+        const relPath = this.getRelativePath(fileUri, repositoryUri, worktreeUri);
+        if (!relPath) {
+            return;
+        }
+        const repoFileUri = URI.joinPath(repositoryUri, relPath);
+        try {
+            if (( repoFileUri.toString()) !== ( fileUri.toString())) {
+                const content = await this.fileService.readFile(fileUri);
+                await this.fileService.writeFile(repoFileUri, content.value);
+            }
+            await this.commandService.executeCommand("github.copilot.cli.sessions.commitToRepository", {
+                repositoryUri,
+                fileUri: repoFileUri
+            });
+        } catch (error) {
+            this.logService.error(
+                "[SessionsAICustomizationWorkspaceService] Failed to commit to repository:",
+                error
+            );
+            if (worktreeUri) {
+                this.notificationService.notify({
+                    severity: Severity.Warning,
+                    message: ( localize(
+                        3549,
+                        "Your customization was saved to this session's worktree, but we couldn't apply it to the default branch. You may need to apply it manually."
+                    ))
+                });
+            }
+        }
+        if (worktreeUri) {
+            const worktreeFileUri = URI.joinPath(worktreeUri, relPath);
+            try {
+                if (( worktreeFileUri.toString()) !== ( fileUri.toString())) {
+                    const content = await this.fileService.readFile(fileUri);
+                    await this.fileService.writeFile(worktreeFileUri, content.value);
+                }
+                await this.commandService.executeCommand("github.copilot.cli.sessions.commitToWorktree", {
+                    worktreeUri,
+                    fileUri: worktreeFileUri
+                });
+            } catch (error) {
+                this.logService.error(
+                    "[SessionsAICustomizationWorkspaceService] Failed to commit to worktree:",
+                    error
+                );
+            }
+        }
+    }
+    async commitDeletionToRepos(fileUri, repositoryUri, worktreeUri) {
+        const relPath = this.getRelativePath(fileUri, repositoryUri, worktreeUri);
+        if (!relPath) {
+            return;
+        }
+        const repoFileUri = URI.joinPath(repositoryUri, relPath);
+        try {
+            if (await this.fileService.exists(repoFileUri)) {
+                await this.fileService.del(repoFileUri, {
+                    useTrash: true,
+                    recursive: true
+                });
+            }
+            await this.commandService.executeCommand("github.copilot.cli.sessions.commitToRepository", {
+                repositoryUri,
+                fileUri: repoFileUri
+            });
+        } catch (error) {
+            this.logService.error(
+                "[SessionsAICustomizationWorkspaceService] Failed to commit deletion to repository:",
+                error
+            );
+            if (worktreeUri) {
+                this.notificationService.notify({
+                    severity: Severity.Warning,
+                    message: ( localize(
+                        3550,
+                        "Your customization was removed from this session's worktree, but we couldn't apply the change to the default branch. You may need to remove it manually."
+                    ))
+                });
+            }
+        }
+        if (worktreeUri) {
+            const worktreeFileUri = URI.joinPath(worktreeUri, relPath);
+            try {
+                await this.commandService.executeCommand("github.copilot.cli.sessions.commitToWorktree", {
+                    worktreeUri,
+                    fileUri: worktreeFileUri
+                });
+            } catch (error) {
+                this.logService.error(
+                    "[SessionsAICustomizationWorkspaceService] Failed to commit deletion to worktree:",
+                    error
+                );
+            }
+        }
+    }
+    async generateCustomization(type) {
+        const creator = this.instantiationService.createInstance(CustomizationCreatorService);
+        await creator.createWithAI(type);
+    }
+    async getFilteredPromptSlashCommands(token) {
+        return await this.promptsService.getPromptSlashCommands(token);
+    }
+    static {
+        this._skillUIIntegrations = ( new Map([["act-on-feedback", ( localize(3551, "Used by the Submit Feedback button in the Changes toolbar"))], ["fix-ci", ( localize(3552, "Used by the Fix Checks button in the Changes toolbar"))], ["code-review", ( localize(3553, "Used by the Run Code Review button in the Changes view"))], ["generate-run-commands", ( localize(3554, "Used by the Run button in the title bar"))], ["create-pr", ( localize(3555, "Used by the Create PR button in the Changes toolbar"))], ["create-draft-pr", ( localize(3556, "Used by the Create Draft PR button in the Changes toolbar"))], ["update-pr", ( localize(3557, "Used by the Update Pull Request button in the Changes toolbar"))], ["merge-changes", ( localize(3558, "Used by the Merge button in the Changes toolbar"))], ["commit", ( localize(3559, "Used by the Commit button in the Changes toolbar"))]]));
+    }
+    getSkillUIIntegrations() {
+        return SessionsAICustomizationWorkspaceService_1._skillUIIntegrations;
+    }
+};
+SessionsAICustomizationWorkspaceService = SessionsAICustomizationWorkspaceService_1 = ( __decorate([( __param(0, ISessionsService)), ( __param(1, IInstantiationService)), ( __param(2, IPromptsService)), ( __param(3, ICommandService)), ( __param(4, ILogService)), ( __param(5, IFileService)), ( __param(6, INotificationService)), ( __param(7, ILabelService))], SessionsAICustomizationWorkspaceService));
+
+export { SessionsAICustomizationWorkspaceService };

package/vscode/src/vs/sessions/contrib/chat/browser/branchChatSessionAction.d.ts

@@ -0,0 +1,16 @@
+import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+/**
+ * Action ID for branching chat session to a new local session.
+ */
+export declare const ACTION_ID_BRANCH_CHAT_SESSION = "workbench.action.chat.branchChatSession";
+/**
+ * Action that allows users to branch the current chat session from a specific checkpoint.
+ * This creates a copy of the conversation up to the selected checkpoint, allowing users
+ * to explore alternative paths from any point in the conversation.
+ */
+export declare class BranchChatSessionAction extends Action2 {
+    static readonly ID = "workbench.action.chat.branchChatSession";
+    constructor();
+    run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void>;
+}

package/vscode/src/vs/sessions/contrib/chat/browser/branchChatSessionAction.js

@@ -0,0 +1,71 @@
+
+import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+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 { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { isRequestVM, isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
+import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+
+const ACTION_ID_BRANCH_CHAT_SESSION = "workbench.action.chat.branchChatSession";
+class BranchChatSessionAction extends Action2 {
+    static {
+        this.ID = ACTION_ID_BRANCH_CHAT_SESSION;
+    }
+    constructor() {
+        super({
+            id: BranchChatSessionAction.ID,
+            title: ( localize2(3560, "Branch Chat")),
+            tooltip: ( localize2(3561, "Branch to new session")),
+            icon: Codicon.reply,
+            f1: false,
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.requestInProgress.negate()))),
+            menu: [{
+                id: MenuId.ChatMessageCheckpoint,
+                group: "navigation",
+                order: 3,
+                when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ( ChatContextKeys.lockedToCodingAgent.negate()), (
+                ContextKeyExpr.false())))
+            }]
+        });
+    }
+    async run(accessor, ...args) {
+        const item = args[0];
+        const widgetService = accessor.get(IChatWidgetService);
+        const chatService = accessor.get(IChatService);
+        if (!item || (!isRequestVM(item) && !isResponseVM(item))) {
+            return;
+        }
+        const widget = widgetService.getWidgetBySessionResource(item.sessionResource);
+        if (!widget || !widget.viewModel) {
+            return;
+        }
+        const chatModel = widget.viewModel.model;
+        if (!chatModel) {
+            return;
+        }
+        const checkpointRequestId = isRequestVM(item) ? item.id : item.requestId;
+        const serializedData = revive(structuredClone(chatModel.toJSON()));
+        serializedData.sessionId = generateUuid();
+        delete serializedData.customTitle;
+        const checkpointIndex = serializedData.requests.findIndex(r => r.requestId === checkpointRequestId);
+        if (checkpointIndex === -1) {
+            return;
+        }
+        serializedData.requests = serializedData.requests.slice(0, checkpointIndex);
+        for (const request of serializedData.requests) {
+            delete request.shouldBeRemovedOnSend;
+            delete request.isHidden;
+        }
+        if (serializedData.requests.length === 0) {
+            return;
+        }
+        const modelRef = chatService.loadSessionFromData(serializedData);
+        throw ( new Error("Branching chat sessions is not yet supported." + modelRef.object.title));
+    }
+}
+
+export { ACTION_ID_BRANCH_CHAT_SESSION, BranchChatSessionAction };

package/vscode/src/vs/sessions/contrib/chat/browser/btwSlashCommand.contribution.d.ts

@@ -0,0 +1,15 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
+import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service";
+import { ISessionsService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service";
+import { ISessionsPartService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsPartService.service";
+import { ISessionsManagementService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionsManagement.service";
+export declare class BtwSlashCommandContribution extends Disposable implements IWorkbenchContribution {
+    static readonly ID = "sessions.contrib.btwSlashCommand";
+    constructor(slashCommandService: IChatSlashCommandService, sessionsService: ISessionsService, sessionsManagementService: ISessionsManagementService, sessionsPartService: ISessionsPartService, chatService: IChatService, chatWidgetService: IChatWidgetService, environmentService: IWorkbenchEnvironmentService, logService: ILogService, notificationService: INotificationService);
+}