@codingame/monaco-vscode-api 7.1.0 → 7.1.1

package/vscode/src/vs/platform/userDataSync/common/userDataSyncMachines.js

@@ -3,7 +3,7 @@ import { Emitter } from '../../../base/common/event.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { isSafari, isChrome, isEdge, isFirefox, isAndroid, PlatformToString, isWeb, Platform, platform } from '../../../base/common/platform.js';
 import { escapeRegExpCharacters } from '../../../base/common/strings.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { IEnvironmentService } from '../../environment/common/environment.service.js';
 import { IFileService } from '../../files/common/files.service.js';
 import { IProductService } from '../../product/common/productService.service.js';
@@ -12,7 +12,6 @@ import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
 import { IStorageService } from '../../storage/common/storage.service.js';
 import { IUserDataSyncStoreService, IUserDataSyncLogService } from './userDataSync.service.js';
 var UserDataSyncMachinesService_1;
-const _moduleId = "vs/platform/userDataSync/common/userDataSyncMachines";
 const currentMachineNameKey = 'sync.currentMachineName';
 const Safari = 'Safari';
 const Chrome = 'Chrome';
@@ -129,9 +128,8 @@ let UserDataSyncMachinesService = class UserDataSyncMachinesService extends Disp
         this.userData = await this.readUserData(manifest);
         const machinesData = this.parse(this.userData);
         if (machinesData.version !== UserDataSyncMachinesService_1.VERSION) {
-            throw ( new Error(localizeWithPath(
-                _moduleId,
-                0,
+            throw ( new Error(localize(
+                3462,
                 "Cannot read machines data as the current version is incompatible. Please update {0} and try again.",
                 this.productService.nameLong
             )));

package/vscode/src/vs/platform/workspace/common/workspace.js

@@ -1,10 +1,9 @@
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { basename, extname } from '../../../base/common/path.js';
 import { TernarySearchTree } from '../../../base/common/ternarySearchTree.js';
 import { joinPath, extname as extname$1, basenameOrAuthority, extUriBiasedIgnorePathCase } from '../../../base/common/resources.js';
 import { URI } from '../../../base/common/uri.js';
 import { Schemas } from '../../../base/common/network.js';
-const _moduleId = "vs/platform/workspace/common/workspace";
 function isSingleFolderWorkspaceIdentifier(obj) {
     const singleFolderIdentifier = obj;
     return typeof singleFolderIdentifier?.id === 'string' && URI.isUri(singleFolderIdentifier.uri);
@@ -141,7 +140,7 @@ function toWorkspaceFolder(resource) {
 }
 const WORKSPACE_EXTENSION = 'code-workspace';
 const WORKSPACE_SUFFIX = `.${WORKSPACE_EXTENSION}`;
-const WORKSPACE_FILTER = [{ name: ( localizeWithPath(_moduleId, 0, "Code Workspace")), extensions: [WORKSPACE_EXTENSION] }];
+const WORKSPACE_FILTER = [{ name: ( localize(775, "Code Workspace")), extensions: [WORKSPACE_EXTENSION] }];
 const UNTITLED_WORKSPACE_NAME = 'workspace.json';
 function isUntitledWorkspace(path, environmentService) {
     return extUriBiasedIgnorePathCase.isEqualOrParent(path, environmentService.untitledWorkspacesHome);

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

@@ -1,3 +1,4 @@
+import { AsyncIterableObject } from '../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { CancellationError, ReadonlyError, onUnexpectedExternalError } from '../../../base/common/errors.js';
 import { Emitter, Event } from '../../../base/common/event.js';
@@ -6,7 +7,7 @@ import { matchesScheme, Schemas } from '../../../base/common/network.js';
 import Severity$1 from '../../../base/common/severity.js';
 import { URI } from '../../../base/common/uri.js';
 import { TextEditorCursorStyle } from '../../../editor/common/config/editorOptions.js';
-import { targetsNotebooks, score } from '../../../editor/common/languageSelector.js';
+import { score, targetsNotebooks } from '../../../editor/common/languageSelector.js';
 import { IndentAction } from '../../../editor/common/languages/languageConfiguration.js';
 import { OverviewRulerLane } from '../../../editor/common/model.js';
 import { ExtensionIdentifierSet } from '../../../platform/extensions/common/extensions.js';
@@ -87,7 +88,7 @@ import { ExtHostTimeline } from './extHostTimeline.js';
 import { ExtHostTreeViews } from './extHostTreeViews.js';
 import { IExtHostTunnelService } from './extHostTunnelService.js';
 import { LanguageSelector } from './extHostTypeConverters.js';
-import { Breakpoint, TerminalOutputAnchor, ChatResultFeedbackKind, ChatVariableLevel, ChatCompletionItem, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CodeAction, CodeActionKind, CodeActionTriggerKind, CodeLens, Color, ColorInformation, ColorPresentation, ColorThemeKind, CommentMode, CommentState, CommentThreadCollapsibleState, CommentThreadState, CommentThreadApplicability, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomExecution, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugVisualization, DecorationRangeBehavior, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, DocumentHighlight, DocumentHighlightKind, MultiDocumentHighlight, DocumentLink, DocumentSymbol, EndOfLine, EnvironmentVariableMutatorType, EvaluatableExpression, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineCompletionTriggerKind, ExtensionKind, ExtensionMode, ExternalUriOpenerPriority, FileChangeType, FileDecoration, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, InlineSuggestion, InlineSuggestionList, Hover, VerboseHover, HoverVerbosityAction, 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, TerminalShellExecutionCommandLineConfidence, TextDocumentSaveReason, TextEdit, SnippetTextEdit, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, SyntaxTokenType, TextDocumentChangeReason, ThemeColor, ThemeIcon, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, ViewColumn, WorkspaceEdit, DocumentPasteTriggerKind, DocumentDropEdit, DocumentDropOrPasteEditKind, 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, NotebookVariablesRequestKind, PortAttributes, LinkedEditingRanges, TestResultState, TestRunRequest, TestMessage, TestTag, TestRunProfileKind, DataTransfer, DataTransferItem, TestCoverageCount, FileCoverage, StatementCoverage, BranchCoverage, DeclarationCoverage, WorkspaceTrustState, LanguageStatusSeverity, QuickPickItemKind, InputBoxValidationSeverity, TextTabInput, TextDiffTabInput, TextMergeTabInput, CustomEditorTabInput, NotebookEditorTabInput, NotebookDiffEditorTabInput, WebviewEditorTabInput, TerminalEditorTabInput, InteractiveWindowInput, ChatEditorTabInput, TextMultiDiffTabInput, InteractiveSessionVoteDirection, ChatCopyKind, InteractiveEditorResponseFeedbackKind, DebugStackFrame, DebugThread, RelatedInformationType, SpeechToTextStatus, TextToSpeechStatus, PartialAcceptTriggerKind, KeywordRecognitionStatus, ChatResponseMarkdownPart, ChatResponseFileTreePart, ChatResponseAnchorPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponseReferencePart, ChatResponseWarningPart, ChatResponseTextEditPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseCommandButtonPart, ChatResponseDetectedParticipantPart, ChatResponseConfirmationPart, ChatRequestTurn, ChatResponseTurn, ChatLocation, LanguageModelChatMessageRole, LanguageModelChatMessage, LanguageModelFunctionResultPart, LanguageModelTextPart, LanguageModelFunctionUsePart, LanguageModelChatSystemMessage, LanguageModelChatUserMessage, LanguageModelChatAssistantMessage, LanguageModelError, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, InlineEdit, InlineEditTriggerKind } from './extHostTypes.js';
+import { Breakpoint, TerminalOutputAnchor, ChatResultFeedbackKind, ChatVariableLevel, ChatCompletionItem, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, CodeAction, CodeActionKind, CodeActionTriggerKind, CodeLens, Color, ColorInformation, ColorPresentation, ColorThemeKind, CommentMode, CommentState, CommentThreadCollapsibleState, CommentThreadState, CommentThreadApplicability, CommentThreadFocus, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CustomExecution, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugVisualization, DecorationRangeBehavior, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, DocumentHighlight, DocumentHighlightKind, MultiDocumentHighlight, DocumentLink, DocumentSymbol, EndOfLine, EnvironmentVariableMutatorType, EvaluatableExpression, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineCompletionTriggerKind, ExtensionKind, ExtensionMode, ExternalUriOpenerPriority, FileChangeType, FileDecoration, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, InlineSuggestion, InlineSuggestionList, Hover, VerboseHover, HoverVerbosityAction, Location, MarkdownString, ParameterInformation, PortAutoForwardAction, Position, ProcessExecution, ProgressLocation, QuickInputButtonLocation, 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, TerminalShellExecutionCommandLineConfidence, TextDocumentSaveReason, TextEdit, SnippetTextEdit, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, SyntaxTokenType, TextDocumentChangeReason, ThemeColor, ThemeIcon, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, ViewColumn, WorkspaceEdit, DocumentPasteTriggerKind, DocumentDropEdit, DocumentDropOrPasteEditKind, 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, NotebookVariablesRequestKind, PortAttributes, LinkedEditingRanges, TestResultState, TestRunRequest, TestMessage, TestMessageStackFrame, TestTag, TestRunProfileKind, DataTransfer, DataTransferItem, TestCoverageCount, FileCoverage, StatementCoverage, BranchCoverage, DeclarationCoverage, WorkspaceTrustState, LanguageStatusSeverity, QuickPickItemKind, InputBoxValidationSeverity, TextTabInput, TextDiffTabInput, TextMergeTabInput, CustomEditorTabInput, NotebookEditorTabInput, NotebookDiffEditorTabInput, WebviewEditorTabInput, TerminalEditorTabInput, InteractiveWindowInput, ChatEditorTabInput, TextMultiDiffTabInput, InteractiveSessionVoteDirection, ChatCopyKind, InteractiveEditorResponseFeedbackKind, DebugStackFrame, DebugThread, RelatedInformationType, SpeechToTextStatus, TextToSpeechStatus, PartialAcceptTriggerKind, KeywordRecognitionStatus, ChatResponseMarkdownPart, ChatResponseFileTreePart, ChatResponseAnchorPart, ChatResponseProgressPart, ChatResponseProgressPart2, ChatResponseReferencePart, ChatResponseCodeCitationPart, ChatResponseWarningPart, ChatResponseTextEditPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseCommandButtonPart, ChatResponseDetectedParticipantPart, ChatResponseConfirmationPart, ChatResponseReferencePartStatusKind, ChatRequestTurn, ChatResponseTurn, ChatLocation, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelChatMessageRole, LanguageModelChatMessage, LanguageModelFunctionResultPart, LanguageModelTextPart, LanguageModelFunctionUsePart, LanguageModelError, NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, InlineEdit, InlineEditTriggerKind } from './extHostTypes.js';
 import { ExtHostUriOpeners } from './extHostUriOpener.js';
 import { IURITransformerService } from './extHostUriTransformerService.js';
 import { ExtHostUrls } from './extHostUrls.js';
@@ -99,7 +100,7 @@ import { IExtHostWorkspace } from './extHostWorkspace.js';
 import { DebugConfigurationProviderTriggerKind } from '../../contrib/debug/common/debug.js';
 import { UIKind } from '../../services/extensions/common/extensionHostProtocol.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
-import { TextSearchCompleteMessageType } from '../../services/search/common/searchExtTypes.js';
+import { TextSearchCompleteMessageType, ExcludeSettingOptions, TextSearchContextNew, TextSearchMatchNew, TextSearchCompleteMessageTypeNew, oldToNewTextSearchResult } from '../../services/search/common/searchExtTypes.js';
 function createApiFactoryAndRegisterActors(accessor) {
     const initData = accessor.get(IExtHostInitDataService);
     const extHostFileSystemInfo = accessor.get(IExtHostFileSystemInfo);
@@ -221,7 +222,7 @@ function createApiFactoryAndRegisterActors(accessor) {
         extHostCommands,
         extHostLogService
     )));
-    const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, ( new ExtHostChatAgents2(rpcProtocol, extHostLogService, extHostCommands)));
+    const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, ( new ExtHostChatAgents2(rpcProtocol, extHostLogService, extHostCommands, extHostDocuments)));
     const extHostChatVariables = rpcProtocol.set(ExtHostContext.ExtHostChatVariables, ( new ExtHostChatVariables(rpcProtocol)));
     const extHostLanguageModelTools = rpcProtocol.set(ExtHostContext.ExtHostLanguageModelTools, ( new ExtHostLanguageModelTools(rpcProtocol)));
     const extHostAiRelatedInformation = rpcProtocol.set(ExtHostContext.ExtHostAiRelatedInformation, ( new ExtHostRelatedInformation(rpcProtocol)));
@@ -944,6 +945,20 @@ function createApiFactoryAndRegisterActors(accessor) {
                 checkProposedApiEnabled(extension, 'findFiles2');
                 return extHostWorkspace.findFiles2(filePattern, options, extension.identifier, token);
             },
+            findFiles2New: (filePattern, options, token) => {
+                checkProposedApiEnabled(extension, 'findFiles2New');
+                const oldOptions = {
+                    exclude: options?.exclude && options.exclude.length > 0 ? options.exclude[0] : undefined,
+                    useDefaultExcludes: !options?.useExcludeSettings || (options?.useExcludeSettings === ExcludeSettingOptions.filesExclude || options?.useExcludeSettings === ExcludeSettingOptions.searchAndFilesExclude),
+                    useDefaultSearchExcludes: !options?.useExcludeSettings || (options?.useExcludeSettings === ExcludeSettingOptions.searchAndFilesExclude),
+                    maxResults: options?.maxResults,
+                    useIgnoreFiles: options?.useIgnoreFiles?.local,
+                    useGlobalIgnoreFiles: options?.useIgnoreFiles?.global,
+                    useParentIgnoreFiles: options?.useIgnoreFiles?.parent,
+                    followSymlinks: options?.followSymlinks,
+                };
+                return extHostWorkspace.findFiles2(filePattern && filePattern.length > 0 ? filePattern[0] : undefined, oldOptions, extension.identifier, token);
+            },
             findTextInFiles: (query, optionsOrCallback, callbackOrToken, token) => {
                 checkProposedApiEnabled(extension, 'findTextInFiles');
                 let options;
@@ -959,6 +974,49 @@ function createApiFactoryAndRegisterActors(accessor) {
                 }
                 return extHostWorkspace.findTextInFiles(query, options || {}, callback, extension.identifier, token);
             },
+            findTextInFilesNew: (query, options, token) => {
+                checkProposedApiEnabled(extension, 'findTextInFilesNew');
+                checkProposedApiEnabled(extension, 'textSearchProviderNew');
+                let oldOptions = {};
+                if (options) {
+                    oldOptions = {
+                        include: options.include && options.include.length > 0 ? options.include[0] : undefined,
+                        exclude: options.exclude && options.exclude.length > 0 ? options.exclude[0] : undefined,
+                        useDefaultExcludes: options.useExcludeSettings === undefined || (options.useExcludeSettings === ExcludeSettingOptions.filesExclude || options.useExcludeSettings === ExcludeSettingOptions.searchAndFilesExclude),
+                        useSearchExclude: options.useExcludeSettings === undefined || (options.useExcludeSettings === ExcludeSettingOptions.searchAndFilesExclude),
+                        maxResults: options.maxResults,
+                        useIgnoreFiles: options.useIgnoreFiles?.local,
+                        useGlobalIgnoreFiles: options.useIgnoreFiles?.global,
+                        useParentIgnoreFiles: options.useIgnoreFiles?.parent,
+                        followSymlinks: options.followSymlinks,
+                        encoding: options.encoding,
+                        previewOptions: options.previewOptions ? {
+                            matchLines: options.previewOptions?.matchLines ?? 100,
+                            charsPerLine: options.previewOptions?.charsPerLine ?? 10000,
+                        } : undefined,
+                        beforeContext: options.surroundingContext,
+                        afterContext: options.surroundingContext,
+                    };
+                }
+                const complete = Promise.resolve(undefined);
+                const asyncIterable = ( new AsyncIterableObject(async (emitter) => {
+                    const callback = async (result) => {
+                        emitter.emitOne(oldToNewTextSearchResult(result));
+                        return result;
+                    };
+                    await complete.then(e => {
+                        return extHostWorkspace.findTextInFiles(query, oldOptions, callback, extension.identifier, token);
+                    });
+                }));
+                return {
+                    results: asyncIterable,
+                    complete: complete.then((e) => {
+                        return {
+                            limitHit: e?.limitHit ?? false
+                        };
+                    }),
+                };
+            },
             save: (uri) => {
                 return extHostWorkspace.save(uri);
             },
@@ -1103,6 +1161,19 @@ function createApiFactoryAndRegisterActors(accessor) {
                 checkProposedApiEnabled(extension, 'textSearchProvider');
                 return extHostSearch.registerAITextSearchProvider(scheme, provider);
             },
+            registerFileSearchProviderNew: (scheme, provider) => {
+                checkProposedApiEnabled(extension, 'fileSearchProviderNew');
+                return { dispose: () => { } };
+            },
+            registerTextSearchProviderNew: (scheme, provider) => {
+                checkProposedApiEnabled(extension, 'textSearchProviderNew');
+                return { dispose: () => { } };
+            },
+            registerAITextSearchProviderNew: (scheme, provider) => {
+                checkProposedApiEnabled(extension, 'aiTextSearchProviderNew');
+                checkProposedApiEnabled(extension, 'textSearchProviderNew');
+                return { dispose: () => { } };
+            },
             registerRemoteAuthorityResolver: (authorityPrefix, resolver) => {
                 checkProposedApiEnabled(extension, 'resolvers');
                 return extensionService.registerRemoteAuthorityResolver(authorityPrefix, resolver);
@@ -1474,6 +1545,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             CommentThreadCollapsibleState: CommentThreadCollapsibleState,
             CommentThreadState: CommentThreadState,
             CommentThreadApplicability: CommentThreadApplicability,
+            CommentThreadFocus: CommentThreadFocus,
             CompletionItem: CompletionItem,
             CompletionItemKind: CompletionItemKind,
             CompletionItemTag: CompletionItemTag,
@@ -1533,6 +1605,7 @@ function createApiFactoryAndRegisterActors(accessor) {
             Position: Position,
             ProcessExecution: ProcessExecution,
             ProgressLocation: ProgressLocation,
+            QuickInputButtonLocation: QuickInputButtonLocation,
             QuickInputButtons: QuickInputButtons,
             Range: Range,
             RelativePattern: RelativePattern,
@@ -1620,6 +1693,8 @@ function createApiFactoryAndRegisterActors(accessor) {
             TestResultState: TestResultState,
             TestRunRequest: TestRunRequest,
             TestMessage: TestMessage,
+            TestMessage2: TestMessage,
+            TestMessageStackFrame: TestMessageStackFrame,
             TestTag: TestTag,
             TestRunProfileKind: TestRunProfileKind,
             TextSearchCompleteMessageType: TextSearchCompleteMessageType,
@@ -1665,30 +1740,35 @@ function createApiFactoryAndRegisterActors(accessor) {
             ChatResponseProgressPart: ChatResponseProgressPart,
             ChatResponseProgressPart2: ChatResponseProgressPart2,
             ChatResponseReferencePart: ChatResponseReferencePart,
+            ChatResponseReferencePart2: ChatResponseReferencePart,
+            ChatResponseCodeCitationPart: ChatResponseCodeCitationPart,
             ChatResponseWarningPart: ChatResponseWarningPart,
             ChatResponseTextEditPart: ChatResponseTextEditPart,
             ChatResponseMarkdownWithVulnerabilitiesPart: ChatResponseMarkdownWithVulnerabilitiesPart,
             ChatResponseCommandButtonPart: ChatResponseCommandButtonPart,
             ChatResponseDetectedParticipantPart: ChatResponseDetectedParticipantPart,
             ChatResponseConfirmationPart: ChatResponseConfirmationPart,
+            ChatResponseReferencePartStatusKind: ChatResponseReferencePartStatusKind,
             ChatRequestTurn: ChatRequestTurn,
             ChatResponseTurn: ChatResponseTurn,
             ChatLocation: ChatLocation,
+            ChatRequestEditorData: ChatRequestEditorData,
+            ChatRequestNotebookData: ChatRequestNotebookData,
             LanguageModelChatMessageRole: LanguageModelChatMessageRole,
             LanguageModelChatMessage: LanguageModelChatMessage,
             LanguageModelChatMessageFunctionResultPart: LanguageModelFunctionResultPart,
             LanguageModelChatResponseTextPart: LanguageModelTextPart,
             LanguageModelChatResponseFunctionUsePart: LanguageModelFunctionUsePart,
-            LanguageModelChatMessage2: LanguageModelChatMessage,
-            LanguageModelChatSystemMessage: LanguageModelChatSystemMessage,
-            LanguageModelChatUserMessage: LanguageModelChatUserMessage,
-            LanguageModelChatAssistantMessage: LanguageModelChatAssistantMessage,
             LanguageModelError: LanguageModelError,
             NewSymbolName: NewSymbolName,
             NewSymbolNameTag: NewSymbolNameTag,
             NewSymbolNameTriggerKind: NewSymbolNameTriggerKind,
             InlineEdit: InlineEdit,
             InlineEditTriggerKind: InlineEditTriggerKind,
+            ExcludeSettingOptions: ExcludeSettingOptions,
+            TextSearchContextNew: TextSearchContextNew,
+            TextSearchMatchNew: TextSearchMatchNew,
+            TextSearchCompleteMessageTypeNew: TextSearchCompleteMessageTypeNew,
         };
     };
 }

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

@@ -92,6 +92,16 @@ const newCommands = [
             mapLocationOrLocationLink
         ))
     )),
+    ( new ApiCommand(
+        'vscode.experimental.executeDefinitionProvider_recursive',
+        '_executeDefinitionProvider_recursive',
+        'Execute all definition providers.',
+        [ApiCommandArgument.Uri, ApiCommandArgument.Position],
+        ( new ApiCommandResult(
+            'A promise that resolves to an array of Location or LocationLink instances.',
+            mapLocationOrLocationLink
+        ))
+    )),
     ( new ApiCommand(
         'vscode.executeTypeDefinitionProvider',
         '_executeTypeDefinitionProvider',
@@ -102,6 +112,16 @@ const newCommands = [
             mapLocationOrLocationLink
         ))
     )),
