Only load marketplace data when in experiment

Author: mrubens

src/core/webview/ClineProvider.ts

@@ -1346,8 +1346,15 @@ export class ClineProvider
 		const allowedCommands = vscode.workspace.getConfiguration(Package.name).get<string[]>("allowedCommands") || []
 		const cwd = this.cwd
 
-		const marketplaceItems = (await this.marketplaceManager.getCurrentItems()) || []
-		const marketplaceInstalledMetadata = await this.marketplaceManager.getInstallationMetadata()
+		// Only fetch marketplace data if the feature is enabled
+		const currentExperiments = await this.getState().then((state) => state.experiments)
+		let marketplaceItems: any[] = []
+		let marketplaceInstalledMetadata: any = { project: {}, global: {} }
+
+		if (currentExperiments.marketplace) {
+			marketplaceItems = (await this.marketplaceManager.getCurrentItems()) || []
+			marketplaceInstalledMetadata = await this.marketplaceManager.getInstallationMetadata()
+		}
 
 		// Check if there's a system prompt override for the current mode
 		const currentMode = mode ?? defaultModeSlug

src/core/webview/webviewMessageHandler.ts

@@ -1476,6 +1476,13 @@ export const webviewMessageHandler = async (
 			break
 		}
 		case "filterMarketplaceItems": {
+			// Check if marketplace is enabled before making API calls
+			const { experiments } = await provider.getState()
+			if (!experiments.marketplace) {
+				console.log("Marketplace: Feature disabled, skipping API call")
+				break
+			}
+
 			if (marketplaceManager && message.filters) {
 				try {
 					await marketplaceManager.updateWithFilteredItems({
@@ -1493,6 +1500,13 @@ export const webviewMessageHandler = async (
 		}
 
 		case "installMarketplaceItem": {
+			// Check if marketplace is enabled before installing
+			const { experiments } = await provider.getState()
+			if (!experiments.marketplace) {
+				console.log("Marketplace: Feature disabled, skipping installation")
+				break
+			}
+
 			if (marketplaceManager && message.mpItem && message.mpInstallOptions) {
 				try {
 					const configFilePath = await marketplaceManager.installMarketplaceItem(
@@ -1522,6 +1536,13 @@ export const webviewMessageHandler = async (
 		}
 
 		case "removeInstalledMarketplaceItem": {
+			// Check if marketplace is enabled before removing
+			const { experiments } = await provider.getState()
+			if (!experiments.marketplace) {
+				console.log("Marketplace: Feature disabled, skipping removal")
+				break
+			}
+
 			if (marketplaceManager && message.mpItem && message.mpInstallOptions) {
 				try {
 					await marketplaceManager.removeInstalledMarketplaceItem(message.mpItem, message.mpInstallOptions)
@@ -1534,6 +1555,13 @@ export const webviewMessageHandler = async (
 		}
 
 		case "installMarketplaceItemWithParameters": {
+			// Check if marketplace is enabled before installing with parameters
+			const { experiments } = await provider.getState()
+			if (!experiments.marketplace) {
+				console.log("Marketplace: Feature disabled, skipping installation with parameters")
+				break
+			}
+
 			if (marketplaceManager && message.payload && "item" in message.payload && "parameters" in message.payload) {
 				try {
 					const configFilePath = await marketplaceManager.installMarketplaceItem(message.payload.item, {

src/services/marketplace/__tests__/marketplace-setting-check.test.ts

@@ -0,0 +1,87 @@
+import { webviewMessageHandler } from "../../../core/webview/webviewMessageHandler"
+import { MarketplaceManager } from "../MarketplaceManager"
+
+// Mock the provider and marketplace manager
+const mockProvider = {
+	getState: jest.fn(),
+	postStateToWebview: jest.fn(),
+} as any
+
+const mockMarketplaceManager = {
+	updateWithFilteredItems: jest.fn(),
+} as any
+
+describe("Marketplace Setting Check", () => {
+	beforeEach(() => {
+		jest.clearAllMocks()
+	})
+
+	it("should skip API calls when marketplace is disabled", async () => {
+		// Mock experiments with marketplace disabled
+		mockProvider.getState.mockResolvedValue({
+			experiments: { marketplace: false },
+		})
+
+		const message = {
+			type: "filterMarketplaceItems" as const,
+			filters: { type: "mcp", search: "", tags: [] },
+		}
+
+		await webviewMessageHandler(mockProvider, message, mockMarketplaceManager)
+
+		// Should not call marketplace manager methods
+		expect(mockMarketplaceManager.updateWithFilteredItems).not.toHaveBeenCalled()
+		expect(mockProvider.postStateToWebview).not.toHaveBeenCalled()
+	})
+
+	it("should allow API calls when marketplace is enabled", async () => {
+		// Mock experiments with marketplace enabled
+		mockProvider.getState.mockResolvedValue({
+			experiments: { marketplace: true },
+		})
+
+		const message = {
+			type: "filterMarketplaceItems" as const,
+			filters: { type: "mcp", search: "", tags: [] },
+		}
+
+		await webviewMessageHandler(mockProvider, message, mockMarketplaceManager)
+
+		// Should call marketplace manager methods
+		expect(mockMarketplaceManager.updateWithFilteredItems).toHaveBeenCalledWith({
+			type: "mcp",
+			search: "",
+			tags: [],
+		})
+		expect(mockProvider.postStateToWebview).toHaveBeenCalled()
+	})
+
+	it("should skip installation when marketplace is disabled", async () => {
+		// Mock experiments with marketplace disabled
+		mockProvider.getState.mockResolvedValue({
+			experiments: { marketplace: false },
+		})
+
+		const mockInstallMarketplaceItem = jest.fn()
+		const mockMarketplaceManagerWithInstall = {
+			installMarketplaceItem: mockInstallMarketplaceItem,
+		}
+
+		const message = {
+			type: "installMarketplaceItem" as const,
+			mpItem: {
+				id: "test-item",
+				name: "Test Item",
+				type: "mcp" as const,
+				description: "Test description",
+				content: "test content",
+			},
+			mpInstallOptions: { target: "project" as const },
+		}
+
+		await webviewMessageHandler(mockProvider, message, mockMarketplaceManagerWithInstall as any)
+
+		// Should not call install method
+		expect(mockInstallMarketplaceItem).not.toHaveBeenCalled()
+	})
+})