@codingame/monaco-vscode-api 29.1.0 → 30.0.0

package/vscode/src/vs/workbench/api/common/extHostChatAgents2.js

@@ -18,7 +18,7 @@ import { LocalChatSessionUri } from '../../contrib/chat/common/model/chatUri.js'
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { MainContext } from './extHost.protocol.js';
-import { ChatResponseWarningPart, ChatResponseReferencePart, ChatTaskResult, ChatTask, ChatResponseProgressPart, ChatResponseThinkingProgressPart as ChatResponseThinkingProgressPart$1, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponsePart, ChatResponseQuestionCarouselPart as ChatResponseQuestionCarouselPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseWorkspaceEditPart as ChatResponseWorkspaceEditPart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseHookPart as ChatResponseHookPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseFilesPart, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatAgentRequest, ChatLocation, Selection, Range, ChatAgentResult, ChatLanguageModelToolReference, ChatPromptReference, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, MarkdownString as MarkdownString$1 } from './extHostTypeConverters.js';
+import { ChatResponseWarningPart, ChatResponseReferencePart, ChatTaskResult, ChatTask, ChatResponseProgressPart, ChatResponseThinkingProgressPart as ChatResponseThinkingProgressPart$1, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponsePart, ChatResponseQuestionCarouselPart as ChatResponseQuestionCarouselPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseWorkspaceEditPart as ChatResponseWorkspaceEditPart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseHookPart as ChatResponseHookPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseFilesPart, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatSessionCustomizationType, ChatAgentRequest, ChatLocation, Selection, Range, ChatAgentResult, ChatLanguageModelToolReference, ChatPromptReference, ChatRequestModeInstructions, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, MarkdownString as MarkdownString$1 } from './extHostTypeConverters.js';
 import { ChatResponseTextEditPart, ChatResponseNotebookEditPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseConfirmationPart, ChatResponseQuestionCarouselPart, ChatResponseCodeCitationPart, ChatResponseMovePart, ChatResponseExtensionsPart, ChatResponseExternalEditPart, ChatResponseThinkingProgressPart, ChatResponsePullRequestPart, ChatResponseProgressPart2, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseAnchorPart, ChatResponseWorkspaceEditPart, ChatResponseHookPart, ChatResponseCommandButtonPart, ChatResponseFileTreePart, ChatResponseCodeblockUriPart, ChatResponseMarkdownPart, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ThemeIcon } from './extHostTypes.js';
 import { PromptsType } from '../../contrib/chat/common/promptSyntax/promptTypes.js';
 import { MarkdownString } from './extHostTypes/markdownString.js';