+    ( new ApiCommand(
+        'vscode.experimental.executeTypeDefinitionProvider_recursive',
+        '_executeTypeDefinitionProvider_recursive',
+        'Execute all type definition providers.',
+        [ApiCommandArgument.Uri, ApiCommandArgument.Position],
+        ( new ApiCommandResult(
+            'A promise that resolves to an array of Location or LocationLink instances.',
+            mapLocationOrLocationLink
+        ))
+    )),
     ( new ApiCommand(
         'vscode.executeDeclarationProvider',
         '_executeDeclarationProvider',
@@ -112,6 +132,16 @@ const newCommands = [
             mapLocationOrLocationLink
         ))
     )),
+    ( new ApiCommand(
+        'vscode.experimental.executeDeclarationProvider_recursive',
+        '_executeDeclarationProvider_recursive',
+        'Execute all declaration providers.',
+        [ApiCommandArgument.Uri, ApiCommandArgument.Position],
+        ( new ApiCommandResult(
+            'A promise that resolves to an array of Location or LocationLink instances.',
+            mapLocationOrLocationLink
+        ))
+    )),
     ( new ApiCommand(
         'vscode.executeImplementationProvider',
         '_executeImplementationProvider',
@@ -122,6 +152,16 @@ const newCommands = [
             mapLocationOrLocationLink
         ))
     )),
