[pull] main from microsoft:main

ThirdPartyNotices.txt

@@ -1363,7 +1363,7 @@ SOFTWARE.
 ---------------------------------------------------------
 
 dotnet/razor 1.0.0 - MIT
-https://github.com/dotnet/razor
+https://github.com/dotnet/roslyn
 
 MIT License
 

cli/ThirdPartyNotices.txt

@@ -735,6 +735,7 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [`digest-io`]: ./digest-io
 [`hex-literal`]: ./hex-literal
 [`inout`]: ./inout
+[`sponge-cursor`]: ./sponge-cursor
 [`wycheproof2blb`]: ./wycheproof2blb
 [`zeroize`]: ./zeroize
 
@@ -781,6 +782,7 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [`digest-io`]: ./digest-io
 [`hex-literal`]: ./hex-literal
 [`inout`]: ./inout
+[`sponge-cursor`]: ./sponge-cursor
 [`wycheproof2blb`]: ./wycheproof2blb
 [`zeroize`]: ./zeroize
 
@@ -1421,6 +1423,7 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [`digest-io`]: ./digest-io
 [`hex-literal`]: ./hex-literal
 [`inout`]: ./inout
+[`sponge-cursor`]: ./sponge-cursor
 [`wycheproof2blb`]: ./wycheproof2blb
 [`zeroize`]: ./zeroize
 
@@ -3367,6 +3370,7 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [`digest-io`]: ./digest-io
 [`hex-literal`]: ./hex-literal
 [`inout`]: ./inout
+[`sponge-cursor`]: ./sponge-cursor
 [`wycheproof2blb`]: ./wycheproof2blb
 [`zeroize`]: ./zeroize
 
@@ -4248,6 +4252,7 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [`digest-io`]: ./digest-io
 [`hex-literal`]: ./hex-literal
 [`inout`]: ./inout
+[`sponge-cursor`]: ./sponge-cursor
 [`wycheproof2blb`]: ./wycheproof2blb
 [`zeroize`]: ./zeroize
 
@@ -6228,7 +6233,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-openssl 0.10.78 - Apache-2.0
+openssl 0.10.79 - Apache-2.0
 https://github.com/rust-openssl/rust-openssl
 
 Copyright 2011-2017 Google Inc.
@@ -6307,7 +6312,7 @@ DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-openssl-sys 0.9.114 - MIT
+openssl-sys 0.9.115 - MIT
 https://github.com/rust-openssl/rust-openssl
 
 The MIT License (MIT)
@@ -10663,8 +10668,8 @@ THE SOFTWARE.
 
 ---------------------------------------------------------
 
-tunnels 4be50b3cc5ade8cb6beec4038c53ea4f2cdac5a2
-https://github.com/connor4312/dev-tunnels
+tunnels 64048c1409ff56cb958b879de7ea069ec71edc8b
+https://github.com/microsoft/dev-tunnels
 
 MIT License
 
@@ -13684,6 +13689,7 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [`digest-io`]: ./digest-io
 [`hex-literal`]: ./hex-literal
 [`inout`]: ./inout
+[`sponge-cursor`]: ./sponge-cursor
 [`wycheproof2blb`]: ./wycheproof2blb
 [`zeroize`]: ./zeroize
 

extensions/copilot/package.json

@@ -3825,15 +3825,6 @@
 							"onExp"
 						]
 					},