@@ -398,6 +398,9 @@ class ExtHostChatAgents2 extends Disposable {
     static {
         this._contributionsProviderIdPool = 0;
     }
+    static {
+        this._customizationProviderIdPool = 0;
+    }
     get activeChatPanelSessionResource() {
         return this._activeChatPanelSessionResource;
     }
@@ -449,6 +452,7 @@ class ExtHostChatAgents2 extends Disposable {
         this._agents = ( new Map());
         this._participantDetectionProviders = ( new Map());
         this._promptFileProviders = ( new Map());
+        this._customizationProviders = ( new Map());
         this._sessionDisposables = this._register(( new DisposableResourceMap()));
         this._completionDisposables = this._register(( new DisposableMap()));
         this._inFlightRequests = ( new Set());
@@ -563,6 +567,53 @@ class ExtHostChatAgents2 extends Disposable {
         }
         return resources;
     }
+    registerChatSessionCustomizationProvider(extension, chatSessionType, metadata, provider) {
+        const handle = ExtHostChatAgents2._customizationProviderIdPool++;
+        this._customizationProviders.set(handle, {
+            extension,
+            provider
+        });
+        const metadataDto = {
+            label: metadata.label,
+            iconId: metadata.iconId,
+            unsupportedTypes: metadata.unsupportedTypes?.map(t => ChatSessionCustomizationType.from(t))
+        };
+        this._proxy.$registerChatSessionCustomizationProvider(handle, chatSessionType, metadataDto, extension.identifier);
+        const disposables = ( new DisposableStore());
+        if (provider.onDidChange) {
+            disposables.add(provider.onDidChange(() => {
+                this._proxy.$onDidChangeCustomizations(handle);
+            }));
+        }
+        disposables.add(toDisposable(() => {
+            this._customizationProviders.delete(handle);
+            this._proxy.$unregisterChatSessionCustomizationProvider(handle);
+        }));
+        return disposables;
+    }
+    async $provideChatSessionCustomizations(handle, token) {
+        const providerData = this._customizationProviders.get(handle);
+        if (!providerData) {
+            return undefined;
+        }
+        try {
+            const items = await providerData.provider.provideChatSessionCustomizations(token);
+            if (!items) {
+                return undefined;
+            }
+            return ( items.map(item => ({
+                uri: item.uri,
+                type: ChatSessionCustomizationType.from(item.type),
+                name: item.name,
+                description: item.description,
+                groupKey: item.groupKey,
+                badge: item.badge,
+                badgeTooltip: item.badgeTooltip
+            })));
+        } catch (err) {
+            return undefined;
+        }
+    }
     async $detectChatParticipant(handle, requestDto, context, options, token) {
         const detector = this._participantDetectionProviders.get(handle);
         if (!detector) {
@@ -827,6 +878,7 @@ class ExtHostChatAgents2 extends Disposable {
                 }
             }
             const editedFileEvents = isProposedApiEnabled(extension) ? h.request.editedFileEvents : undefined;
+            const modeInstructions2 = isProposedApiEnabled(extension) && h.request.modeInstructions ? ChatRequestModeInstructions.to(h.request.modeInstructions) : undefined;
             const turn = new ChatRequestTurn(
                 h.request.message,
                 h.request.command,
@@ -834,7 +886,9 @@ class ExtHostChatAgents2 extends Disposable {
                 h.request.agentId,
                 toolReferences,
                 editedFileEvents,
-                h.request.requestId
+                h.request.requestId,
+                undefined,
+                modeInstructions2
             );
             res.push(turn);
             const parts = coalesce(( h.response.map(r => ChatResponsePart.toContent(r, this._commands.converter))));
@@ -898,8 +952,7 @@ class ExtHostChatAgents2 extends Disposable {
         }
         const feedback = {
             result: ehResult,
-            kind,
-            unhelpfulReason: isProposedApiEnabled(agent.extension) ? voteAction.reason : undefined
+            kind
         };
         agent.acceptFeedback(( Object.freeze(feedback)));
     }

package/vscode/src/vs/workbench/api/common/extHostChatSessions.js

@@ -16,7 +16,7 @@ import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { MainContext } from './extHost.protocol.js';
 import { ChatAgentResponseStream } from './extHostChatAgents2.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
-import { ChatSessionItem, ChatAgentRequest, Location, Diagnostic, ChatResponsePart } from './extHostTypeConverters.js';
+import { ChatSessionItem, ChatAgentRequest, ChatRequestModeInstructions, Location, Diagnostic, ChatResponsePart } from './extHostTypeConverters.js';
 import { Disposable as Disposable$1, ChatRequestTurn, ChatReferenceDiagnostic } from './extHostTypes.js';
 import { Location as Location$1 } from './extHostTypes/location.js';
 
@@ -609,7 +609,8 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
             [],
             undefined,
             request.id,
-            request.modelId
+            request.modelId,
+            ChatRequestModeInstructions.to(request.modeInstructions)
         );
     }
     getChatSessionItemController(chatSessionType) {
@@ -644,7 +645,8 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
             variableData: variables.length > 0 ? {
                 variables
             } : undefined,
-            modelId: turn.modelId
+            modelId: turn.modelId,
+            modeInstructions: ChatRequestModeInstructions.from(turn.modeInstructions2)
         };
     }
     convertReferenceToVariable(ref) {

package/vscode/src/vs/workbench/api/common/extHostFileSystemEventService.js

@@ -47,8 +47,15 @@ class FileSystemWatcher {
             this._config += 0b100;
         }
         const ignoreCase = typeof globPattern === "string" ? !((fileSystemInfo.getCapabilities(Schemas.file) ?? 0) & FileSystemProviderCapabilities.PathCaseSensitive) : fileSystemInfo.extUri.ignorePathCasing(URI.revive(globPattern.baseUri));
-        const parsedPattern = parse(globPattern, {
-            ignoreCase
+        let matchGlob = globPattern;
+        if (ignoreCase) {
+            matchGlob = typeof globPattern === "string" ? globPattern.toLowerCase() : {
+                base: globPattern.base.toLowerCase(),
+                pattern: globPattern.pattern.toLowerCase()
+            };
+        }
+        const parsedPattern = parse(matchGlob, {
+            ignoreCase: false
         });
         const excludeOutOfWorkspaceEvents = typeof globPattern === "string";
         const subscription = dispatcher(events => {
@@ -56,25 +63,31 @@ class FileSystemWatcher {
                 return;
             }
             if (!options.ignoreCreateEvents) {
-                for (const created of events.created) {
-                    const uri = URI.revive(created);
-                    if (parsedPattern(uri.fsPath) && (!excludeOutOfWorkspaceEvents || workspace.getWorkspaceFolder(uri))) {
+                for (const {
+                    uri,
+                    lowerCaseFsPath
+                } of events.created) {
+                    if (parsedPattern(ignoreCase ? lowerCaseFsPath : uri.fsPath) && (!excludeOutOfWorkspaceEvents || workspace.getWorkspaceFolder(uri))) {
                         this._onDidCreate.fire(uri);
                     }
                 }
             }
             if (!options.ignoreChangeEvents) {
-                for (const changed of events.changed) {
-                    const uri = URI.revive(changed);
-                    if (parsedPattern(uri.fsPath) && (!excludeOutOfWorkspaceEvents || workspace.getWorkspaceFolder(uri))) {
+                for (const {
+                    uri,
+                    lowerCaseFsPath
+                } of events.changed) {
+                    if (parsedPattern(ignoreCase ? lowerCaseFsPath : uri.fsPath) && (!excludeOutOfWorkspaceEvents || workspace.getWorkspaceFolder(uri))) {
                         this._onDidChange.fire(uri);
                     }
                 }
             }
             if (!options.ignoreDeleteEvents) {
-                for (const deleted of events.deleted) {
-                    const uri = URI.revive(deleted);
-                    if (parsedPattern(uri.fsPath) && (!excludeOutOfWorkspaceEvents || workspace.getWorkspaceFolder(uri))) {
+                for (const {
+                    uri,
+                    lowerCaseFsPath
+                } of events.deleted) {
+                    if (parsedPattern(ignoreCase ? lowerCaseFsPath : uri.fsPath) && (!excludeOutOfWorkspaceEvents || workspace.getWorkspaceFolder(uri))) {
                         this._onDidDelete.fire(uri);
                     }
                 }
@@ -194,11 +207,18 @@ class LazyRevivedFileSystemEvents {
     get deleted() {
         return this._deleted.value;
     }
+    static _revive(uriComponents) {
+        const uri = URI.revive(uriComponents);
+        return {
+            uri,
+            lowerCaseFsPath: uri.fsPath.toLowerCase()
+        };
+    }
     constructor(_events) {
         this._events = _events;
-        this._created = ( new Lazy(() => ( this._events.created.map(URI.revive))));
-        this._changed = ( new Lazy(() => ( this._events.changed.map(URI.revive))));
-        this._deleted = ( new Lazy(() => ( this._events.deleted.map(URI.revive))));
+        this._created = ( new Lazy(() => ( this._events.created.map(LazyRevivedFileSystemEvents._revive))));
+        this._changed = ( new Lazy(() => ( this._events.changed.map(LazyRevivedFileSystemEvents._revive))));
+        this._deleted = ( new Lazy(() => ( this._events.deleted.map(LazyRevivedFileSystemEvents._revive))));
         this.session = this._events.session;
     }
 }

package/vscode/src/vs/workbench/api/common/extHostLanguageModelTools.js

@@ -47,7 +47,8 @@ class Tool {
                 description: this._data.modelDescription,
                 inputSchema: this._data.inputSchema,
                 tags: this._data.tags ?? [],
-                source: LanguageModelToolSource.to(this._data.source)
+                source: LanguageModelToolSource.to(this._data.source),
+                fullReferenceName: this._data.fullReferenceName
             }));
         }
         return this._apiObjectWithChatParticipantAdditions;

package/vscode/src/vs/workbench/api/common/extHostTypeConverters.d.ts

@@ -567,6 +567,9 @@ export declare namespace ChatLocation {
     function to(loc: ChatAgentLocation): types.ChatLocation;
     function from(loc: types.ChatLocation): ChatAgentLocation;
 }
+export declare namespace ChatSessionCustomizationType {
+    function from(type: types.ChatSessionCustomizationType): string;
+}
 export declare namespace ChatPromptReference {
     function to(variable: IChatRequestVariableEntry, diagnostics: readonly [
         vscode.Uri,
@@ -577,7 +580,8 @@ export declare namespace ChatLanguageModelToolReference {
     function to(variable: IChatRequestVariableEntry): vscode.ChatLanguageModelToolReference;
 }
 export declare namespace ChatRequestModeInstructions {
-    function to(mode: IChatRequestModeInstructions | undefined): vscode.ChatRequestModeInstructions | undefined;
+    function to(mode: IChatRequestModeInstructions | Dto<IChatRequestModeInstructions> | undefined): vscode.ChatRequestModeInstructions | undefined;
+    function from(mode: vscode.ChatRequestModeInstructions | undefined): IChatRequestModeInstructions | undefined;
 }
 export declare namespace ChatAgentCompletionItem {
     function from(item: vscode.ChatCompletionItem, commandsConverter: CommandsConverter, disposables: DisposableStore): extHostProtocol.IChatAgentCompletionItem;

package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js

@@ -3456,6 +3456,13 @@ var ChatLocation;
     }
     ChatLocation.from = from;
 })(ChatLocation || (ChatLocation = {}));
+var ChatSessionCustomizationType;
+(function(ChatSessionCustomizationType) {
+    function from(type) {
+        return type.id;
+    }
+    ChatSessionCustomizationType.from = from;
+})(ChatSessionCustomizationType || (ChatSessionCustomizationType = {}));
 var ChatPromptReference;
 (function(ChatPromptReference) {
     function to(variable, diagnostics, logService) {
@@ -3551,7 +3558,7 @@ var ChatRequestModeInstructions;
                 uri: URI.revive(mode.uri),
                 name: mode.name,
                 content: mode.content,
-                toolReferences: ChatLanguageModelToolReferences.to(mode.toolReferences),
+                toolReferences: ChatLanguageModelToolReferences.to(revive(mode.toolReferences)),
                 metadata: mode.metadata,
                 isBuiltin: mode.isBuiltin
             };
@@ -3559,6 +3566,29 @@ var ChatRequestModeInstructions;
         return undefined;
     }
     ChatRequestModeInstructions.to = to;
+    function from(mode) {
+        if (mode) {
+            return {
+                uri: mode.uri,
+                name: mode.name,
+                content: mode.content,
+                toolReferences: mode.toolReferences?.map(ref => ({
+                    kind: "tool",
+                    id: ref.name,
+                    name: ref.name,
+                    value: undefined,
+                    range: ref.range ? {
+                        start: ref.range[0],
+                        endExclusive: ref.range[1]
+                    } : undefined
+                })) ?? [],
+                metadata: mode.metadata,
+                isBuiltin: mode.isBuiltin
+            };
+        }
+        return undefined;
+    }
+    ChatRequestModeInstructions.from = from;
 })(ChatRequestModeInstructions || (ChatRequestModeInstructions = {}));
 var ChatAgentCompletionItem;
 (function(ChatAgentCompletionItem) {
@@ -4154,4 +4184,4 @@ var ChatSessionItem;
     ChatSessionItem.from = from;
 })(ChatSessionItem || (ChatSessionItem = {}));
 
-export { AiSettingsSearch, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatFollowup, ChatHookCommand, ChatLanguageModelToolReference, ChatLocation, ChatPromptReference, ChatRequestHooksConverter, ChatRequestModeInstructions, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseFilesPart, ChatResponseHookPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseMultiDiffPart, ChatResponseNotebookEditPart, ChatResponsePart, ChatResponseProgressPart, ChatResponsePullRequestPart, ChatResponseQuestionCarouselPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseThinkingProgressPart, ChatResponseWarningPart, ChatResponseWorkspaceEditPart, ChatSessionItem, ChatTask, ChatTaskResult, ChatToolInvocationPart, CodeActionTriggerKind, Color, ColorPresentation, CompletionCommand, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DebugTreeItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, IconPath, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionEndOfLifeReason, InlineCompletionHintStyle, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelToolResult, LanguageModelToolSource, LanguageSelector, Location, MarkdownString, McpServerDefinition, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookEdit, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, PartialAcceptInfo, PartialAcceptTriggerKind, Position, ProgressLocation, Range, Selection, SelectionRange, SignatureHelp, SignatureInformation, SourceControlInputBoxValidationType, SymbolKind, SymbolTag, TerminalCompletionItemDto, TerminalCompletionList, TerminalCompletionResourceOptions, TerminalQuickFix, TestCoverage, TestItem, TestMessage, TestResults, TestRunProfile, TestRunProfileKind, TestTag, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorOpenOptions, ThemableDecorationAttachmentRenderOptions, ThemableDecorationRenderOptions, TokenType, TypeHierarchyItem, ViewBadge, ViewColumn, WorkspaceEdit, WorkspaceSymbol, fromRangeOrRangeWithMessage, isDecorationOptionsArr, location, pathOrURIToURI };
+export { AiSettingsSearch, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentRequest, ChatAgentResult, ChatAgentUserActionEvent, ChatFollowup, ChatHookCommand, ChatLanguageModelToolReference, ChatLocation, ChatPromptReference, ChatRequestHooksConverter, ChatRequestModeInstructions, ChatResponseAnchorPart, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseFilesPart, ChatResponseHookPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseMultiDiffPart, ChatResponseNotebookEditPart, ChatResponsePart, ChatResponseProgressPart, ChatResponsePullRequestPart, ChatResponseQuestionCarouselPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseThinkingProgressPart, ChatResponseWarningPart, ChatResponseWorkspaceEditPart, ChatSessionCustomizationType, ChatSessionItem, ChatTask, ChatTaskResult, ChatToolInvocationPart, CodeActionTriggerKind, Color, ColorPresentation, CompletionCommand, CompletionContext, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, DataTransfer, DataTransferItem, DebugTreeItem, DecorationRangeBehavior, DecorationRenderOptions, DefinitionLink, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, DocumentHighlight, DocumentLink, DocumentSelector, DocumentSymbol, EndOfLine, EvaluatableExpression, FoldingRange, FoldingRangeKind, GlobPattern, Hover, IconPath, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionEndOfLifeReason, InlineCompletionHintStyle, InlineValue, InlineValueContext, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelToolResult, LanguageModelToolSource, LanguageSelector, Location, MarkdownString, McpServerDefinition, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionSummary, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookData, NotebookDocumentContentOptions, NotebookEdit, NotebookExclusiveDocumentPattern, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookStatusBarItem, ParameterInformation, PartialAcceptInfo, PartialAcceptTriggerKind, Position, ProgressLocation, Range, Selection, SelectionRange, SignatureHelp, SignatureInformation, SourceControlInputBoxValidationType, SymbolKind, SymbolTag, TerminalCompletionItemDto, TerminalCompletionList, TerminalCompletionResourceOptions, TerminalQuickFix, TestCoverage, TestItem, TestMessage, TestResults, TestRunProfile, TestRunProfileKind, TestTag, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorOpenOptions, ThemableDecorationAttachmentRenderOptions, ThemableDecorationRenderOptions, TokenType, TypeHierarchyItem, ViewBadge, ViewColumn, WorkspaceEdit, WorkspaceSymbol, fromRangeOrRangeWithMessage, isDecorationOptionsArr, location, pathOrURIToURI };

package/vscode/src/vs/workbench/api/common/extHostTypes.d.ts

@@ -1726,7 +1726,8 @@ export declare class ChatRequestTurn implements vscode.ChatRequestTurn2 {
     readonly editedFileEvents?: vscode.ChatRequestEditedFileEvent[] | undefined;
     readonly id?: string | undefined;
     readonly modelId?: string | undefined;
-    constructor(prompt: string, command: string | undefined, references: vscode.ChatPromptReference[], participant: string, toolReferences: vscode.ChatLanguageModelToolReference[], editedFileEvents?: vscode.ChatRequestEditedFileEvent[] | undefined, id?: string | undefined, modelId?: string | undefined);
+    readonly modeInstructions2?: vscode.ChatRequestModeInstructions | undefined;
+    constructor(prompt: string, command: string | undefined, references: vscode.ChatPromptReference[], participant: string, toolReferences: vscode.ChatLanguageModelToolReference[], editedFileEvents?: vscode.ChatRequestEditedFileEvent[] | undefined, id?: string | undefined, modelId?: string | undefined, modeInstructions2?: vscode.ChatRequestModeInstructions | undefined);
 }
 export declare class ChatResponseTurn implements vscode.ChatResponseTurn {
     readonly response: ReadonlyArray<ChatResponseMarkdownPart | ChatResponseFileTreePart | ChatResponseAnchorPart | ChatResponseCommandButtonPart>;
@@ -1754,6 +1755,15 @@ export declare enum ChatSessionStatus {
     InProgress = 2,
     NeedsInput = 3
 }
+export declare class ChatSessionCustomizationType {
+    readonly id: string;
+    static readonly Agent: ChatSessionCustomizationType;
+    static readonly Skill: ChatSessionCustomizationType;
+    static readonly Instructions: ChatSessionCustomizationType;
+    static readonly Prompt: ChatSessionCustomizationType;
+    static readonly Hook: ChatSessionCustomizationType;
+    constructor(id: string);
+}
 export declare enum ChatDebugLogLevel {
     Trace = 0,
     Info = 1,

package/vscode/src/vs/workbench/api/common/extHostTypes.js

@@ -2615,7 +2615,8 @@ class ChatRequestTurn {
         toolReferences,
         editedFileEvents,
         id,
-        modelId
+        modelId,
+        modeInstructions2
     ) {
         this.prompt = prompt;
         this.command = command;
@@ -2625,6 +2626,7 @@ class ChatRequestTurn {
         this.editedFileEvents = editedFileEvents;
         this.id = id;
         this.modelId = modelId;
+        this.modeInstructions2 = modeInstructions2;
     }
 }
 class ChatResponseTurn {
@@ -2657,6 +2659,26 @@ var ChatSessionStatus;
     ChatSessionStatus[ChatSessionStatus["InProgress"] = 2] = "InProgress";
     ChatSessionStatus[ChatSessionStatus["NeedsInput"] = 3] = "NeedsInput";
 })(ChatSessionStatus || (ChatSessionStatus = {}));
+class ChatSessionCustomizationType {
+    static {
+        this.Agent = ( new ChatSessionCustomizationType("agent"));
+    }
+    static {
+        this.Skill = ( new ChatSessionCustomizationType("skill"));
+    }
+    static {
+        this.Instructions = ( new ChatSessionCustomizationType("instructions"));
+    }
+    static {
+        this.Prompt = ( new ChatSessionCustomizationType("prompt"));
+    }
+    static {
+        this.Hook = ( new ChatSessionCustomizationType("hook"));
+    }
+    constructor(id) {
+        this.id = id;
+    }
+}
 var ChatDebugLogLevel;
 (function(ChatDebugLogLevel) {
     ChatDebugLogLevel[ChatDebugLogLevel["Trace"] = 0] = "Trace";
@@ -3113,4 +3135,4 @@ class McpHttpServerDefinition {
     }
 }
 
-export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CellErrorStackFrame, ChatCompletionItem, ChatCopyKind, ChatDebugAgentResponseEvent, ChatDebugEventHookContent, ChatDebugEventMessageContent, ChatDebugEventModelTurnContent, ChatDebugEventTextContent, ChatDebugEventToolCallContent, ChatDebugGenericEvent, ChatDebugHookResult, ChatDebugLogLevel, ChatDebugMessageContentType, ChatDebugMessageSection, ChatDebugModelTurnEvent, ChatDebugSubagentInvocationEvent, ChatDebugSubagentStatus, ChatDebugToolCallEvent, ChatDebugToolCallResult, ChatDebugUserMessageEvent, ChatEditingSessionActionOutcome, ChatEditorTabInput, ChatErrorLevel, ChatImageMimeType, ChatLocation, ChatQuestion, ChatQuestionType, ChatReferenceBinaryData, ChatReferenceDiagnostic, ChatRequestEditedFileEventKind, ChatRequestEditorData, ChatRequestNotebookData, ChatRequestTurn, ChatResponseAnchorPart, ChatResponseClearToPreviousToolInvocationReason, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseExternalEditPart, ChatResponseFileTreePart, ChatResponseHookPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseMultiDiffPart, ChatResponseNotebookEditPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponsePullRequestPart, ChatResponseQuestionCarouselPart, ChatResponseReferencePart, ChatResponseReferencePartStatusKind, ChatResponseTextEditPart, ChatResponseThinkingProgressPart, ChatResponseTurn, ChatResponseTurn2, ChatResponseWarningPart, ChatResponseWorkspaceEditPart, ChatResultFeedbackKind, ChatSessionChangedFile, ChatSessionChangedFile2, ChatSessionStatus, ChatSubagentToolInvocationData, ChatTodoStatus, ChatToolInvocationPart, ChatVariableLevel, CodeAction, CodeActionTriggerKind, CodeLens, Color, ColorFormat, ColorInformation, ColorPresentation, ColorTheme, ColorThemeKind, CommentMode, CommentState, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadFocus, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomEditorTabInput, CustomExecution, DataBreakpoint, DataTransfer, DataTransferFile, DataTransferItem, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugStackFrame, DebugThread, DebugVisualization, DeclarationCoverage, DecorationRangeBehavior, Disposable, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentPasteTriggerKind, DocumentSymbol, EnvironmentVariableMutatorType, EvaluatableExpression, ExtendedLanguageModelToolResult, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, Hover, HoverVerbosityAction, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReasonKind, InlineCompletionTriggerKind, InlineCompletionsDisposeReasonKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelChatToolMode, LanguageModelDataPart, LanguageModelError, LanguageModelPartAudience, LanguageModelPromptTsxPart, LanguageModelTextPart, LanguageModelThinkingPart, LanguageModelToolCallPart, LanguageModelToolExtensionSource, LanguageModelToolMCPSource, LanguageModelToolResult, LanguageModelToolResult2, LanguageModelToolResultPart, LanguageStatusSeverity, LinkedEditingRanges, ManagedResolvedAuthority, MarkdownString, McpHttpServerDefinition, McpStdioServerDefinition, McpToolAvailability, McpToolInvocationContentData, MultiDocumentHighlight, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, NotebookCellExecutionState, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookDiffEditorTabInput, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PartialAcceptTriggerKind, PortAttributes, PortAutoForwardAction, ProcessExecution, ProgressLocation, QuickInputButtonLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, SettingsSearchResultKind, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StandardTokenType, StatementCoverage, StatusBarAlignment, SyntaxTokenType, Task, TaskEventKind, TaskGroup, TaskPanelKind, TaskRevealKind, TaskRunOn, TaskScope, TerminalCompletionItem, TerminalCompletionItemKind, TerminalCompletionList, TerminalEditorTabInput, TerminalExitReason, TerminalLink, TerminalLocation, TerminalOutputAnchor, TerminalProfile, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalQuickFixType, TerminalShellExecutionCommandLineConfidence, TerminalShellType, TestCoverageCount, TestMessage, TestMessageStackFrame, TestResultState, TestRunProfileBase, TestRunProfileKind, TestRunRequest, TestTag, TextDiffTabInput, TextDocumentChangeReason, TextDocumentSaveReason, TextEditorChangeKind, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextMultiDiffTabInput, TextTabInput, TextToSpeechStatus, ThemeColor, ThemeIcon, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, VerboseHover, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceTrustState, asStatusBarItemIdentifier, setBreakpointId, validateTestCoverageCount };
+export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CellErrorStackFrame, ChatCompletionItem, ChatCopyKind, ChatDebugAgentResponseEvent, ChatDebugEventHookContent, ChatDebugEventMessageContent, ChatDebugEventModelTurnContent, ChatDebugEventTextContent, ChatDebugEventToolCallContent, ChatDebugGenericEvent, ChatDebugHookResult, ChatDebugLogLevel, ChatDebugMessageContentType, ChatDebugMessageSection, ChatDebugModelTurnEvent, ChatDebugSubagentInvocationEvent, ChatDebugSubagentStatus, ChatDebugToolCallEvent, ChatDebugToolCallResult, ChatDebugUserMessageEvent, ChatEditingSessionActionOutcome, ChatEditorTabInput, ChatErrorLevel, ChatImageMimeType, ChatLocation, ChatQuestion, ChatQuestionType, ChatReferenceBinaryData, ChatReferenceDiagnostic, ChatRequestEditedFileEventKind, ChatRequestEditorData, ChatRequestNotebookData, ChatRequestTurn, ChatResponseAnchorPart, ChatResponseClearToPreviousToolInvocationReason, ChatResponseCodeCitationPart, ChatResponseCodeblockUriPart, ChatResponseCommandButtonPart, ChatResponseConfirmationPart, ChatResponseExtensionsPart, ChatResponseExternalEditPart, ChatResponseFileTreePart, ChatResponseHookPart, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseMovePart, ChatResponseMultiDiffPart, ChatResponseNotebookEditPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponsePullRequestPart, ChatResponseQuestionCarouselPart, ChatResponseReferencePart, ChatResponseReferencePartStatusKind, ChatResponseTextEditPart, ChatResponseThinkingProgressPart, ChatResponseTurn, ChatResponseTurn2, ChatResponseWarningPart, ChatResponseWorkspaceEditPart, ChatResultFeedbackKind, ChatSessionChangedFile, ChatSessionChangedFile2, ChatSessionCustomizationType, ChatSessionStatus, ChatSubagentToolInvocationData, ChatTodoStatus, ChatToolInvocationPart, ChatVariableLevel, CodeAction, CodeActionTriggerKind, CodeLens, Color, ColorFormat, ColorInformation, ColorPresentation, ColorTheme, ColorThemeKind, CommentMode, CommentState, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadFocus, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomEditorTabInput, CustomExecution, DataBreakpoint, DataTransfer, DataTransferFile, DataTransferItem, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugStackFrame, DebugThread, DebugVisualization, DeclarationCoverage, DecorationRangeBehavior, Disposable, DocumentDropEdit, DocumentDropOrPasteEditKind, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentPasteTriggerKind, DocumentSymbol, EnvironmentVariableMutatorType, EvaluatableExpression, ExtendedLanguageModelToolResult, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, Hover, HoverVerbosityAction, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReasonKind, InlineCompletionTriggerKind, InlineCompletionsDisposeReasonKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageModelChatMessage, LanguageModelChatMessage2, LanguageModelChatMessageRole, LanguageModelChatToolMode, LanguageModelDataPart, LanguageModelError, LanguageModelPartAudience, LanguageModelPromptTsxPart, LanguageModelTextPart, LanguageModelThinkingPart, LanguageModelToolCallPart, LanguageModelToolExtensionSource, LanguageModelToolMCPSource, LanguageModelToolResult, LanguageModelToolResult2, LanguageModelToolResultPart, LanguageStatusSeverity, LinkedEditingRanges, ManagedResolvedAuthority, MarkdownString, McpHttpServerDefinition, McpStdioServerDefinition, McpToolAvailability, McpToolInvocationContentData, MultiDocumentHighlight, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, NotebookCellExecutionState, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookDiffEditorTabInput, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PartialAcceptTriggerKind, PortAttributes, PortAutoForwardAction, ProcessExecution, ProgressLocation, QuickInputButtonLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, SettingsSearchResultKind, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StandardTokenType, StatementCoverage, StatusBarAlignment, SyntaxTokenType, Task, TaskEventKind, TaskGroup, TaskPanelKind, TaskRevealKind, TaskRunOn, TaskScope, TerminalCompletionItem, TerminalCompletionItemKind, TerminalCompletionList, TerminalEditorTabInput, TerminalExitReason, TerminalLink, TerminalLocation, TerminalOutputAnchor, TerminalProfile, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalQuickFixType, TerminalShellExecutionCommandLineConfidence, TerminalShellType, TestCoverageCount, TestMessage, TestMessageStackFrame, TestResultState, TestRunProfileBase, TestRunProfileKind, TestRunRequest, TestTag, TextDiffTabInput, TextDocumentChangeReason, TextDocumentSaveReason, TextEditorChangeKind, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextMultiDiffTabInput, TextTabInput, TextToSpeechStatus, ThemeColor, ThemeIcon, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, VerboseHover, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceTrustState, asStatusBarItemIdentifier, setBreakpointId, validateTestCoverageCount };

package/vscode/src/vs/workbench/browser/parts/editor/media/modalEditorPart.css

@@ -31,30 +31,60 @@
 
 /** Modal Editor Container */
 .monaco-modal-editor-block .modal-editor-part {
-	display: flex;
-	flex-direction: column;
+	display: grid;
+	grid-template-rows: auto 1fr;
+	grid-template-columns: 1fr;
 	width: 100%;
 	height: 100%;
 	background-color: var(--vscode-editor-background);
 	border: 1px solid var(--vscode-editorWidget-border, var(--vscode-contrastBorder));
 	border-radius: 8px;
 	overflow: hidden;
+	position: relative;
 
 	&:focus {
 		outline: none;
 	}
 
-	.content {
-		flex: 1;
-		position: relative;
+	&.has-sidebar {
+		grid-template-columns: auto 1fr;
+
+		> .content {
+			grid-column: 2;
+			grid-row: 2;
+		}
+	}
+
+	> .content {
 		overflow: hidden;
+		min-width: 0;
+		min-height: 0;
 	}
 }
 
+/** Modal Editor Sidebar */
+.monaco-modal-editor-block .modal-editor-sidebar {
+	grid-row: 2;
+	grid-column: 1;
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
+	box-sizing: border-box;
+	background-color: var(--vscode-sideBar-background, var(--vscode-editor-background));
+	border-right: 1px solid var(--vscode-sideBarSectionHeader-border, var(--vscode-editorWidget-border, transparent));
+}
+
+.monaco-modal-editor-block .modal-editor-sidebar .monaco-tl-twistie.force-no-twistie {
+	width: 6px !important;
+	padding-left: 0 !important;
+	padding-right: 0 !important;
+}
+
 /** Modal Editor Header */
 .monaco-modal-editor-block .modal-editor-header {
 	display: grid;
 	grid-template-columns: 1fr auto 1fr;
+	grid-column: 1 / -1;
 	align-items: center;
 	height: 32px;
 	min-height: 32px;

package/vscode/src/vs/workbench/browser/parts/editor/modalEditorPart.d.ts

@@ -29,6 +29,7 @@ export declare class ModalEditorPart {
     private readonly configurationService;
     constructor(editorPartsView: IEditorPartsView, instantiationService: IInstantiationService, editorService: IEditorService, layoutService: IWorkbenchLayoutService, keybindingService: IKeybindingService, hostService: IHostService, configurationService: IConfigurationService);
     create(options?: IModalEditorPartOptions): Promise<ICreateModalEditorPartResult>;
+    private createSidebar;
 }
 interface IPosition {
     left: number;

package/vscode/src/vs/workbench/browser/parts/editor/modalEditorPart.js

@@ -6,6 +6,7 @@ import { $, addDisposableListener, EventType, EventHelper, Dimension, append, hi
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { Button } from '../../../../base/browser/ui/button/button.js';
+import { Sash, Orientation } from '../../../../base/browser/ui/sash/sash.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
 import { DisposableStore, toDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { ResizableHTMLElement } from '../../../../base/browser/ui/resizable/resizable.js';
@@ -43,6 +44,8 @@ const MODAL_BORDER_SIZE = 2;
 const MODAL_HEADER_HEIGHT = 33;
 const MODAL_SNAP_THRESHOLD = 20;
 const MODAL_MAXIMIZED_PADDING = 16;
+const MODAL_SIDEBAR_MIN_WIDTH = 160;
+const MODAL_SIDEBAR_DEFAULT_WIDTH = 220;
 const defaultModalEditorAllowableCommands = ( new Set([
 "workbench.action.quit", "workbench.action.reloadWindow", "workbench.action.toggleFullScreen",
 "workbench.action.gotoSymbol", "workbench.action.gotoLine",
@@ -102,8 +105,7 @@ let ModalEditorPart = class ModalEditorPart {
         const resizableElement = ( new ResizableHTMLElement());
         disposables.add(toDisposable(() => resizableElement.dispose()));
         resizableElement.domNode.classList.add("modal-editor-resizable");
-        const configuredMinWidth = options?.minWidth ?? this.configurationService.getValue("workbench.editor.modalMinWidth");
-        const effectiveMinWidth = (typeof configuredMinWidth === "number" && Number.isFinite(configuredMinWidth) && configuredMinWidth >= MODAL_MIN_WIDTH) ? configuredMinWidth : MODAL_MIN_WIDTH;
+        const effectiveMinWidth = MODAL_MIN_WIDTH + (options?.sidebar ? MODAL_SIDEBAR_MIN_WIDTH : 0);
         resizableElement.minSize = ( new Dimension(effectiveMinWidth, MODAL_MIN_HEIGHT));
         modalElement.appendChild(resizableElement.domNode);
         const shadowElement = resizableElement.domNode.appendChild($(".modal-editor-shadow"));
@@ -148,6 +150,11 @@ let ModalEditorPart = class ModalEditorPart {
             }
         }));
         const actionBarContainer = append(headerElement, $("div.modal-editor-action-container"));
+        const sidebarResult = this.createSidebar(editorPartContainer, options?.sidebar, disposables);
+        if (sidebarResult) {
+            editorPartContainer.classList.add("has-sidebar");
+            disposables.add(sidebarResult.onDidResize(() => layoutModal()));
+        }
         const editorPart = disposables.add(this.instantiationService.createInstance(
             ModalEditorPartImpl,
             mainWindow.vscodeWindowId,
@@ -366,12 +373,14 @@ let ModalEditorPart = class ModalEditorPart {
                 }
             }
             const size = resizableElement.size;
+            const sidebarWidth = sidebarResult?.getWidth() ?? 0;
             editorPart.layout(
-                size.width - MODAL_BORDER_SIZE,
+                Math.max(0, size.width - MODAL_BORDER_SIZE - sidebarWidth),
                 size.height - MODAL_BORDER_SIZE - MODAL_HEADER_HEIGHT,
                 0,
                 0
             );
+            sidebarResult?.layout(size.height - MODAL_BORDER_SIZE - MODAL_HEADER_HEIGHT);
             if (e.done) {
                 isResizing = false;
                 const defaultSize = getDefaultSize();
@@ -443,11 +452,12 @@ let ModalEditorPart = class ModalEditorPart {
                 resizableElement.domNode.style.top = `${top}px`;
             }
             editorPart.layout(
-                width - MODAL_BORDER_SIZE,
+                Math.max(0, width - MODAL_BORDER_SIZE - (sidebarResult?.getWidth() ?? 0)),
                 height - MODAL_BORDER_SIZE - MODAL_HEADER_HEIGHT,
                 0,
                 0
             );
+            sidebarResult?.layout(height - MODAL_BORDER_SIZE - MODAL_HEADER_HEIGHT);
         };
         disposables.add(
             Event.runAndSubscribe(this.layoutService.onDidLayoutMainContainer, layoutModal)
@@ -463,6 +473,62 @@ let ModalEditorPart = class ModalEditorPart {
             disposables
         };
     }
+    createSidebar(container, content, disposables) {
+        if (!content) {
+            return undefined;
+        }
+        let sidebarWidth = MODAL_SIDEBAR_DEFAULT_WIDTH;
+        const sidebarContainer = append(container, $("div.modal-editor-sidebar.show-file-icons"));
+        sidebarContainer.style.width = `${sidebarWidth}px`;
+        const onDidLayoutEmitter = disposables.add(( new Emitter()));
+        const contentDisposable = disposables.add(( new MutableDisposable()));
+        contentDisposable.value = content.render(sidebarContainer, onDidLayoutEmitter.event);
+        const sash = disposables.add(( new Sash(container, {
+            getVerticalSashLeft: () => sidebarWidth,
+            getVerticalSashTop: () => MODAL_HEADER_HEIGHT,
+            getVerticalSashHeight: () => (container.clientHeight - MODAL_HEADER_HEIGHT)
+        }, {
+            orientation: Orientation.VERTICAL
+        })));
+        const onDidResizeEmitter = disposables.add(( new Emitter()));
+        let sashStartWidth;
+        disposables.add(sash.onDidStart(() => sashStartWidth = sidebarWidth));
+        disposables.add(sash.onDidEnd(() => sashStartWidth = undefined));
+        disposables.add(sash.onDidChange(e => {
+            if (sashStartWidth === undefined) {
+                return;
+            }
+            const delta = e.currentX - e.startX;
+            const maxWidth = Math.max(MODAL_SIDEBAR_MIN_WIDTH, container.clientWidth - MODAL_MIN_WIDTH);
+            sidebarWidth = Math.min(maxWidth, Math.max(MODAL_SIDEBAR_MIN_WIDTH, sashStartWidth + delta));
+            sidebarContainer.style.width = `${sidebarWidth}px`;
+            sash.layout();
+            onDidResizeEmitter.fire();
+        }));
+        disposables.add(sash.onDidReset(() => {
+            const maxWidth = Math.max(MODAL_SIDEBAR_MIN_WIDTH, container.clientWidth - MODAL_MIN_WIDTH);
+            sidebarWidth = Math.min(maxWidth, MODAL_SIDEBAR_DEFAULT_WIDTH);
+            sidebarContainer.style.width = `${sidebarWidth}px`;
+            sash.layout();
+            onDidResizeEmitter.fire();
+        }));
+        return {
+            onDidResize: onDidResizeEmitter.event,
+            getWidth: () => sidebarWidth,
+            layout: height => {
+                onDidLayoutEmitter.fire({
+                    height,
+                    width: sidebarWidth
+                });
+                sash.layout();
+            },
+            updateContent: newContent => {
+                contentDisposable.clear();
+                sidebarContainer.textContent = "";
+                contentDisposable.value = newContent.render(sidebarContainer, onDidLayoutEmitter.event);
+            }
+        };
+    }
 };
 ModalEditorPart = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IEditorService)), ( __param(3, IWorkbenchLayoutService)), ( __param(4, IKeybindingService)), ( __param(5, IHostService)), ( __param(6, IConfigurationService))], ModalEditorPart));
 let ModalEditorPartImpl = class ModalEditorPartImpl extends EditorPart {

package/vscode/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.js

@@ -879,7 +879,14 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
                         const label = `${editor.getName()} + ${selectedEditors.length - 1}`;
                         applyDragImage(e, tab, label);
                     } else {
-                        e.dataTransfer.setDragImage(tab, 0, 0);
+                        const options = this.groupsView.partOptions;
+                        const isTabSticky = this.tabsModel.isSticky(tabIndex);
+                        const isShrinkSizing = options.tabSizing === "shrink" || (isTabSticky && options.pinnedTabSizing === "shrink");
+                        if (isShrinkSizing) {
+                            applyDragImage(e, tab, editor.getName());
+                        } else {
+                            e.dataTransfer.setDragImage(tab, 0, 0);
+                        }
                     }
                 }
                 this.doFillResourceDataTransfers(selectedEditors, e, isNewWindowOperation);