+    ( new ApiCommand(
+        'vscode.experimental.executeImplementationProvider_recursive',
+        '_executeImplementationProvider_recursive',
+        'Execute all implementation providers.',
+        [ApiCommandArgument.Uri, ApiCommandArgument.Position],
+        ( new ApiCommandResult(
+            'A promise that resolves to an array of Location or LocationLink instances.',
+            mapLocationOrLocationLink
+        ))
+    )),
     ( new ApiCommand(
         'vscode.executeReferenceProvider',
         '_executeReferenceProvider',
@@ -132,6 +172,16 @@ const newCommands = [
             tryMapWith(location.to)
         ))
     )),
+    ( new ApiCommand(
+        'vscode.experimental.executeReferenceProvider',
+        '_executeReferenceProvider_recursive',
+        'Execute all reference providers.',
+        [ApiCommandArgument.Uri, ApiCommandArgument.Position],
+        ( new ApiCommandResult(
+            'A promise that resolves to an array of Location-instances.',
+            tryMapWith(location.to)
+        ))
+    )),
     (
     new ApiCommand(
         'vscode.executeHoverProvider',
@@ -143,6 +193,16 @@ const newCommands = [
             tryMapWith(Hover.to)
         ))
     )),
+    ( new ApiCommand(
+        'vscode.experimental.executeHoverProvider_recursive',
+        '_executeHoverProvider_recursive',
+        'Execute all hover providers.',
+        [ApiCommandArgument.Uri, ApiCommandArgument.Position],
+        ( new ApiCommandResult(
+            'A promise that resolves to an array of Hover-instances.',
+            tryMapWith(Hover.to)
+        ))
+    )),
     (
     new ApiCommand(
         'vscode.executeSelectionRangeProvider',

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

@@ -4,13 +4,15 @@ import { toErrorMessage } from '../../../base/common/errorMessage.js';
 import { Emitter } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
 import { Disposable, DisposableMap, DisposableStore } from '../../../base/common/lifecycle.js';
+import { revive } from '../../../base/common/marshalling.js';
 import { StopWatch } from '../../../base/common/stopwatch.js';
 import { assertType } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 import { MainContext } from './extHost.protocol.js';
-import { ChatAgentRequest, ChatAgentResult, ChatAgentValueReference, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, ChatLocation, ChatResponsePart, MarkdownString, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseFilesPart, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatTask, ChatResponseProgressPart, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseDetectedParticipantPart, ChatResponseConfirmationPart, ChatTaskResult } from './extHostTypeConverters.js';
-import { LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseWarningPart, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseDetectedParticipantPart as ChatResponseDetectedParticipantPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ThemeIcon, ChatResponseFileTreePart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseProgressPart2, MarkdownString as MarkdownString$1 } from './extHostTypes.js';
+import { Selection, Range, ChatAgentRequest, ChatAgentResult, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, ChatLocation, ChatAgentValueReference, ChatResponsePart, MarkdownString, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseFilesPart, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatTask, ChatResponseProgressPart, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseReferencePart, ChatResponseCodeCitationPart, ChatResponseTextEditPart, ChatResponseDetectedParticipantPart, ChatResponseConfirmationPart, ChatTaskResult } from './extHostTypeConverters.js';
+import { ChatRequestEditorData, ChatRequestNotebookData, LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseWarningPart, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseDetectedParticipantPart as ChatResponseDetectedParticipantPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ThemeIcon, ChatResponseFileTreePart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseProgressPart2, MarkdownString as MarkdownString$1 } from './extHostTypes.js';
+import { ChatAgentLocation } from '../../contrib/chat/common/chatAgents.js';
 import { ChatAgentVoteDirection } from '../../contrib/chat/common/chatService.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 class ChatAgentResponseStream {
@@ -128,6 +130,9 @@ class ChatAgentResponseStream {
                     return this;
                 },
                 reference(value, iconPath) {
+                    return this.reference2(value, iconPath);
+                },
+                reference2(value, iconPath, options) {
                     throwIfDone(this.reference);
                     if ('variableName' in value) {
                         checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
@@ -143,7 +148,7 @@ class ChatAgentResponseStream {
                                 })));
                             }
                             else {
-                                const part = new ChatResponseReferencePart$1(value, iconPath);
+                                const part = new ChatResponseReferencePart$1(value, iconPath, options);
                                 const dto = ChatResponseReferencePart.from(part);
                                 references = [dto];
                             }
