@codingame/monaco-vscode-api 1.82.6 → 1.83.0-next.0

package/vscode/src/vs/workbench/api/browser/mainThreadTreeViews.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { ExtHostContext, MainContext } from '../common/extHost.protocol.js';
 import { Extensions, IViewsService, NoTreeViewError, ResolvableTreeItem } from '../../common/views.js';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -27,7 +27,9 @@ let MainThreadTreeViews = class MainThreadTreeViews extends Disposable {
         this.logService.trace('MainThreadTreeViews#$registerTreeViewDataProvider', treeViewId, options);
         this.extensionService.whenInstalledExtensionsRegistered().then(() => {
             const dataProvider = ( new TreeViewDataProvider(treeViewId, this._proxy, this.notificationService));
-            this._dataProviders.set(treeViewId, dataProvider);
+            const disposables = ( new DisposableStore());
+            this._register(disposables);
+            this._dataProviders.set(treeViewId, { dataProvider, disposables });
             const dndController = (options.hasHandleDrag || options.hasHandleDrop)
                 ? ( new TreeViewDragAndDropController(
                 treeViewId,
@@ -46,7 +48,7 @@ let MainThreadTreeViews = class MainThreadTreeViews extends Disposable {
                     this._dndControllers.set(treeViewId, dndController);
                 }
                 viewer.dataProvider = dataProvider;
-                this.registerListeners(treeViewId, viewer);
+                this.registerListeners(treeViewId, viewer, disposables);
                 this._proxy.$setVisible(treeViewId, viewer.visible);
             }
             else {
@@ -60,7 +62,7 @@ let MainThreadTreeViews = class MainThreadTreeViews extends Disposable {
             .then(() => {
             const viewer = this.getTreeView(treeViewId);
             if (viewer && itemInfo) {
-                return this.reveal(viewer, this._dataProviders.get(treeViewId), itemInfo.item, itemInfo.parentChain, options);
+                return this.reveal(viewer, this._dataProviders.get(treeViewId).dataProvider, itemInfo.item, itemInfo.parentChain, options);
             }
             return undefined;
         });
@@ -70,7 +72,7 @@ let MainThreadTreeViews = class MainThreadTreeViews extends Disposable {
         const viewer = this.getTreeView(treeViewId);
         const dataProvider = this._dataProviders.get(treeViewId);
         if (viewer && dataProvider) {
-            const itemsToRefresh = dataProvider.getItemsToRefresh(itemsToRefreshByHandle);
+            const itemsToRefresh = dataProvider.dataProvider.getItemsToRefresh(itemsToRefreshByHandle);
             return viewer.refresh(itemsToRefresh.length ? itemsToRefresh : undefined);
         }
         return Promise.resolve();
@@ -109,6 +111,11 @@ let MainThreadTreeViews = class MainThreadTreeViews extends Disposable {
         if (viewer) {
             viewer.dataProvider = undefined;
         }
+        const dataProvider = this._dataProviders.get(treeViewId);
+        if (dataProvider) {
+            dataProvider.disposables.dispose();
+            this._dataProviders.delete(treeViewId);
+        }
     }
     async reveal(treeView, dataProvider, itemIn, parentChain, options) {
         options = options ? options : { select: false, focus: false };
@@ -149,12 +156,12 @@ let MainThreadTreeViews = class MainThreadTreeViews extends Disposable {
             }
         }
     }
-    registerListeners(treeViewId, treeView) {
-        this._register(treeView.onDidExpandItem(item => this._proxy.$setExpanded(treeViewId, item.handle, true)));
-        this._register(treeView.onDidCollapseItem(item => this._proxy.$setExpanded(treeViewId, item.handle, false)));
-        this._register(treeView.onDidChangeSelectionAndFocus(items => this._proxy.$setSelectionAndFocus(treeViewId, ( items.selection.map(({ handle }) => handle)), items.focus.handle)));
-        this._register(treeView.onDidChangeVisibility(isVisible => this._proxy.$setVisible(treeViewId, isVisible)));
-        this._register(treeView.onDidChangeCheckboxState(items => {
+    registerListeners(treeViewId, treeView, disposables) {
+        disposables.add(treeView.onDidExpandItem(item => this._proxy.$setExpanded(treeViewId, item.handle, true)));
+        disposables.add(treeView.onDidCollapseItem(item => this._proxy.$setExpanded(treeViewId, item.handle, false)));
+        disposables.add(treeView.onDidChangeSelectionAndFocus(items => this._proxy.$setSelectionAndFocus(treeViewId, ( items.selection.map(({ handle }) => handle)), items.focus.handle)));
+        disposables.add(treeView.onDidChangeVisibility(isVisible => this._proxy.$setVisible(treeViewId, isVisible)));
+        disposables.add(treeView.onDidChangeCheckboxState(items => {
             this._proxy.$changeCheckboxState(treeViewId, ( items.map(item => {
                 return { treeItemHandle: item.handle, newState: item.checkbox?.isChecked ?? false };
             })));

package/vscode/src/vs/workbench/api/common/extHost.api.impl.js

@@ -37,7 +37,7 @@ import { IExtHostTerminalService } from './extHostTerminalService.js';
 import { ExtHostEditors } from './extHostTextEditors.js';
 import { ExtHostTreeViews } from './extHostTreeViews.js';
 import { LanguageSelector } from './extHostTypeConverters.js';
-import { Breakpoint, TerminalOutputAnchor, ChatMessage, ChatMessageRole, ChatVariableLevel, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CodeAction, CodeActionKind, CodeActionTriggerKind, CodeLens, Color, ColorInformation, ColorPresentation, ColorThemeKind, CommentMode, CommentState, CommentThreadCollapsibleState, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomExecution, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DecorationRangeBehavior, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentSymbol, EndOfLine, EnvironmentVariableMutatorType, EvaluatableExpression, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineCompletionTriggerKind, ExtensionKind, ExtensionMode, ExternalUriOpenerPriority, FileChangeType, FileDecoration, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, InlineSuggestion, InlineSuggestionList, Hover, Location, MarkdownString, ParameterInformation, PortAutoForwardAction, Position, ProcessExecution, ProgressLocation, QuickInputButtons, Range, RelativePattern, Selection, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SnippetString, SourceBreakpoint, StandardTokenType, StatusBarAlignment, SymbolInformation, SymbolKind, SymbolTag, Task, TaskGroup, TaskPanelKind, TaskRevealKind, TaskScope, TerminalLink, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalLocation, TerminalProfile, TerminalExitReason, TextDocumentSaveReason, TextEdit, SnippetTextEdit, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextDocumentChangeReason, ThemeColor, ThemeIcon, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, ViewColumn, WorkspaceEdit, DocumentDropEdit, DocumentPasteEdit, InlayHint, InlayHintLabelPart, InlayHintKind, RemoteAuthorityResolverError, ResolvedAuthority, ManagedResolvedAuthority, SourceControlInputBoxValidationType, ExtensionRuntime, TimelineItem, NotebookRange, NotebookCellKind, NotebookCellExecutionState, NotebookCellData, NotebookData, NotebookRendererScript, NotebookCellStatusBarAlignment, NotebookEditorRevealType, NotebookCellOutput, NotebookCellOutputItem, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookEdit, NotebookKernelSourceAction, PortAttributes, LinkedEditingRanges, TestResultState, TestRunRequest, TestMessage, TestTag, TestRunProfileKind, DataTransfer, DataTransferItem, CoveredCount, FileCoverage, StatementCoverage, BranchCoverage, FunctionCoverage, WorkspaceTrustState, LanguageStatusSeverity, QuickPickItemKind, InputBoxValidationSeverity, TextTabInput, TextDiffTabInput, TextMergeTabInput, CustomEditorTabInput, NotebookEditorTabInput, NotebookDiffEditorTabInput, WebviewEditorTabInput, TerminalEditorTabInput, InteractiveWindowInput, InteractiveSessionVoteDirection, InteractiveSessionCopyKind, InteractiveEditorResponseFeedbackKind, StackFrameFocus, ThreadFocus, NotebookCodeActionKind, RelatedInformationType } from './extHostTypes.js';
+import { Breakpoint, TerminalOutputAnchor, ChatMessage, ChatMessageRole, ChatVariableLevel, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CodeAction, CodeActionKind, CodeActionTriggerKind, CodeLens, Color, ColorInformation, ColorPresentation, ColorThemeKind, CommentMode, CommentState, CommentThreadCollapsibleState, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomExecution, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DecorationRangeBehavior, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentSymbol, EndOfLine, EnvironmentVariableMutatorType, EvaluatableExpression, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineCompletionTriggerKind, ExtensionKind, ExtensionMode, ExternalUriOpenerPriority, FileChangeType, FileDecoration, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, InlineSuggestion, InlineSuggestionList, Hover, Location, MarkdownString, ParameterInformation, PortAutoForwardAction, Position, ProcessExecution, ProgressLocation, QuickInputButtons, Range, RelativePattern, Selection, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SnippetString, SourceBreakpoint, StandardTokenType, StatusBarAlignment, SymbolInformation, SymbolKind, SymbolTag, Task, TaskGroup, TaskPanelKind, TaskRevealKind, TaskScope, TerminalLink, TerminalQuickFixCommand, TerminalQuickFixOpener, TerminalLocation, TerminalProfile, TerminalExitReason, TextDocumentSaveReason, TextEdit, SnippetTextEdit, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, SyntaxTokenType, TextDocumentChangeReason, ThemeColor, ThemeIcon, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, ViewColumn, WorkspaceEdit, DocumentDropEdit, DocumentPasteEdit, InlayHint, InlayHintLabelPart, InlayHintKind, RemoteAuthorityResolverError, ResolvedAuthority, ManagedResolvedAuthority, SourceControlInputBoxValidationType, ExtensionRuntime, TimelineItem, NotebookRange, NotebookCellKind, NotebookCellExecutionState, NotebookCellData, NotebookData, NotebookRendererScript, NotebookCellStatusBarAlignment, NotebookEditorRevealType, NotebookCellOutput, NotebookCellOutputItem, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookEdit, NotebookKernelSourceAction, PortAttributes, LinkedEditingRanges, TestResultState, TestRunRequest, TestMessage, TestTag, TestRunProfileKind, DataTransfer, DataTransferItem, CoveredCount, FileCoverage, StatementCoverage, BranchCoverage, FunctionCoverage, WorkspaceTrustState, LanguageStatusSeverity, QuickPickItemKind, InputBoxValidationSeverity, TextTabInput, TextDiffTabInput, TextMergeTabInput, CustomEditorTabInput, NotebookEditorTabInput, NotebookDiffEditorTabInput, WebviewEditorTabInput, TerminalEditorTabInput, InteractiveWindowInput, InteractiveSessionVoteDirection, InteractiveSessionCopyKind, InteractiveEditorResponseFeedbackKind, StackFrameFocus, ThreadFocus, RelatedInformationType } from './extHostTypes.js';
 import { TelemetryTrustedValue } from '../../../platform/telemetry/common/telemetryUtils.js';
 import { ExtHostUrls } from './extHostUrls.js';
 import { ExtHostWebviews } from './extHostWebview.js';
@@ -99,6 +99,7 @@ import { ExtHostChatSlashCommands } from './extHostChatSlashCommand.js';
 import { ExtHostChatVariables } from './extHostChatVariables.js';
 import { ExtHostRelatedInformation } from './extHostAiRelatedInformation.js';
 import { ExtHostAiEmbeddingVector } from './extHostEmbeddingVector.js';
+import { ExtHostChatAgents } from './extHostChatAgents.js';
 function createApiFactoryAndRegisterActors(accessor) {
     const initData = accessor.get(IExtHostInitDataService);
     const extHostFileSystemInfo = accessor.get(IExtHostFileSystemInfo);
@@ -217,6 +218,7 @@ function createApiFactoryAndRegisterActors(accessor) {
     const extHostInteractiveEditor = rpcProtocol.set(ExtHostContext.ExtHostInlineChat, ( new ExtHostInteractiveEditor(rpcProtocol, extHostCommands, extHostDocuments, extHostLogService)));
     const extHostChatProvider = rpcProtocol.set(ExtHostContext.ExtHostChatProvider, ( new ExtHostChatProvider(rpcProtocol, extHostLogService)));
     const extHostChatSlashCommands = rpcProtocol.set(ExtHostContext.ExtHostChatSlashCommands, ( new ExtHostChatSlashCommands(rpcProtocol, extHostChatProvider, extHostLogService)));
+    const extHostChatAgents = rpcProtocol.set(ExtHostContext.ExtHostChatAgents, ( new ExtHostChatAgents(rpcProtocol, extHostChatProvider, extHostLogService)));
     const extHostChatVariables = rpcProtocol.set(ExtHostContext.ExtHostChatVariables, ( new ExtHostChatVariables(rpcProtocol)));
     const extHostChat = rpcProtocol.set(ExtHostContext.ExtHostChat, ( new ExtHostChat(rpcProtocol, extHostLogService)));
     const extHostAiRelatedInformation = rpcProtocol.set(ExtHostContext.ExtHostAiRelatedInformation, ( new ExtHostRelatedInformation(rpcProtocol)));
@@ -329,7 +331,6 @@ function createApiFactoryAndRegisterActors(accessor) {
                 return extHostTerminalService.getDefaultShell(false);
             },
             get onDidChangeShell() {
-                checkProposedApiEnabled(extension, 'envShellEvent');
                 return extHostTerminalService.onDidChangeShell;
             },
             get isTelemetryEnabled() {
@@ -847,7 +848,7 @@ function createApiFactoryAndRegisterActors(accessor) {
                 return extHostWorkspace.getPath();
             },
             set rootPath(value) {
-                throw errors.readonly();
+                throw new errors.ReadonlyError('rootPath');
             },
             getWorkspaceFolder(resource) {
                 return extHostWorkspace.getWorkspaceFolder(resource);
@@ -859,13 +860,13 @@ function createApiFactoryAndRegisterActors(accessor) {
                 return extHostWorkspace.name;
             },
             set name(value) {
-                throw errors.readonly();
+                throw new errors.ReadonlyError('name');
             },
             get workspaceFile() {
                 return extHostWorkspace.workspaceFile;
             },
             set workspaceFile(value) {
-                throw errors.readonly();
+                throw new errors.ReadonlyError('workspaceFile');
             },
             updateWorkspaceFolders: (index, deleteCount, ...workspaceFoldersToAdd) => {
                 return extHostWorkspace.updateWorkspaceFolders(extension, index, deleteCount || 0, ...workspaceFoldersToAdd);
@@ -915,7 +916,7 @@ function createApiFactoryAndRegisterActors(accessor) {
                 return ( extHostDocuments.getAllDocumentData().map(data => data.document));
             },
             set textDocuments(value) {
-                throw errors.readonly();
+                throw new errors.ReadonlyError('textDocuments');
             },
             openTextDocument(uriOrFileNameOrOptions) {
                 let uriPromise;
@@ -1243,9 +1244,9 @@ function createApiFactoryAndRegisterActors(accessor) {
         };
         const interactive = {
             _version: 1,
-            registerInteractiveEditorSessionProvider(provider) {
+            registerInteractiveEditorSessionProvider(provider, metadata) {
                 checkProposedApiEnabled(extension, 'interactive');
-                return extHostInteractiveEditor.registerProvider(extension, provider);
+                return extHostInteractiveEditor.registerProvider(extension, provider, metadata = { label: metadata?.label ?? extension.displayName ?? extension.name });
             },
             registerInteractiveSessionProvider(id, provider) {
                 checkProposedApiEnabled(extension, 'interactive');
@@ -1302,6 +1303,10 @@ function createApiFactoryAndRegisterActors(accessor) {
             registerMappedEditsProvider(selector, provider) {
                 checkProposedApiEnabled(extension, 'mappedEditsProvider');
                 return extHostLanguageFeatures.registerMappedEditsProvider(extension, selector, provider);
+            },
+            registerAgent(name, agent, metadata) {
+                checkProposedApiEnabled(extension, 'chatAgents');
+                return extHostChatAgents.registerAgent(extension.identifier, name, agent, metadata);
             }
         };
         return {
@@ -1441,6 +1446,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             TextEditorLineNumbersStyle: TextEditorLineNumbersStyle,
             TextEditorRevealType: TextEditorRevealType,
             TextEditorSelectionChangeKind: TextEditorSelectionChangeKind,
+            SyntaxTokenType: SyntaxTokenType,
             TextDocumentChangeReason: TextDocumentChangeReason,
             ThemeColor: ThemeColor,
             ThemeIcon: ThemeIcon,
@@ -1515,7 +1521,6 @@ function createApiFactoryAndRegisterActors(accessor) {
             InteractiveEditorResponseFeedbackKind: InteractiveEditorResponseFeedbackKind,
             StackFrameFocus: StackFrameFocus,
             ThreadFocus: ThreadFocus,
-            NotebookCodeActionKind: NotebookCodeActionKind,
             RelatedInformationType: RelatedInformationType
         };
     };

package/vscode/src/vs/workbench/api/common/extHost.protocol.js

@@ -31,6 +31,7 @@ const MainContext = {
     MainThreadBulkEdits: ( createProxyIdentifier('MainThreadBulkEdits')),
     MainThreadChatProvider: ( createProxyIdentifier('MainThreadChatProvider')),
     MainThreadChatSlashCommands: ( createProxyIdentifier('MainThreadChatSlashCommands')),
+    MainThreadChatAgents: ( createProxyIdentifier('MainThreadChatAgents')),
     MainThreadChatVariables: ( createProxyIdentifier('MainThreadChatVariables')),
     MainThreadClipboard: ( createProxyIdentifier('MainThreadClipboard')),
     MainThreadCommands: ( createProxyIdentifier('MainThreadCommands')),
@@ -49,7 +50,6 @@ const MainContext = {
     MainThreadErrors: ( createProxyIdentifier('MainThreadErrors')),
     MainThreadTreeViews: ( createProxyIdentifier('MainThreadTreeViews')),
     MainThreadDownloadService: ( createProxyIdentifier('MainThreadDownloadService')),
-    MainThreadKeytar: ( createProxyIdentifier('MainThreadKeytar')),
     MainThreadLanguageFeatures: ( createProxyIdentifier('MainThreadLanguageFeatures')),
     MainThreadLanguages: ( createProxyIdentifier('MainThreadLanguages')),
     MainThreadLogger: ( createProxyIdentifier('MainThreadLogger')),
@@ -151,6 +151,7 @@ const ExtHostContext = {
     ExtHostInlineChat: ( createProxyIdentifier('ExtHostInlineChatShape')),
     ExtHostChat: ( createProxyIdentifier('ExtHostChat')),
     ExtHostChatSlashCommands: ( createProxyIdentifier('ExtHostChatSlashCommands')),
+    ExtHostChatAgents: ( createProxyIdentifier('ExtHostChatAgents')),
     ExtHostChatVariables: ( createProxyIdentifier('ExtHostChatVariables')),
     ExtHostChatProvider: ( createProxyIdentifier('ExtHostChatProvider')),
     ExtHostAiRelatedInformation: ( createProxyIdentifier('ExtHostAiRelatedInformation')),

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

@@ -6,7 +6,7 @@ import { decodeSemanticTokensDto } from 'monaco-editor/esm/vs/editor/common/serv
 import { validateWhenClauses } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { matchesSomeScheme } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
 import { ApiCommand, ApiCommandArgument, ApiCommandResult } from './extHostCommands.js';
-import { Position as Position$1, Range, WorkspaceSymbol, CallHierarchyItem, CallHierarchyIncomingCall, CallHierarchyOutgoingCall, WorkspaceEdit, DocumentLink, SignatureHelp, Selection as Selection$1, Color, ColorPresentation, InlayHint, FoldingRange, InlineValue, ViewColumn, TextEditorOpenOptions, TypeHierarchyItem, MappedEditsContext, DefinitionLink, location, DocumentHighlight, SymbolKind, TextEdit, Hover, CompletionItem, NotebookExclusiveDocumentPattern } from './extHostTypeConverters.js';
+import { Position as Position$1, Range, WorkspaceSymbol, CallHierarchyItem, CallHierarchyIncomingCall, CallHierarchyOutgoingCall, WorkspaceEdit, DocumentLink, SignatureHelp, Selection as Selection$1, Color, ColorPresentation, InlayHint, FoldingRange, InlineValueContext, InlineValue, ViewColumn, TextEditorOpenOptions, TypeHierarchyItem, MappedEditsContext, DefinitionLink, location, DocumentHighlight, SymbolKind, TextEdit, Hover, CompletionItem, NotebookExclusiveDocumentPattern } from './extHostTypeConverters.js';
 import { Position, SelectionRange, SemanticTokensLegend, SemanticTokens, CompletionList, Range as Range$1, Selection, ColorInformation, Color as Color$1, SymbolInformation, Location, CodeLens, CodeAction, CodeActionKind } from './extHostTypes.js';
 const newCommands = [
     (
@@ -502,7 +502,16 @@ const newCommands = [
         'vscode.executeInlineValueProvider',
         '_executeInlineValueProvider',
         'Execute inline value provider',
-        [ApiCommandArgument.Uri, ApiCommandArgument.Range],
+        [
+            ApiCommandArgument.Uri,
+            ApiCommandArgument.Range,
+            ( new ApiCommandArgument(
+                'context',
+                'An InlineValueContext',
+                v => v && typeof v.frameId === 'number' && v.stoppedLocation instanceof Range$1,
+                v => InlineValueContext.from(v)
+            ))
+        ],
         ( new ApiCommandResult('A promise that resolves to an array of InlineValue objects', result => {
             return ( result.map(InlineValue.to));
         }))

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

@@ -5,7 +5,7 @@ import { toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { StopWatch } from 'monaco-editor/esm/vs/base/common/stopwatch.js';
 import { localize } from 'monaco-editor/esm/vs/nls.js';
 import { MainContext } from './extHost.protocol.js';
-import { ChatReplyFollowup, ChatFollowup, CompletionItemKind, ChatVariable, MarkdownString } from './extHostTypeConverters.js';
+import { ChatReplyFollowup, ChatFollowup, CompletionItemKind, ChatVariable, MarkdownString, Range } from './extHostTypeConverters.js';
 class ChatProviderWrapper {
     static { this._pool = 0; }
     constructor(extension, provider) {
@@ -183,6 +183,15 @@ class ExtHostChat {
                         content: typeof progress.content === 'string' ? progress.content : MarkdownString.from(progress.content)
                     });
                 }
+                else if ('documents' in progress) {
+                    this._proxy.$acceptResponseProgress(handle, sessionId, {
+                        documents: ( progress.documents.map(d => ({
+                            uri: d.uri,
+                            version: d.version,
+                            ranges: ( d.ranges.map(r => Range.from(r)))
+                        })))
+                    });
+                }
                 else {
                     this._proxy.$acceptResponseProgress(handle, sessionId, progress);
                 }

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

@@ -0,0 +1,62 @@
+import { raceCancellation, DeferredPromise } from 'monaco-editor/esm/vs/base/common/async.js';
+import { toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Progress } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
+import { MainContext } from './extHost.protocol.js';
+import { ChatMessage, ChatFollowup } from './extHostTypeConverters.js';
+import { ChatMessageRole } from './extHostTypes.js';
+class ExtHostChatAgents {
+    static { this._idPool = 0; }
+    constructor(mainContext, _extHostChatProvider, _logService) {
+        this._extHostChatProvider = _extHostChatProvider;
+        this._logService = _logService;
+        this._agents = ( new Map());
+        this._proxy = ( mainContext.getProxy(MainContext.MainThreadChatAgents));
+    }
+    registerAgent(extension, name, agent, metadata) {
+        const handle = ExtHostChatAgents._idPool++;
+        this._agents.set(handle, { extension, agent });
+        this._proxy.$registerAgent(handle, name, metadata);
+        return toDisposable(() => {
+            this._proxy.$unregisterAgent(handle);
+            this._agents.delete(handle);
+        });
+    }
+    async $invokeAgent(handle, requestId, prompt, context, token) {
+        const data = this._agents.get(handle);
+        if (!data) {
+            this._logService.warn(`[CHAT](${handle}) CANNOT invoke agent because the agent is not registered`);
+            return;
+        }
+        let done = false;
+        function throwIfDone() {
+            if (done) {
+                throw new Error('Only valid while executing the command');
+            }
+        }
+        const commandExecution = ( new DeferredPromise());
+        token.onCancellationRequested(() => commandExecution.complete());
+        setTimeout(() => commandExecution.complete(), 3 * 1000);
+        this._extHostChatProvider.allowListExtensionWhile(data.extension, commandExecution.p);
+        const task = data.agent({ role: ChatMessageRole.User, content: prompt }, { history: ( context.history.map(ChatMessage.to)) }, ( new Progress(p => {
+            throwIfDone();
+            this._proxy.$handleProgressChunk(requestId, { content: isInteractiveProgressFileTree(p.message) ? p.message : p.message.value });
+        })), token);
+        try {
+            return await raceCancellation(Promise.resolve(task).then((v) => {
+                if (v && 'followUp' in v) {
+                    const convertedFollowup = v?.followUp?.map(f => ChatFollowup.from(f));
+                    return { followUp: convertedFollowup };
+                }
+                return undefined;
+            }), token);
+        }
+        finally {
+            done = true;
+            commandExecution.complete();
+        }
+    }
+}
+function isInteractiveProgressFileTree(thing) {
+    return !!thing && typeof thing === 'object' && 'treeData' in thing;
+}
+export { ExtHostChatAgents };

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

@@ -1,7 +1,7 @@
 import { toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { MainContext } from './extHost.protocol.js';
 import { ChatMessageRole } from './extHostTypes.js';
-import { ChatMessage } from './extHostTypeConverters.js';
+import { ChatMessage, ChatFollowup } from './extHostTypeConverters.js';
 import { Progress } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
 import { raceCancellation, DeferredPromise } from 'monaco-editor/esm/vs/base/common/async.js';
 class ExtHostChatSlashCommands {
@@ -35,14 +35,20 @@ class ExtHostChatSlashCommands {
         }
         const commandExecution = ( new DeferredPromise());
         token.onCancellationRequested(() => commandExecution.complete());
-        setTimeout(() => commandExecution.complete(), 3 * 1000);
+        setTimeout(() => commandExecution.complete(), 10 * 1000);
         this._extHostChatProvider.allowListExtensionWhile(data.extension, commandExecution.p);
         const task = data.command({ role: ChatMessageRole.User, content: prompt }, { history: ( context.history.map(ChatMessage.to)) }, ( new Progress(p => {
             throwIfDone();
-            this._proxy.$handleProgressChunk(requestId, { content: p.message.value });
+            this._proxy.$handleProgressChunk(requestId, { content: isInteractiveProgressFileTree(p.message) ? p.message : p.message.value });
         })), token);
         try {
-            await raceCancellation(Promise.resolve(task), token);
+            return await raceCancellation(Promise.resolve(task).then((v) => {
+                if (v && 'followUp' in v) {
+                    const convertedFollowup = v?.followUp?.map(f => ChatFollowup.from(f));
+                    return { followUp: convertedFollowup };
+                }
+                return undefined;
+            }), token);
         }
         finally {
             done = true;
@@ -50,4 +56,7 @@ class ExtHostChatSlashCommands {
         }
     }
 }
+function isInteractiveProgressFileTree(thing) {
+    return !!thing && typeof thing === 'object' && 'treeData' in thing;
+}
 export { ExtHostChatSlashCommands };

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

@@ -72,7 +72,7 @@ let ExtHostCommands = class ExtHostCommands {
         const registration = this.registerCommand(false, apiCommand.id, async (...apiArgs) => {
             const internalArgs = ( (apiCommand.args.map((arg, i) => {
                 if (!arg.validate(apiArgs[i])) {
-                    throw new Error(`Invalid argument '${arg.name}' when running '${apiCommand.id}', received: ${apiArgs[i]}`);
+                    throw new Error(`Invalid argument '${arg.name}' when running '${apiCommand.id}', received: ${typeof apiArgs[i] === 'object' ? JSON.stringify(apiArgs[i], null, '\t') : apiArgs[i]} `);
                 }
                 return arg.convert(apiArgs[i]);
             })));
@@ -175,7 +175,7 @@ let ExtHostCommands = class ExtHostCommands {
                     validateConstraint(args[i], description.args[i].constraint);
                 }
                 catch (err) {
-                    throw new Error(`Running the contributed command: '${id}' failed. Illegal argument '${description.args[i].name}' - ${description.args[i].description}`);
+                    throw new Error(`Running the contributed command: '${id}' failed.Illegal argument '${description.args[i].name}' - ${description.args[i].description} `);
                 }
             }
         }
@@ -264,7 +264,7 @@ class CommandsConverter {
         this._commands = _commands;
         this._lookupApiCommand = _lookupApiCommand;
         this._logService = _logService;
-        this.delegatingCommandId = `__vsc${( ( Date.now().toString(36)))}`;
+        this.delegatingCommandId = `__vsc${( ( Date.now().toString(36)))} `;
         this._cache = ( (new Map()));
         this._cachIdPool = 0;
         this._commands.registerCommand(true, this.delegatingCommandId, this._executeConvertedCommand, this);
@@ -288,7 +288,7 @@ class CommandsConverter {
             result.arguments = ( (apiCommand.args.map((arg, i) => arg.convert(command.arguments && command.arguments[i]))));
         }
         else if (isNonEmptyArray(command.arguments)) {
-            const id = `${command.command}/${++this._cachIdPool}`;
+            const id = `${command.command} /${++this._cachIdPool}`;
             this._cache.set(id, command);
             disposables.add(toDisposable(() => {
                 this._cache.delete(id);

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

@@ -415,7 +415,7 @@ function createExtHostComments(mainContext, commands, documents) {
             this._id = _id;
             this._label = _label;
             this._threads = ( new Map());
-            proxy.$registerCommentController(this.handle, _id, _label);
+            proxy.$registerCommentController(this.handle, _id, _label, this._extension.identifier.value);
             const that = this;
             this.value = ( Object.freeze({
                 id: that.id,

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

@@ -35,7 +35,7 @@ import { ExtensionSecrets } from './extHostSecrets.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import { IExtHostLocalizationService } from './extHostLocalizationService.js';
 import { StopWatch } from 'monaco-editor/esm/vs/base/common/stopwatch.js';
-import { isWebWorker, setTimeout0 } from 'monaco-editor/esm/vs/base/common/platform.js';
+import { isCI, isWebWorker, setTimeout0 } from 'monaco-editor/esm/vs/base/common/platform.js';
 import { IExtHostManagedSockets } from './extHostManagedSockets.js';
 var AbstractExtHostExtensionService_1;
 const IHostUtils = ( createDecorator('IHostUtils'));
@@ -62,13 +62,17 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
         this._readyToStartExtensionHost = ( new Barrier());
         this._readyToRunExtensions = ( new Barrier());
         this._eagerExtensionsActivated = ( new Barrier());
-        this._activationEventsReader = ( new SyncedActivationEventsReader(this._initData.activationEvents));
-        this._globalRegistry = ( new ExtensionDescriptionRegistry(this._activationEventsReader, this._initData.allExtensions));
-        const myExtensionsSet = ( new ExtensionIdentifierSet(this._initData.myExtensions));
+        this._activationEventsReader = ( new SyncedActivationEventsReader(this._initData.extensions.activationEvents));
+        this._globalRegistry = ( new ExtensionDescriptionRegistry(this._activationEventsReader, this._initData.extensions.allExtensions));
+        const myExtensionsSet = ( new ExtensionIdentifierSet(this._initData.extensions.myExtensions));
         this._myRegistry = ( new ExtensionDescriptionRegistry(
             this._activationEventsReader,
             filterExtensions(this._globalRegistry, myExtensionsSet)
         ));
+        if (isCI) {
+            this._logService.info(`Creating extension host with the following global extensions: ${printExtIds(this._globalRegistry)}`);
+            this._logService.info(`Creating extension host with the following local extensions: ${printExtIds(this._myRegistry)}`);
+        }
         this._storage = ( new ExtHostStorage(this._extHostContext, this._logService));
         this._secretState = ( new ExtHostSecretState(this._extHostContext));
         this._storagePath = storagePath;
@@ -528,9 +532,20 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
         return ( new Promise((resolve, reject) => {
             const oldTestRunnerCallback = (error, failures) => {
                 if (error) {
+                    if (isCI) {
+                        this._logService.error(`Test runner called back with error`, error);
+                    }
                     reject(error);
                 }
                 else {
+                    if (isCI) {
+                        if (failures) {
+                            this._logService.info(`Test runner called back with ${failures} failures.`);
+                        }
+                        else {
+                            this._logService.info(`Test runner called back with successful outcome.`);
+                        }
+                    }
                     resolve((typeof failures === 'number' && failures > 0) ? 1  : 0 );
                 }
             };
@@ -539,9 +554,15 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
             if (runResult && runResult.then) {
                 runResult
                     .then(() => {
+                    if (isCI) {
+                        this._logService.info(`Test runner finished successfully.`);
+                    }
                     resolve(0);
                 })
                     .catch((err) => {
+                    if (isCI) {
+                        this._logService.error(`Test runner finished with error`, err);
+                    }
                     reject(err instanceof Error && err.stack ? err.stack : String(err));
                 });
             }
@@ -715,6 +736,10 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
         const { globalRegistry, myExtensions } = applyExtensionsDelta(this._activationEventsReader, this._globalRegistry, this._myRegistry, extensionsDelta);
         this._globalRegistry.set(globalRegistry.getAllExtensionDescriptions());
         this._myRegistry.set(myExtensions);
+        if (isCI) {
+            this._logService.info(`$startExtensionHost: global extensions: ${printExtIds(this._globalRegistry)}`);
+            this._logService.info(`$startExtensionHost: local extensions: ${printExtIds(this._myRegistry)}`);
+        }
         return this._startExtensionHost();
     }
     $activateByEvent(activationEvent, activationKind) {
@@ -741,6 +766,10 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
         extensionsPaths.setSearchTree(newSearchTree);
         this._globalRegistry.set(globalRegistry.getAllExtensionDescriptions());
         this._myRegistry.set(myExtensions);
+        if (isCI) {
+            this._logService.info(`$deltaExtensions: global extensions: ${printExtIds(this._globalRegistry)}`);
+            this._logService.info(`$deltaExtensions: local extensions: ${printExtIds(this._myRegistry)}`);
+        }
         return Promise.resolve(undefined);
     }
     async $test_latency(n) {
@@ -803,6 +832,9 @@ function getTelemetryActivationEvent(extensionDescription, reason) {
     };
     return event;
 }
+function printExtIds(registry) {
+    return ( registry.getAllExtensionDescriptions().map(ext => ext.identifier.value)).join(',');
+}
 const IExtHostExtensionService = ( createDecorator('IExtHostExtensionService'));
 class Extension {
     #extensionService;

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

@@ -1,8 +1,8 @@
 import { toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { MainContext } from './extHost.protocol.js';
-import { Range, Selection, Position, MarkdownString, WorkspaceEdit as WorkspaceEdit$1, TextEdit } from './extHostTypeConverters.js';
-import { WorkspaceEdit, InteractiveEditorResponseFeedbackKind } from './extHostTypes.js';
+import { Range, Selection, Position, MarkdownString, WorkspaceEdit as WorkspaceEdit$1, TextEdit, InteractiveEditorResponseFeedbackKind } from './extHostTypeConverters.js';
+import { WorkspaceEdit } from './extHostTypes.js';
 import { ApiCommand, ApiCommandArgument, ApiCommandResult } from './extHostCommands.js';
 class ProviderWrapper {
     static { this._pool = 0; }
@@ -45,10 +45,10 @@ class ExtHostInteractiveEditor {
             ApiCommandResult.Void
         )));
     }
-    registerProvider(extension, provider) {
+    registerProvider(extension, provider, metadata) {
         const wrapper = ( new ProviderWrapper(extension, provider));
         this._inputProvider.set(wrapper.handle, wrapper);
-        this._proxy.$registerInteractiveEditorProvider(wrapper.handle, provider.label, extension.identifier.value, typeof provider.handleInteractiveEditorResponseFeedback === 'function');
+        this._proxy.$registerInteractiveEditorProvider(wrapper.handle, metadata.label, extension.identifier.value, typeof provider.handleInteractiveEditorResponseFeedback === 'function');
         return toDisposable(() => {
             this._proxy.$unregisterInteractiveEditorProvider(wrapper.handle);
             this._inputProvider.delete(wrapper.handle);
@@ -89,7 +89,6 @@ class ExtHostInteractiveEditor {
             return;
         }
         const apiRequest = {
-            session: sessionData.session,
             prompt: request.prompt,
             selection: Selection.to(request.selection),
             wholeRange: Range.to(request.wholeRange),
@@ -114,9 +113,7 @@ class ExtHostInteractiveEditor {
                 });
             }
         };
-        const task = typeof entry.provider.provideInteractiveEditorResponse2 === 'function'
-            ? entry.provider.provideInteractiveEditorResponse2(apiRequest, progress, token)
-            : entry.provider.provideInteractiveEditorResponse(apiRequest, token);
+        const task = entry.provider.provideInteractiveEditorResponse(sessionData.session, apiRequest, progress, token);
         Promise.resolve(task).finally(() => done = true);
         const res = await task;
         if (res) {
@@ -158,31 +155,11 @@ class ExtHostInteractiveEditor {
         const sessionData = this._inputSessions.get(sessionId);
         const response = sessionData?.responses[responseId];
         if (entry && response) {
-            let apiKind;
-            switch (kind) {
-                case 1 :
-                    apiKind = InteractiveEditorResponseFeedbackKind.Helpful;
-                    break;
-                case 0 :
-                    apiKind = InteractiveEditorResponseFeedbackKind.Unhelpful;
-                    break;
-                case 2 :
-                    apiKind = InteractiveEditorResponseFeedbackKind.Undone;
-                    break;
-                case 3 :
-                    apiKind = InteractiveEditorResponseFeedbackKind.Accepted;
-                    break;
-            }
+            const apiKind = InteractiveEditorResponseFeedbackKind.to(kind);
             entry.provider.handleInteractiveEditorResponseFeedback?.(sessionData.session, response, apiKind);
         }
     }
     $releaseSession(handle, sessionId) {
-        const sessionData = this._inputSessions.get(sessionId);
-        const entry = this._inputProvider.get(handle);
-        if (sessionData && entry) {
-            entry.provider.releaseInteractiveEditorSession?.(sessionData.session);
-        }
-        this._inputSessions.delete(sessionId);
     }
     static _isMessageResponse(thing) {
         return typeof thing === 'object' && typeof thing.contents === 'object';