@codingame/monaco-vscode-api 36.2.7 → 37.0.0

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

@@ -28,6 +28,12 @@ import { derivedOpts } from '../../../base/common/observableInternal/observables
 import { autorun } from '../../../base/common/observableInternal/reactions/autorun.js';
 
 const IExtHostAuthentication = ( createDecorator("IExtHostAuthentication"));
+function reviveAccountIcon(account) {
+    return {
+        ...account,
+        icon: URI.revive(account.icon)
+    };
+}
 let ExtHostAuthentication = class ExtHostAuthentication {
     constructor(
         extHostRpc,
@@ -93,12 +99,17 @@ let ExtHostAuthentication = class ExtHostAuthentication {
         return await this._getSessionTaskSingler.getOrCreate(singlerKey, async () => {
             await this._proxy.$ensureProvider(providerId);
             const extensionName = requestingExtension.displayName || requestingExtension.name;
-            return this._proxy.$getSession(providerId, scopesOrRequest, extensionId, extensionName, options);
+            const session = await this._proxy.$getSession(providerId, scopesOrRequest, extensionId, extensionName, options);
+            return session && {
+                ...session,
+                account: reviveAccountIcon(session.account)
+            };
         });
     }
     async getAccounts(providerId) {
         await this._proxy.$ensureProvider(providerId);
-        return await this._proxy.$getAccounts(providerId);
+        const accounts = await this._proxy.$getAccounts(providerId);
+        return ( accounts.map(account => reviveAccountIcon(account)));
     }
     registerAuthenticationProvider(id, label, provider, options) {
         void this._providerOperations.queue(id, async () => {
@@ -141,6 +152,9 @@ let ExtHostAuthentication = class ExtHostAuthentication {
             const providerData = this._authenticationProviders.get(providerId);
             if (providerData) {
                 options.authorizationServer = URI.revive(options.authorizationServer);
+                if (options.account) {
+                    options.account = reviveAccountIcon(options.account);
+                }
                 return await providerData.provider.createSession(scopes, options);
             }
             throw ( new Error(`Unable to find authentication provider with handle: ${providerId}`));
@@ -160,6 +174,9 @@ let ExtHostAuthentication = class ExtHostAuthentication {
             const providerData = this._authenticationProviders.get(providerId);
             if (providerData) {
                 options.authorizationServer = URI.revive(options.authorizationServer);
+                if (options.account) {
+                    options.account = reviveAccountIcon(options.account);
+                }
                 return await providerData.provider.getSessions(scopes, options);
             }
             throw ( new Error(`Unable to find authentication provider with handle: ${providerId}`));
@@ -172,6 +189,9 @@ let ExtHostAuthentication = class ExtHostAuthentication {
                 const provider = providerData.provider;
                 if (typeof provider.getSessionsFromChallenges === "function") {
                     options.authorizationServer = URI.revive(options.authorizationServer);
+                    if (options.account) {
+                        options.account = reviveAccountIcon(options.account);
+                    }
                     return await provider.getSessionsFromChallenges(constraint, options);
                 }
                 throw ( new Error(
@@ -188,6 +208,9 @@ let ExtHostAuthentication = class ExtHostAuthentication {
                 const provider = providerData.provider;
                 if (typeof provider.createSessionFromChallenges === "function") {
                     options.authorizationServer = URI.revive(options.authorizationServer);
+                    if (options.account) {
+                        options.account = reviveAccountIcon(options.account);
+                    }
                     return await provider.createSessionFromChallenges(constraint, options);
                 }
                 throw ( new Error(
@@ -395,7 +418,8 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         _clientId,
         _clientSecret,
         onDidDynamicAuthProviderTokensChange,
-        initialTokens
+        initialTokens,
+        _fetch = fetch
     ) {
         this._extHostWindow = _extHostWindow;
         this._extHostUrls = _extHostUrls;
@@ -407,6 +431,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         this._resourceMetadata = _resourceMetadata;
         this._clientId = _clientId;
         this._clientSecret = _clientSecret;
+        this._fetch = _fetch;
         this._onDidChangeSessions = ( new Emitter());
         this.onDidChangeSessions = this._onDidChangeSessions.event;
         this._onDidChangeClientId = ( new Emitter());
@@ -431,7 +456,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         this._createFlows = [];
         if (_serverMetadata.authorization_endpoint) {
             this._createFlows.push({
-                label: ( localize(2935, "URL Handler")),
+                label: ( localize(3132, "URL Handler")),
                 handler: (scopes, progress, token) => this._createWithUrlHandler(scopes, progress, token)
             });
         }
@@ -442,7 +467,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
     get clientSecret() {
         return this._clientSecret;
     }
-    async getSessions(scopes, _options) {
+    async getSessions(scopes, options) {
         this._logger.info(`Getting sessions for scopes: ${scopes?.join(" ") ?? "all"}`);
         if (!scopes) {
             return this._tokenStore.sessions;
@@ -470,7 +495,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                             continue;
                         }
                         try {
-                            const newToken = await this.exchangeRefreshTokenForToken(token.refresh_token);
+                            const newToken = await this.exchangeRefreshTokenForToken(token.refresh_token, options.silent !== true);
                             if (newToken.scope !== scopeStr) {
                                 this._logger.warn(
                                     `Token scopes '${newToken.scope}' do not match requested scopes '${scopeStr}'. Overwriting token with what was requested...`
@@ -510,7 +535,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                     id: this.id
                 }, {
                     location: ProgressLocation.Notification,
-                    title: ( localize(2936, "Authenticating to '{0}'", this.label)),
+                    title: ( localize(3133, "Authenticating to '{0}'", this.label)),
                     cancellable: true
                 }, (progress, token) => handler(scopes, progress, token));
                 if (token) {
@@ -522,12 +547,12 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                     break;
                 }
                 const message = isCancellationError(err) ? ( localize(
-                    2937,
+                    3134,
                     "Having trouble authenticating to '{0}'? Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
                 )) : ( localize(
-                    2938,
+                    3135,
                     "You have not yet finished authenticating to '{0}'. Would you like to try a different way? ({1})",
                     this.label,
                     nextMode
@@ -626,7 +651,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
             throw ( new CancellationError());
         }
         progress.report({
-            message: ( localize(2939, "Complete the authentication in the browser window that has opened."))
+            message: ( localize(3136, "Complete the authentication in the browser window that has opened."))
         });
         let code;
         try {
@@ -686,7 +711,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         this._logger.trace(`Token request body: ${( tokenRequest.toString())}`);
         let response;
         try {
-            response = await fetch(this._serverMetadata.token_endpoint, {
+            response = await this._fetch(this._serverMetadata.token_endpoint, {
                 method: "POST",
                 headers: {
                     "Content-Type": "application/x-www-form-urlencoded",
@@ -715,7 +740,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         }
         throw ( new Error(`Invalid authorization token response: ${JSON.stringify(result)}`));
     }
-    async exchangeRefreshTokenForToken(refreshToken) {
+    async exchangeRefreshTokenForToken(refreshToken, allowClientRegistration) {
         if (!this._serverMetadata.token_endpoint) {
             throw ( new Error("Token endpoint not available in server metadata"));
         }
@@ -729,7 +754,7 @@ let DynamicAuthProvider = class DynamicAuthProvider {
         if (this._clientSecret) {
             tokenRequest.append("client_secret", this._clientSecret);
         }
-        const response = await fetch(this._serverMetadata.token_endpoint, {
+        const response = await this._fetch(this._serverMetadata.token_endpoint, {
             method: "POST",
             headers: {
                 "Content-Type": "application/x-www-form-urlencoded",
@@ -744,6 +769,12 @@ let DynamicAuthProvider = class DynamicAuthProvider {
                 created_at: Date.now()
             };
         } else if (isAuthorizationErrorResponse(result) && result.error === AuthorizationErrorType.InvalidClient) {
+            if (!allowClientRegistration) {
+                this._logger.warn(
+                    `Client ID (${this._clientId}) was invalid while silently refreshing the token.`
+                );
+                throw ( new Error(`Client ID was invalid while silently refreshing the token.`));
+            }
             this._logger.warn(`Client ID (${this._clientId}) was invalid, generated a new one.`);
             await this._generateNewClientId();
             throw ( new Error(`Client ID was invalid, generated a new one. Please try again.`));
@@ -895,7 +926,7 @@ class TokenStore {
                 claims = getClaimsFromJWT(token.access_token);
             } catch (e) {}
         }
-        const scopes = token.scope ? token.scope.split(" ") : claims?.scope ? claims.scope.split(" ") : [];
+        const scopes = token.scope !== undefined ? (token.scope ? token.scope.split(" ") : []) : (claims?.scope ? claims.scope.split(" ") : []);
         return {
             id: ( stringHash(token.access_token, 0).toString()),
             accessToken: token.access_token,
@@ -909,4 +940,4 @@ class TokenStore {
     }
 }
 
-export { DynamicAuthProvider, ExtHostAuthentication, IExtHostAuthentication, TokenStore };
+export { DynamicAuthProvider, ExtHostAuthentication, IExtHostAuthentication, TokenStore, reviveAccountIcon };

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

@@ -19,8 +19,8 @@ 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, ChatResponseAutoModeResolutionPart as ChatResponseAutoModeResolutionPart$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, ChatResponseInfoPart as ChatResponseInfoPart$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, ChatResponseAutoModeResolutionPart, ChatResponseProgressPart2, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseAnchorPart, ChatResponseWorkspaceEditPart, ChatResponseInfoPart, ChatResponseHookPart, ChatResponseCommandButtonPart, ChatResponseFileTreePart, ChatResponseCodeblockUriPart, ChatResponseMarkdownPart, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ThemeIcon } from './extHostTypes.js';
+import { ChatResponseWarningPart, ChatResponseReferencePart, ChatTaskResult, ChatTask, ChatResponseProgressPart, ChatResponseThinkingProgressPart as ChatResponseThinkingProgressPart$1, ChatResponseAutoModeResolutionPart as ChatResponseAutoModeResolutionPart$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, ChatResponseInfoPart as ChatResponseInfoPart$1, ChatResponseVoiceProgressPart as ChatResponseVoiceProgressPart$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, ChatResponseAutoModeResolutionPart, ChatResponseProgressPart2, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseAnchorPart, ChatResponseWorkspaceEditPart, ChatResponseInfoPart, ChatResponseVoiceProgressPart, 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';
 
@@ -186,6 +186,13 @@ class ChatAgentResponseStream {
                     _report(dto);
                     return this;
                 },
+                voiceProgress(id, value) {
+                    throwIfDone(this.voiceProgress);
+                    checkProposedApiEnabled(that._extension, "chatParticipantPrivate");
+                    const part = new ChatResponseVoiceProgressPart(id, value);
+                    _report(ChatResponseVoiceProgressPart$1.from(part));
+                    return this;
+                },
                 warning(value) {
                     throwIfDone(this.progress);
                     checkProposedApiEnabled(that._extension, "chatParticipantAdditions");
@@ -767,7 +774,8 @@ class ExtHostChatAgents2 extends Disposable {
             return ( folders.map(folder => ({
                 uri: folder.uri,
                 label: folder.label,
-                source: folder.source
+                source: folder.source,
+                destinationGroupId: folder.destinationGroupId
             })));
         } catch (err) {
             return undefined;
@@ -1008,7 +1016,7 @@ class ExtHostChatAgents2 extends Disposable {
         }
     }
     getDiagnosticsWhenEnabled(extension) {
-        if (!isProposedApiEnabled(extension)) {
+        if (!isProposedApiEnabled(extension, "chatReferenceDiagnostic")) {
             return [];
         }
         return this._diagnostics.getDiagnostics();
@@ -1041,14 +1049,13 @@ class ExtHostChatAgents2 extends Disposable {
                 } else if (v.kind === "toolset") {
                     toolReferences.push(...( v.value.map(ChatLanguageModelToolReference.to)));
                 } else {
-                    const ref = ChatPromptReference.to(v, this.getDiagnosticsWhenEnabled(extension), this._logService);
-                    if (ref) {
-                        varsWithoutTools.push(ref);
-                    }
+                    varsWithoutTools.push(
+                        ...ChatPromptReference.toReferences(v, this.getDiagnosticsWhenEnabled(extension), this._logService)
+                    );
                 }
             }
-            const editedFileEvents = isProposedApiEnabled(extension) ? h.request.editedFileEvents : undefined;
-            const modeInstructions2 = isProposedApiEnabled(extension) && h.request.modeInstructions ? ChatRequestModeInstructions.to(h.request.modeInstructions) : undefined;
+            const editedFileEvents = isProposedApiEnabled(extension, "chatParticipantPrivate") ? h.request.editedFileEvents : undefined;
+            const modeInstructions2 = isProposedApiEnabled(extension, "chatParticipantPrivate") && h.request.modeInstructions ? ChatRequestModeInstructions.to(h.request.modeInstructions) : undefined;
             const turn = new ChatRequestTurn(
                 h.request.message,
                 h.request.command,
@@ -1384,7 +1391,7 @@ class ExtHostChatAgent {
                 checkProposedApiEnabled(that.extension, "chatParticipantAdditions");
                 return that._pauseStateEmitter.event;
             },
-            onDidPerformAction: !isProposedApiEnabled(this.extension) ? undefined : this._onDidPerformAction.event,
+            onDidPerformAction: !isProposedApiEnabled(this.extension, "chatParticipantAdditions") ? undefined : this._onDidPerformAction.event,
             dispose() {
                 disposed = true;
                 that._followupProvider = undefined;

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

@@ -3,11 +3,13 @@ import { CancellationToken } from "../../../base/common/cancellation.js";
 import { UriComponents } from "../../../base/common/uri.js";
 import { ExtHostChatContextShape } from "./extHost.protocol.js";
 import { IExtHostRpcService } from "./extHostRpcService.js";
+import { IExtHostEditorTabs } from "./extHostEditorTabs.js";
 import { IChatContextItem } from "../../contrib/chat/common/contextContrib/chatContext.js";
 import { Disposable } from "../../../base/common/lifecycle.js";
 import { IExtHostCommands } from "./extHostCommands.js";
 export declare class ExtHostChatContext extends Disposable implements ExtHostChatContextShape {
     private readonly _commands;
+    private readonly _editorTabs;
     _serviceBrand: undefined;
     private _proxy;
     private _handlePool;
@@ -17,23 +19,26 @@ export declare class ExtHostChatContext extends Disposable implements ExtHostCha
     private _globalItems;
     /** Track which items belong to which provider for cleanup */
     private _providerItems;
-    constructor(extHostRpc: IExtHostRpcService, _commands: IExtHostCommands);
+    constructor(extHostRpc: IExtHostRpcService, _commands: IExtHostCommands, _editorTabs: IExtHostEditorTabs);
     $provideWorkspaceChatContext(handle: number, token: CancellationToken): Promise<IChatContextItem[]>;
     $provideExplicitChatContext(handle: number, token: CancellationToken): Promise<IChatContextItem[]>;
     $resolveExplicitChatContext(handle: number, context: IChatContextItem, token: CancellationToken): Promise<IChatContextItem>;
     $provideResourceChatContext(handle: number, options: {
         resource: UriComponents;
         withValue: boolean;
+        viewType?: string;
     }, token: CancellationToken): Promise<IChatContextItem | undefined>;
     $resolveResourceChatContext(handle: number, context: IChatContextItem, token: CancellationToken): Promise<IChatContextItem>;
     $executeChatContextItemCommand(itemHandle: number): Promise<void>;
     registerChatWorkspaceContextProvider(id: string, provider: vscode.ChatWorkspaceContextProvider): vscode.Disposable;
-    registerChatExplicitContextProvider(id: string, provider: vscode.ChatExplicitContextProvider): vscode.Disposable;
-    registerChatResourceContextProvider(selector: vscode.DocumentSelector, id: string, provider: vscode.ChatResourceContextProvider): vscode.Disposable;
+    registerChatAttachContextProvider(id: string, provider: vscode.ChatAttachContextProvider): vscode.Disposable;
+    registerChatTabContextProvider(selector: vscode.TabSelector, id: string, provider: vscode.ChatTabContextProvider): vscode.Disposable;
     /**
-     * @deprecated Use registerChatWorkspaceContextProvider, registerChatExplicitContextProvider, or registerChatResourceContextProvider instead.
+     * Finds the open {@link vscode.Tab tab} for the given resource. When a `viewType` is provided,
+     * webview and custom editor tabs are matched by their view type; otherwise tabs are matched by
+     * their input resource. When multiple tabs match by view type, the active tab is preferred.
      */
-    registerChatContextProvider(selector: vscode.DocumentSelector | undefined, id: string, provider: vscode.ChatContextProvider): vscode.Disposable;
+    private _findTab;
     private _clearProviderItems;
     private _addTrackedItem;
     private _convertItems;

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

@@ -2,16 +2,19 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { URI } from '../../../base/common/uri.js';
+import { isEqual } from '../../../base/common/resources.js';
 import { MainContext } from './extHost.protocol.js';
-import { MarkdownString, DocumentSelector } from './extHostTypeConverters.js';
+import { MarkdownString, TabSelector } from './extHostTypeConverters.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
+import { IExtHostEditorTabs } from './extHostEditorTabs.js';
 import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import { IExtHostCommands } from './extHostCommands.js';
 
 let ExtHostChatContext = class ExtHostChatContext extends Disposable {
-    constructor(extHostRpc, _commands) {
+    constructor(extHostRpc, _commands, _editorTabs) {
         super();
         this._commands = _commands;
+        this._editorTabs = _editorTabs;
         this._handlePool = 0;
         this._providers = ( new Map());
         this._itemPool = 0;
@@ -26,7 +29,7 @@ let ExtHostChatContext = class ExtHostChatContext extends Disposable {
             throw ( new Error("Workspace context provider not found"));
         }
         const provider = entry.provider;
-        const result = (await provider.provideWorkspaceChatContext?.(token)) ?? (await provider.provideChatContext?.(token)) ?? [];
+        const result = (await provider.provideWorkspaceChatContext?.(token)) ?? [];
         return this._convertItems(handle, result);
     }
     async $provideExplicitChatContext(handle, token) {
@@ -36,7 +39,7 @@ let ExtHostChatContext = class ExtHostChatContext extends Disposable {
             throw ( new Error("Explicit context provider not found"));
         }
         const provider = entry.provider;
-        const result = (await provider.provideExplicitChatContext?.(token)) ?? (await provider.provideChatContext?.(token)) ?? [];
+        const result = (await provider.provideAttachChatContext?.(token)) ?? [];
         return this._convertItems(handle, result);
     }
     async $resolveExplicitChatContext(handle, context, token) {
@@ -50,7 +53,7 @@ let ExtHostChatContext = class ExtHostChatContext extends Disposable {
             throw ( new Error("Chat context item not found"));
         }
         return this._doResolve(
-            (provider.resolveExplicitChatContext ?? provider.resolveChatContext)?.bind(provider),
+            (provider.resolveAttachChatContext)?.bind(provider),
             context,
             extItem,
             token
@@ -62,10 +65,13 @@ let ExtHostChatContext = class ExtHostChatContext extends Disposable {
             throw ( new Error("Resource context provider not found"));
         }
         const provider = entry.provider;
-        const result = (await provider.provideResourceChatContext?.({
-            resource: URI.revive(options.resource)
-        }, token)) ?? (await provider.provideChatContext?.({
-            resource: URI.revive(options.resource)
+        const resource = URI.revive(options.resource);
+        const tab = this._findTab(resource, options.viewType);
+        if (!tab) {
+            return undefined;
+        }
+        const result = (await provider.provideChatTabContext?.({
+            tab
         }, token));
         if (!result) {
             return undefined;
@@ -76,7 +82,7 @@ let ExtHostChatContext = class ExtHostChatContext extends Disposable {
         const itemHandle = this._addTrackedItem(handle, result);
         const item = {
             handle: itemHandle,
-            icon: result.icon,
+            iconPath: result.iconPath,
             label: result.label,
             resourceUri: result.resourceUri,
             modelDescription: result.modelDescription,
@@ -87,7 +93,7 @@ let ExtHostChatContext = class ExtHostChatContext extends Disposable {
             } : undefined
         };
         if (options.withValue && !item.value) {
-            const resolved = await (provider.resolveResourceChatContext ?? provider.resolveChatContext)?.bind(provider)(result, token);
+            const resolved = await provider.resolveChatTabContext?.bind(provider)(result, token);
             item.value = resolved?.value;
             item.tooltip = resolved?.tooltip ? MarkdownString.from(resolved.tooltip) : item.tooltip;
         }
@@ -103,12 +109,7 @@ let ExtHostChatContext = class ExtHostChatContext extends Disposable {
         if (!extItem) {
             throw ( new Error("Chat context item not found"));
         }
-        return this._doResolve(
-            (provider.resolveResourceChatContext ?? provider.resolveChatContext)?.bind(provider),
-            context,
-            extItem,
-            token
-        );
+        return this._doResolve(provider.resolveChatTabContext?.bind(provider), context, extItem, token);
     }
     async $executeChatContextItemCommand(itemHandle) {
         const extItem = this._globalItems.get(itemHandle);
@@ -141,7 +142,7 @@ let ExtHostChatContext = class ExtHostChatContext extends Disposable {
             }
         };
     }
-    registerChatExplicitContextProvider(id, provider) {
+    registerChatAttachContextProvider(id, provider) {
         const handle = this._handlePool++;
         const disposables = ( new DisposableStore());
         this._providers.set(handle, {
@@ -160,7 +161,7 @@ let ExtHostChatContext = class ExtHostChatContext extends Disposable {
             }
         };
     }
-    registerChatResourceContextProvider(selector, id, provider) {
+    registerChatTabContextProvider(selector, id, provider) {
         const handle = this._handlePool++;
         const disposables = ( new DisposableStore());
         this._providers.set(handle, {
@@ -168,7 +169,7 @@ let ExtHostChatContext = class ExtHostChatContext extends Disposable {
             provider,
             disposables
         });
-        this._proxy.$registerChatResourceContextProvider(handle, id, DocumentSelector.from(selector));
+        this._proxy.$registerChatResourceContextProvider(handle, id, TabSelector.from(selector));
         return {
             dispose: () => {
                 this._providers.delete(handle);
@@ -179,36 +180,23 @@ let ExtHostChatContext = class ExtHostChatContext extends Disposable {
             }
         };
     }
-    registerChatContextProvider(selector, id, provider) {
-        const disposables = [];
-        if (provider.provideWorkspaceChatContext) {
-            const workspaceProvider = {
-                onDidChangeWorkspaceChatContext: provider.onDidChangeWorkspaceChatContext,
-                provideWorkspaceChatContext: token => provider.provideWorkspaceChatContext(token)
-            };
-            disposables.push(this.registerChatWorkspaceContextProvider(id, workspaceProvider));
-        }
-        if (provider.provideChatContextExplicit) {
-            const explicitProvider = {
-                provideExplicitChatContext: token => provider.provideChatContextExplicit(token),
-                resolveExplicitChatContext: provider.resolveChatContext ? (context, token) => provider.resolveChatContext(context, token) : context => context
-            };
-            disposables.push(this.registerChatExplicitContextProvider(id, explicitProvider));
-        }
-        if (provider.provideChatContextForResource && selector) {
-            const resourceProvider = {
-                provideResourceChatContext: (options, token) => provider.provideChatContextForResource(options, token),
-                resolveResourceChatContext: provider.resolveChatContext ? (context, token) => provider.resolveChatContext(context, token) : context => context
-            };
-            disposables.push(this.registerChatResourceContextProvider(selector, id, resourceProvider));
-        }
-        return {
-            dispose: () => {
-                for (const disposable of disposables) {
-                    disposable.dispose();
+    _findTab(resource, viewType) {
+        let viewTypeMatch;
+        for (const group of this._editorTabs.tabGroups.all) {
+            for (const tab of group.tabs) {
+                const input = tab.input;
+                if (!input) {
+                    continue;
+                }
+                if (URI.isUri(input.uri) && isEqual(input.uri, resource)) {
+                    return tab;
+                }
+                if (viewType !== undefined && input.viewType === viewType && (!viewTypeMatch || tab.isActive)) {
+                    viewTypeMatch = tab;
                 }
             }
-        };
+        }
+        return viewTypeMatch;
     }
     _clearProviderItems(handle) {
         const itemHandles = this._providerItems.get(handle);
@@ -237,7 +225,7 @@ let ExtHostChatContext = class ExtHostChatContext extends Disposable {
             const itemHandle = this._addTrackedItem(handle, item);
             result.push({
                 handle: itemHandle,
-                icon: item.icon,
+                iconPath: item.iconPath,
                 label: item.label,
                 resourceUri: item.resourceUri,
                 modelDescription: item.modelDescription,
@@ -255,7 +243,7 @@ let ExtHostChatContext = class ExtHostChatContext extends Disposable {
         if (extResult) {
             return {
                 handle: context.handle,
-                icon: extResult.icon,
+                iconPath: extResult.iconPath,
                 label: extResult.label,
                 resourceUri: extResult.resourceUri,
                 modelDescription: extResult.modelDescription,
@@ -273,7 +261,7 @@ let ExtHostChatContext = class ExtHostChatContext extends Disposable {
             return;
         }
         const provideWorkspaceContext = async () => {
-            const workspaceContexts = ((await provider.provideWorkspaceChatContext?.(CancellationToken.None)) ?? (await provider.provideChatContext?.(CancellationToken.None)));
+            const workspaceContexts = await provider.provideWorkspaceChatContext?.(CancellationToken.None);
             const resolvedContexts = this._convertItems(handle, workspaceContexts ?? []);
             return this._proxy.$updateWorkspaceContextItems(handle, resolvedContexts);
         };
@@ -291,6 +279,6 @@ let ExtHostChatContext = class ExtHostChatContext extends Disposable {
         }
     }
 };
-ExtHostChatContext = ( __decorate([( __param(0, IExtHostRpcService)), ( __param(1, IExtHostCommands))], ExtHostChatContext));
+ExtHostChatContext = ( __decorate([( __param(0, IExtHostRpcService)), ( __param(1, IExtHostCommands)), ( __param(2, IExtHostEditorTabs))], ExtHostChatContext));
 
 export { ExtHostChatContext };

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

@@ -19,7 +19,8 @@ class ExtHostChatInputNotification {
             description: undefined,
             actions: [],
             dismissible: true,
-            autoDismissOnMessage: false
+            autoDismissOnMessage: false,
+            sessionTypes: undefined
         };
         let disposed = false;
         let visible = false;
@@ -82,6 +83,13 @@ class ExtHostChatInputNotification {
                 state.autoDismissOnMessage = value;
                 syncState();
             },
+            get sessionTypes() {
+                return state.sessionTypes;
+            },
+            set sessionTypes(value) {
+                state.sessionTypes = value;
+                syncState();
+            },
             show: () => {
                 visible = true;
                 syncState();

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

@@ -72,7 +72,7 @@ export declare class ApiCommandArgument<V, O = V> {
         _itemId: string;
         kind: languages.SymbolKind;
         name: string;
-        detail?: string | undefined;
+        detail?: string;
         uri: import("../../../base/common/uri.js").UriComponents;
         range: {
             readonly startLineNumber: number;
@@ -86,14 +86,14 @@ export declare class ApiCommandArgument<V, O = V> {
             readonly endLineNumber: number;
             readonly endColumn: number;
         };
-        tags?: languages.SymbolTag[] | undefined;
+        tags?: languages.SymbolTag[];
     }>;
     static readonly TypeHierarchyItem: ApiCommandArgument<vscode.TypeHierarchyItem, {
         _sessionId: string;
         _itemId: string;
         kind: languages.SymbolKind;
         name: string;
-        detail?: string | undefined;
+        detail?: string;
         uri: import("../../../base/common/uri.js").UriComponents;
         range: {
             readonly startLineNumber: number;
@@ -107,7 +107,7 @@ export declare class ApiCommandArgument<V, O = V> {
             readonly endLineNumber: number;
             readonly endColumn: number;
         };
-        tags?: languages.SymbolTag[] | undefined;
+        tags?: languages.SymbolTag[];
     }>;
     static readonly TestItem: ApiCommandArgument<vscode.TestItem, import("../../contrib/testing/common/testTypes.js").ITestItem>;
     static readonly TestProfile: ApiCommandArgument<extHostTypes.TestRunProfileBase, import("../../contrib/testing/common/testTypes.js").ITestRunProfileReference>;

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

@@ -61,7 +61,7 @@ let ExtHostCommands = class ExtHostCommands {
                         return location.to(obj);
                     }
                     if (obj instanceof VSBuffer) {
-                        return obj.buffer.buffer;
+                        return obj.buffer.buffer.slice(obj.buffer.byteOffset, obj.buffer.byteOffset + obj.buffer.byteLength);
                     }
                     if (!Array.isArray(obj)) {
                         return obj;