@@ -152,12 +157,19 @@ class ChatAgentResponseStream {
                         }
                     }
                     else {
-                        const part = new ChatResponseReferencePart$1(value, iconPath);
+                        const part = new ChatResponseReferencePart$1(value, iconPath, options);
                         const dto = ChatResponseReferencePart.from(part);
                         _report(dto);
                     }
                     return this;
                 },
+                codeCitation(value, license, snippet) {
+                    throwIfDone(this.codeCitation);
+                    checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
+                    const part = new ChatResponseCodeCitationPart$1(value, license, snippet);
+                    const dto = ChatResponseCodeCitationPart.from(part);
+                    _report(dto);
+                },
                 textEdit(target, edits) {
                     throwIfDone(this.textEdit);
                     checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
@@ -174,10 +186,10 @@ class ChatAgentResponseStream {
                     _report(dto);
                     return this;
                 },
-                confirmation(title, message, data) {
+                confirmation(title, message, data, buttons) {
                     throwIfDone(this.confirmation);
                     checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
-                    const part = new ChatResponseConfirmationPart$1(title, message, data);
+                    const part = new ChatResponseConfirmationPart$1(title, message, data, buttons);
                     const dto = ChatResponseConfirmationPart.from(part);
                     _report(dto);
                     return this;
@@ -188,11 +200,12 @@ class ChatAgentResponseStream {
                         part instanceof ChatResponseMarkdownWithVulnerabilitiesPart ||
                         part instanceof ChatResponseDetectedParticipantPart$1 ||
                         part instanceof ChatResponseWarningPart ||
-                        part instanceof ChatResponseConfirmationPart$1) {
+                        part instanceof ChatResponseConfirmationPart$1 ||
+                        part instanceof ChatResponseCodeCitationPart$1) {
                         checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
                     }
                     if (part instanceof ChatResponseReferencePart$1) {
-                        this.reference(part.value, part.iconPath);
+                        this.reference2(part.value, part.iconPath, part.options);
                     }
                     else {
                         const dto = ChatResponsePart.from(part, that._commandsConverter, that._sessionDisposables);
@@ -207,10 +220,11 @@ class ChatAgentResponseStream {
 }
 class ExtHostChatAgents2 extends Disposable {
     static { this._idPool = 0; }
-    constructor(mainContext, _logService, commands) {
+    constructor(mainContext, _logService, _commands, _documents) {
         super();
         this._logService = _logService;
-        this.commands = commands;
+        this._commands = _commands;
+        this._documents = _documents;
         this._agents = ( new Map());
         this._sessionDisposables = this._register(( new DisposableMap()));
         this._completionDisposables = this._register(( new DisposableMap()));
@@ -233,13 +247,14 @@ class ExtHostChatAgents2 extends Disposable {
         this._proxy.$registerAgent(handle, extension.identifier, id, { isSticky: true }, dynamicProps);
         return agent.apiAgent;
     }
-    async $invokeAgent(handle, request, context, token) {
+    async $invokeAgent(handle, requestDto, context, token) {
         const agent = this._agents.get(handle);
         if (!agent) {
             throw ( new Error(
                 `[CHAT](${handle}) CANNOT invoke agent because the agent is not registered`
             ));
         }
+        const request = revive(requestDto);
         let sessionDisposables = this._sessionDisposables.get(request.sessionId);
         if (!sessionDisposables) {
             sessionDisposables = ( new DisposableStore());
@@ -249,12 +264,23 @@ class ExtHostChatAgents2 extends Disposable {
             agent.extension,
             request,
             this._proxy,
-            this.commands.converter,
+            this._commands.converter,
             sessionDisposables
         ));
         try {
             const convertedHistory = await this.prepareHistoryTurns(request.agentId, context);
-            const task = agent.invoke(ChatAgentRequest.to(request), { history: convertedHistory }, stream.apiObject, token);
+            let location2;
+            if (request.locationData?.type === ChatAgentLocation.Editor) {
+                const document = this._documents.getDocument(request.locationData.document);
+                location2 = new ChatRequestEditorData(document, Selection.to(request.locationData.selection), Range.to(request.locationData.wholeRange));
+            }
+            else if (request.locationData?.type === ChatAgentLocation.Notebook) {
+                const cell = this._documents.getDocument(request.locationData.sessionInputUri);
+                location2 = new ChatRequestNotebookData(cell);
+            }
+            else if (request.locationData?.type === ChatAgentLocation.Terminal) {
+            }
+            const task = agent.invoke(ChatAgentRequest.to(request, location2), { history: convertedHistory }, stream.apiObject, token);
             return await raceCancellation(Promise.resolve(task).then((result) => {
                 if (result?.metadata) {
                     try {
@@ -297,8 +323,11 @@ class ExtHostChatAgents2 extends Disposable {
             const result = agentId === h.request.agentId ?
                 ehResult :
                 { ...ehResult, metadata: undefined };
-            res.push(new ChatRequestTurn(h.request.message, h.request.command, ( h.request.variables.variables.map(ChatAgentValueReference.to)), h.request.agentId));
-            const parts = coalesce(( h.response.map(r => ChatResponsePart.toContent(r, this.commands.converter))));
+            const varsWithoutTools = ( h.request.variables.variables
+                .filter(v => !v.isTool)
+                .map(ChatAgentValueReference.to));
+            res.push(new ChatRequestTurn(h.request.message, h.request.command, varsWithoutTools, h.request.agentId));
+            const parts = coalesce(( h.response.map(r => ChatResponsePart.toContent(r, this._commands.converter))));
             res.push(new ChatResponseTurn(parts, result, h.request.agentId, h.request.command));
         }
         return res;
@@ -306,11 +335,12 @@ class ExtHostChatAgents2 extends Disposable {
     $releaseSession(sessionId) {
         this._sessionDisposables.deleteAndDispose(sessionId);
     }
-    async $provideFollowups(request, handle, result, context, token) {
+    async $provideFollowups(requestDto, handle, result, context, token) {
         const agent = this._agents.get(handle);
         if (!agent) {
             return Promise.resolve([]);
         }
+        const request = revive(requestDto);
         const convertedHistory = await this.prepareHistoryTurns(agent.id, context);
         const ehResult = ChatAgentResult.to(result);
         return ( (await agent.provideFollowups(ehResult, { history: convertedHistory }, token))
@@ -350,7 +380,7 @@ class ExtHostChatAgents2 extends Disposable {
         if (event.action.kind === 'vote') {
             return;
         }
-        const ehAction = ChatAgentUserActionEvent.to(result, event, this.commands.converter);
+        const ehAction = ChatAgentUserActionEvent.to(result, event, this._commands.converter);
         if (ehAction) {
             agent.acceptAction(( Object.freeze(ehAction)));
         }
@@ -370,7 +400,7 @@ class ExtHostChatAgents2 extends Disposable {
         }
         const items = await agent.invokeCompletionProvider(query, token);
         return ( items.map(
-            (i) => ChatAgentCompletionItem.from(i, this.commands.converter, disposables)
+            (i) => ChatAgentCompletionItem.from(i, this._commands.converter, disposables)
         ));
     }
     async $provideWelcomeMessage(handle, location, token) {

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

@@ -6,7 +6,7 @@ import { URI } from '../../../base/common/uri.js';
 import { CommentThreadCollapsibleState, CommentThreadState as CommentThreadState$1, CommentThreadApplicability as CommentThreadApplicability$1 } from '../../../editor/common/languages.js';
 import { ExtensionIdentifierMap } from '../../../platform/extensions/common/extensions.js';
 import { Range, MarkdownString as MarkdownString$1, pathOrURIToURI } from './extHostTypeConverters.js';
-import { MarkdownString, CommentThreadCollapsibleState as CommentThreadCollapsibleState$1, CommentThreadState, CommentThreadApplicability } from './extHostTypes.js';
+import { MarkdownString, CommentThreadFocus, CommentThreadCollapsibleState as CommentThreadCollapsibleState$1, CommentThreadState, CommentThreadApplicability } from './extHostTypes.js';
 import { MainContext } from './extHost.protocol.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 function createExtHostComments(mainContext, commands, documents) {
@@ -323,7 +323,8 @@ function createExtHostComments(mainContext, commands, documents) {
                 set label(value) { that.label = value; },
                 get state() { return that.state; },
                 set state(value) { that.state = value; },
-                reveal: (options) => that.reveal(options),
+                reveal: (comment, options) => that.reveal(comment, options),
+                hide: () => that.hide(),
                 dispose: () => {
                     that.dispose();
                 }
@@ -388,9 +389,30 @@ function createExtHostComments(mainContext, commands, documents) {
             }
             return;
         }
-        async reveal(options) {
+        async reveal(commentOrOptions, options) {
             checkProposedApiEnabled(this.extensionDescription, 'commentReveal');
-            return proxy.$revealCommentThread(this._commentControllerHandle, this.handle, { preserveFocus: false, focusReply: false, ...options });
+            let comment;
+            if (commentOrOptions && commentOrOptions.body !== undefined) {
+                comment = commentOrOptions;
+            }
+            else {
+                options = options ?? commentOrOptions;
+            }
+            let commentToReveal = comment ? this._commentsMap.get(comment) : undefined;
+            commentToReveal ??= this._commentsMap.get(this._comments[0]);
+            let preserveFocus = true;
+            let focusReply = false;
+            if (options?.focus === CommentThreadFocus.Reply) {
+                focusReply = true;
+                preserveFocus = false;
+            }
+            else if (options?.focus === CommentThreadFocus.Comment) {
+                preserveFocus = false;
+            }
+            return proxy.$revealCommentThread(this._commentControllerHandle, this.handle, commentToReveal, { preserveFocus, focusReply });
+        }
+        async hide() {
+            return proxy.$hideCommentThread(this._commentControllerHandle, this.handle);
         }
         dispose() {
             this._isDiposed = true;

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localize } from '../../../nls.js';
 import { MarkerSeverity } from '../../../platform/markers/common/markers.js';
 import { URI } from '../../../base/common/uri.js';
 import { MainContext } from './extHost.protocol.js';
@@ -10,7 +10,6 @@ import { ILogService } from '../../../platform/log/common/log.service.js';
 import { ResourceMap } from '../../../base/common/map.js';
 import { IExtHostFileSystemInfo } from './extHostFileSystemInfo.js';
 var ExtHostDiagnostics_1;
-const _moduleId = "vs/workbench/api/common/extHostDiagnostics";
 class DiagnosticCollection {
     #proxy;
     #onDidChangeDiagnostics;
@@ -105,9 +104,8 @@ class DiagnosticCollection {
                     }
                     marker.push({
                         severity: MarkerSeverity.Info,
-                        message: ( localizeWithPath(
-                            _moduleId,
-                            0,
+                        message: ( localize(
+                            4075,
                             "Not showing {0} further errors and warnings.",
                             diagnostics.length - this._maxDiagnosticsPerFile
                         )),
@@ -190,7 +188,7 @@ let ExtHostDiagnostics = class ExtHostDiagnostics {
     static { ExtHostDiagnostics_1 = this; }
     static { this._idPool = 0; }
     static { this._maxDiagnosticsPerFile = 1000; }
-    static { this._maxDiagnosticsTotal = 1.1 * ExtHostDiagnostics_1._maxDiagnosticsPerFile; }
+    static { this._maxDiagnosticsTotal = 1.1 * this._maxDiagnosticsPerFile; }
     static _mapper(last) {
         const map = ( (new ResourceMap()));
         for (const uri of last) {