move config check while reading policies (microsoft#264337)

Author: sandy081

src/vs/workbench/services/accounts/common/defaultAccount.ts

@@ -214,7 +214,7 @@ export class DefaultAccountManagementContribution extends Disposable implements
 			this.getTokenEntitlements(session.accessToken, tokenEntitlementUrl),
 		]);
 
-		const mcpRegistryProvider = this.productService.quality !== 'stable' && tokenEntitlements.mcp ? await this.getMcpRegistryProvider(session.accessToken, mcpRegistryDataUrl) : undefined;
+		const mcpRegistryProvider = this.productService.quality !== 'stable' && tokenEntitlements.mcp && this.configurationService.getValue<boolean>('chat.mcp.enterprise.registry.enabled') === true ? await this.getMcpRegistryProvider(session.accessToken, mcpRegistryDataUrl) : undefined;
 
 		return {
 			sessionId: session.id,

src/vs/workbench/services/mcp/electron-browser/mcpGalleryManifestService.ts

@@ -69,19 +69,12 @@ export class WorkbenchMcpGalleryManifestService extends McpGalleryManifestServic
 	}
 
 	private async getAndUpdateMcpGalleryManifest(): Promise<void> {
-		const { policy, value } = this.configurationService.inspect<string>(mcpGalleryServiceUrlConfig);
-
-		if (policy?.value && this.configurationService.getValue<boolean>('chat.mcp.enterprise.registry.enabled') === true) {
-			this.update(this.createMcpGalleryManifest(policy.value));
-			return;
-		}
-
+		const value = this.configurationService.getValue<string>(mcpGalleryServiceUrlConfig);
 		if (value) {
 			this.update(this.createMcpGalleryManifest(value));
-			return;
+		} else {
+			this.update(await super.getMcpGalleryManifest());
 		}
-
-		this.update(await super.getMcpGalleryManifest());
 	}
 
 	private update(manifest: IMcpGalleryManifest | null): void {