-					"github.copilot.chat.responsesApi.toolSearchTool.enabled": {
-						"type": "boolean",
-						"default": false,
-						"markdownDescription": "%github.copilot.config.responsesApi.toolSearchTool.enabled%",
-						"tags": [
-							"experimental",
-							"onExp"
-						]
-					},
 					"github.copilot.chat.updated53CodexPrompt.enabled": {
 						"type": "boolean",
 						"default": true,

extensions/copilot/package.nls.json

@@ -343,7 +343,6 @@
 	"github.copilot.config.responsesApiReasoningSummary": "Sets the reasoning summary style used for the Responses API. Requires `#github.copilot.chat.useResponsesApi#`.",
 	"github.copilot.config.responsesApiContextManagement.enabled": "Enables context management for the Responses API. Requires `#github.copilot.chat.useResponsesApi#`.",
 	"github.copilot.config.responsesApi.promptCacheKey.enabled": "Enables prompt cache key being set for the Responses API.",
-	"github.copilot.config.responsesApi.toolSearchTool.enabled": "Enable tool search for OpenAI Responses API models. When enabled, tools are dynamically discovered and loaded on-demand using embeddings-based search, reducing context window usage when many tools are available.",
 	"github.copilot.config.updated53CodexPrompt.enabled": "Enables the updated prompt for gpt-5.3-codex model.",
 	"github.copilot.config.claude47OpusPrompt.enabled": "Enables the updated system prompt tuned for the Claude Opus 4.7 model.",
 	"github.copilot.config.gpt54ConcisePrompt.enabled": "Enables the concise prompt experiment for gpt-5.4 model.",

extensions/copilot/src/extension/chatInputNotification/vscode-node/chatInputNotification.contribution.ts

@@ -25,7 +25,7 @@ interface IQuotaWarning {
 /**
  * Manages a single chat input notification for quota and rate limit status.
  *
- * Listens to {@link IChatQuotaService.onDidChange} and determines whether a
+ * Listens to `IChatQuotaService.onDidChange` and determines whether a
  * new threshold has been crossed, then shows the highest-priority notification:
  *
  * 1. **Quota exhausted** — info, not auto-dismissed, only dismissible via X.
@@ -72,17 +72,23 @@ export class ChatInputNotificationContribution extends Disposable {
 			return;
 		}
 
+		// Skip quota notifications for PRU users — only show for UBB.
+		const isQuotaNotificationEligible = !hasCopilotToken
+			|| !!this._authService.copilotToken?.isUsageBasedBilling;
+
 		// Priority 1: Quota exhausted — sticky info notification
-		if (this._chatQuotaService.quotaExhausted) {
+		if (isQuotaNotificationEligible && this._chatQuotaService.quotaExhausted) {
 			this._showExhaustedNotification();
 			return;
 		}
 
 		// Priority 2: Quota approaching threshold
-		const quotaWarning = this._computeQuotaWarning();
-		if (quotaWarning) {
-			this._showQuotaApproachingWarning(quotaWarning);
-			return;
+		if (isQuotaNotificationEligible) {
+			const quotaWarning = this._computeQuotaWarning();
+			if (quotaWarning) {
+				this._showQuotaApproachingWarning(quotaWarning);
+				return;
+			}
 		}
 
 		// Priority 3: Rate-limit warning (session > weekly)

extensions/copilot/src/extension/chatInputNotification/vscode-node/test/chatInputNotification.contribution.spec.ts

@@ -41,7 +41,7 @@ function createAuthService(opts?: { anyGitHubSession?: unknown; copilotToken?: u
 	const authService = {
 		_serviceBrand: undefined,
 		anyGitHubSession: hasSession ? opts.anyGitHubSession : { accessToken: 'tok' },
-		copilotToken: hasToken ? opts.copilotToken : { isFreeUser: false, isNoAuthUser: false },
+		copilotToken: hasToken ? opts.copilotToken : { isFreeUser: false, isNoAuthUser: false, isUsageBasedBilling: true },
 		onDidAuthenticationChange: emitter.event,
 	} as unknown as IAuthenticationService;
 	return { authService, emitter };
@@ -156,7 +156,7 @@ describe('ChatInputNotificationContribution', () => {
 			authEmitter.fire();
 
 			// Sign back in
-			(authService as any).copilotToken = { isFreeUser: false, isNoAuthUser: false };
+			(authService as any).copilotToken = { isFreeUser: false, isNoAuthUser: false, isUsageBasedBilling: true };
 			authEmitter.fire();
 
 			// Threshold was cleared, so it should re-show
@@ -179,7 +179,7 @@ describe('ChatInputNotificationContribution', () => {
 			authEmitter.fire();
 
 			// Sign back in, quota no longer exhausted
-			(authService as any).copilotToken = { isFreeUser: false, isNoAuthUser: false };
+			(authService as any).copilotToken = { isFreeUser: false, isNoAuthUser: false, isUsageBasedBilling: true };
 			(quotaService as any).quotaExhausted = false;
 			(quotaService as any).quotaInfo = undefined;
 			(quotaService as any).rateLimitInfo = { session: undefined, weekly: undefined };
@@ -202,28 +202,39 @@ describe('ChatInputNotificationContribution', () => {
 			expect(mockNotification.hide).not.toHaveBeenCalled();
 		});
 
-		test('anonymous user with no GitHub session still sees quota notifications', () => {
+		test('anonymous UBB user with no GitHub session still sees quota notifications', () => {
 			setup(
-				{ anyGitHubSession: undefined, copilotToken: { isNoAuthUser: true, isFreeUser: false } },
+				{ anyGitHubSession: undefined, copilotToken: { isNoAuthUser: true, isFreeUser: false, isUsageBasedBilling: true } },
 				{ quotaExhausted: true },
 			);
 
-			// Anonymous user has a copilotToken but no GitHub session.
+			// Anonymous UBB user has a copilotToken but no GitHub session.
 			// They should still see the exhausted notification.
 			quotaEmitter.fire();
 
 			expect(mockNotification.show).toHaveBeenCalled();
 			expect(mockNotification.message).toBe('Credit Limit Reached');
 			expect(mockNotification.description).toBe('Sign in to keep going.');
 		});
+
+		test('anonymous PRU user does not see quota notifications', () => {
+			setup(
+				{ anyGitHubSession: undefined, copilotToken: { isNoAuthUser: true, isFreeUser: false, isUsageBasedBilling: false } },
+				{ quotaExhausted: true },
+			);
+
+			quotaEmitter.fire();
+
+			expect(mockNotification.show).not.toHaveBeenCalled();
+		});
 	});
 
 	// --- basic notification lifecycle ----------------------------------------
 
 	describe('quota exhausted', () => {
 		test('shows exhausted notification', () => {
 			setup(
-				{ copilotToken: { isFreeUser: true, isNoAuthUser: false } },
+				{ copilotToken: { isFreeUser: true, isNoAuthUser: false, isUsageBasedBilling: true } },
 				{ quotaExhausted: true },
 			);
 
@@ -362,4 +373,62 @@ describe('ChatInputNotificationContribution', () => {
 			expect(mockNotification.message).toBe('Credit Limit Reached');
 		});
 	});
+
+	describe('PRU users do not see quota notifications', () => {
+		test('does not show exhausted notification for individual PRU user', () => {
+			setup(
+				{ copilotToken: { isFreeUser: false, isNoAuthUser: false, isManagedPlan: false, isUsageBasedBilling: false } },
+				{ quotaExhausted: true },
+			);
+
+			quotaEmitter.fire();
+
+			expect(mockNotification.show).not.toHaveBeenCalled();
+		});
+
+		test('does not show exhausted notification for free PRU user', () => {
+			setup(
+				{ copilotToken: { isFreeUser: true, isNoAuthUser: false, isManagedPlan: false, isUsageBasedBilling: false } },
+				{ quotaExhausted: true },
+			);
+
+			quotaEmitter.fire();
+
+			expect(mockNotification.show).not.toHaveBeenCalled();
+		});
+
+		test('does not show exhausted notification for managed plan PRU user', () => {
+			setup(
+				{ copilotToken: { isFreeUser: false, isNoAuthUser: false, isManagedPlan: true, isUsageBasedBilling: false } },
+				{ quotaExhausted: true },
+			);
+
+			quotaEmitter.fire();
+
+			expect(mockNotification.show).not.toHaveBeenCalled();
+		});
+
+		test('does not show approaching notification for PRU user', () => {
+			setup(
+				{ copilotToken: { isFreeUser: false, isNoAuthUser: false, isManagedPlan: false, isUsageBasedBilling: false } },
+				{ quotaInfo: makeQuota(5) }, // 95% used
+			);
+
+			quotaEmitter.fire();
+
+			expect(mockNotification.show).not.toHaveBeenCalled();
+		});
+
+		test('still shows rate limit warning for PRU user', () => {
+			setup(
+				{ copilotToken: { isFreeUser: false, isNoAuthUser: false, isManagedPlan: false, isUsageBasedBilling: false } },
+				{ session: makeQuota(25) }, // 75% used
+			);
+
+			quotaEmitter.fire();
+
+			expect(mockNotification.show).toHaveBeenCalled();
+			expect(mockNotification.message).toContain('session');
+		});
+	});
 });

extensions/copilot/src/extension/tools/node/toolSearchTool.ts

@@ -75,13 +75,18 @@ ToolRegistry.registerModelSpecificTool(
 			required: ['query'],
 		},
 		models: [
+			{ family: 'gpt-5.4' },
+			{ family: 'gpt-5.5' },
 			{ family: 'claude-sonnet-4.5' },
 			{ family: 'claude-sonnet-4.6' },
 			{ family: 'claude-opus-4.5' },
 			{ family: 'claude-opus-4.6' },
 			{ family: 'claude-opus-4.6-1m' },
 			{ family: 'claude-opus-4.7' },
 			{ family: 'claude-opus-4.7-1m' },
+			{ family: 'claude-opus-4.7-1m-internal' },
+			{ family: 'claude-opus-4.7-high' },
+			{ family: 'claude-opus-4.7-xhigh' },
 		],
 	},
 	ToolSearchTool,

extensions/copilot/src/platform/authentication/common/copilotToken.ts

@@ -143,6 +143,10 @@ export class CopilotToken {
 		return plan === 'business' || plan === 'enterprise';
 	}
 
+	get isUsageBasedBilling(): boolean {
+		return this._info.token_based_billing === true;
+	}
+
 	get isChatQuotaExceeded(): boolean {
 		return this.isFreeUser && (this._info.limited_user_quotas?.chat ?? 1) <= 0;
 	}
@@ -530,6 +534,7 @@ export interface CopilotUserInfo extends CopilotUserQuotaInfo {
 		name: string | null;
 	}>;
 	codex_agent_enabled?: boolean;
+	token_based_billing?: boolean;
 }
 
 /**
@@ -540,7 +545,7 @@ export type ExtendedTokenInfo = TokenEnvelope & {
 	// Extended fields added by client
 	username: string;
 	isVscodeTeamMember: boolean;
-} & Pick<CopilotUserInfo, 'copilot_plan' | 'quota_snapshots' | 'quota_reset_date' | 'codex_agent_enabled' | 'organization_login_list'>;
+} & Pick<CopilotUserInfo, 'copilot_plan' | 'quota_snapshots' | 'quota_reset_date' | 'codex_agent_enabled' | 'organization_login_list' | 'token_based_billing'>;
 
 /**
  * Creates a minimal ExtendedTokenInfo for testing purposes.

extensions/copilot/src/platform/authentication/node/copilotTokenManager.ts

@@ -236,6 +236,7 @@ export abstract class BaseCopilotTokenManager extends Disposable implements ICop
 			quota_reset_date: userInfo?.quota_reset_date,
 			codex_agent_enabled: userInfo?.codex_agent_enabled,
 			organization_login_list: userInfo?.organization_login_list ?? [],
+			token_based_billing: userInfo?.token_based_billing,
 			username: login,
 			isVscodeTeamMember: containsVSCodeOrg(tokenInfo.organization_list ?? []),
 		};

extensions/copilot/src/platform/configuration/common/configurationService.ts

@@ -933,8 +933,6 @@ export namespace ConfigKey {
 	export const ResponsesApiContextManagementEnabled = defineSetting<boolean>('chat.responsesApiContextManagement.enabled', ConfigType.ExperimentBased, false);
 	/** Enable client-side prompt_cache_key (conversationId:modelFamily) sent to Responses API */
 	export const ResponsesApiPromptCacheKeyEnabled = defineSetting<boolean>('chat.responsesApi.promptCacheKey.enabled', ConfigType.ExperimentBased, false);
-	/** Enable tool search for Responses API (client-side deferred tool loading). */
-	export const ResponsesApiToolSearchEnabled = defineSetting<boolean>('chat.responsesApi.toolSearchTool.enabled', ConfigType.ExperimentBased, false);
 	/** Enable updated prompt for 5.3Codex model */
 	export const Updated53CodexPromptEnabled = defineSetting<boolean>('chat.updated53CodexPrompt.enabled', ConfigType.ExperimentBased, true);
 	/** Enable updated prompt for Claude Opus 4.7 model */

extensions/copilot/src/platform/endpoint/common/chatModelCapabilities.ts

@@ -421,36 +421,20 @@ export function getVerbosityForModelSync(model: IChatEndpoint): 'low' | 'medium'
  * - Claude Opus 4.5 (claude-opus-4-5-* or claude-opus-4.5-*)
  * - Claude Opus 4.6 (claude-opus-4-6-* or claude-opus-4.6-*)
  * - Claude Opus 4.7 (claude-opus-4-7-* or claude-opus-4.7-*)
- * - OpenAI gpt-5.4/gpt-5.5, but only when the `ResponsesApiToolSearchEnabled` setting is enabled
+ * - OpenAI gpt-5.4 and gpt-5.5 (via Responses API client-side tool search)
  */
-export function modelSupportsToolSearch(modelId: string, configurationService?: IConfigurationService, experimentationService?: IExperimentationService): boolean {
+export function modelSupportsToolSearch(modelId: string): boolean {
 	const normalized = modelId.toLowerCase().replace(/\./g, '-');
-	if (isResponsesApiToolSearchModelId(normalized)) {
-		return !!configurationService && !!experimentationService && isResponsesApiToolSearchEnabled(modelId, configurationService, experimentationService);
-	}
-
-	return normalized.startsWith('claude-sonnet-4-5') ||
+	return normalized === 'gpt-5-4' ||
+		normalized === 'gpt-5-5' ||
+		normalized.startsWith('claude-sonnet-4-5') ||
 		normalized.startsWith('claude-sonnet-4-6') ||
 		normalized.startsWith('claude-opus-4-5') ||
 		normalized.startsWith('claude-opus-4-6') ||
 		normalized.startsWith('claude-opus-4-7') ||
 		isHiddenModelG(modelId);
 }
 
-function isResponsesApiToolSearchModelId(normalizedModelId: string): boolean {
-	return normalizedModelId === 'gpt-5-4' || normalizedModelId === 'gpt-5-5';
-}
-
-export function isResponsesApiToolSearchEnabled(
-	endpoint: IChatEndpoint | string,
-	configurationService: IConfigurationService,
-	experimentationService: IExperimentationService,
-): boolean {
-	const modelId = typeof endpoint === 'string' ? endpoint : endpoint.model;
-	const normalized = modelId.toLowerCase().replace(/\./g, '-');
-	return isResponsesApiToolSearchModelId(normalized) && configurationService.getExperimentBasedConfig(ConfigKey.ResponsesApiToolSearchEnabled, experimentationService);
-}
-
 /**
  * Context editing is supported by:
  * - Claude Haiku 4.5 (claude-haiku-4-5-* or claude-haiku-4.5-*)

extensions/copilot/src/platform/endpoint/node/chatEndpoint.ts

@@ -199,7 +199,7 @@ export class ChatEndpoint implements IChatEndpoint {
 		this.minThinkingBudget = modelMetadata.capabilities.supports.min_thinking_budget;
 		this.maxThinkingBudget = modelMetadata.capabilities.supports.max_thinking_budget;
 		this.supportsReasoningEffort = modelMetadata.capabilities.supports.reasoning_effort;
-		this.supportsToolSearch = modelMetadata.capabilities.supports.tool_search ?? modelSupportsToolSearch(this.model, this._configurationService, this._expService);
+		this.supportsToolSearch = modelMetadata.capabilities.supports.tool_search ?? modelSupportsToolSearch(this.model);
 		this.supportsContextEditing = modelMetadata.capabilities.supports.context_editing ?? modelSupportsContextEditing(this.model);
 		this._supportsStreaming = !!modelMetadata.capabilities.supports.streaming;
 		this.customModel = modelMetadata.custom_model;