fix(telemetry): honor vscode.env.isTelemetryEnabled in webview message handler

Author: edelauna

src/core/webview/__tests__/webviewMessageHandler.spec.ts

@@ -51,6 +51,16 @@ vi.mock("../rulesMessageHandler", () => ({
 	handleOpenRulesDirectory: vi.fn(),
 }))
 
+vi.mock("@roo-code/telemetry", () => ({
+	TelemetryService: {
+		hasInstance: vi.fn().mockReturnValue(false),
+		instance: {
+			updateTelemetryState: vi.fn(),
+			captureTelemetrySettingsChanged: vi.fn(),
+		},
+	},
+}))
+
 import type { ModelRecord } from "@roo-code/types"
 
 import { webviewMessageHandler } from "../webviewMessageHandler"
@@ -127,6 +137,9 @@ vi.mock("vscode", () => {
 		commands: {
 			executeCommand: vi.fn().mockResolvedValue(undefined),
 		},
+		env: {
+			isTelemetryEnabled: true,
+		},
 	}
 })
 
@@ -1428,3 +1441,48 @@ describe("zooCodeSignOut", () => {
 		)
 	})
 })
+
+describe("webviewMessageHandler - telemetrySetting", () => {
+	beforeEach(() => {
+		vi.clearAllMocks()
+		vi.mocked(vscode.env).isTelemetryEnabled = true
+	})
+
+	// Regression test: TelemetryService.updateTelemetryState must be gated on
+	// vscode.env.isTelemetryEnabled in addition to the stored setting, matching
+	// extension.ts's onDidChangeTelemetryEnabled listener. Without this AND, a user
+	// clicking Accept in the webview could re-enable telemetry even while VS Code's
+	// global telemetry toggle is off.
+	it("does not enable telemetry when the user accepts but VS Code's global telemetry toggle is off", async () => {
+		const { TelemetryService } = await import("@roo-code/telemetry")
+		vi.mocked(TelemetryService.hasInstance).mockReturnValue(true)
+		vi.mocked(vscode.env).isTelemetryEnabled = false
+		vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(undefined)
+
+		await webviewMessageHandler(mockClineProvider, { type: "telemetrySetting", text: "enabled" })
+
+		expect(TelemetryService.instance.updateTelemetryState).toHaveBeenCalledWith(false)
+	})
+
+	it("enables telemetry when the user accepts and VS Code's global telemetry toggle is on", async () => {
+		const { TelemetryService } = await import("@roo-code/telemetry")
+		vi.mocked(TelemetryService.hasInstance).mockReturnValue(true)
+		vi.mocked(vscode.env).isTelemetryEnabled = true
+		vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(undefined)
+
+		await webviewMessageHandler(mockClineProvider, { type: "telemetrySetting", text: "enabled" })
+
+		expect(TelemetryService.instance.updateTelemetryState).toHaveBeenCalledWith(true)
+	})
+
+	it("keeps telemetry disabled when the user declines, regardless of VS Code's global toggle", async () => {
+		const { TelemetryService } = await import("@roo-code/telemetry")
+		vi.mocked(TelemetryService.hasInstance).mockReturnValue(true)
+		vi.mocked(vscode.env).isTelemetryEnabled = true
+		vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(undefined)
+
+		await webviewMessageHandler(mockClineProvider, { type: "telemetrySetting", text: "disabled" })
+
+		expect(TelemetryService.instance.updateTelemetryState).toHaveBeenCalledWith(false)
+	})
+})

src/core/webview/webviewMessageHandler.ts

@@ -631,9 +631,14 @@ export const webviewMessageHandler = async (
 
 			// Telemetry is on by disclosed default: "unset" (no choice made yet) leaves that
 			// default in effect, same as "enabled". Only an explicit "disabled" opts out.
+			// vscode.env.isTelemetryEnabled is ANDed in (matching extension.ts's
+			// onDidChangeTelemetryEnabled listener) so a webview reload can't re-enable
+			// telemetry while VS Code's global toggle is off.
 			provider.getStateToPostToWebview().then((state) => {
 				const { telemetrySetting } = state
-				TelemetryService.instance.updateTelemetryState(isTelemetryOptedIn(telemetrySetting))
+				TelemetryService.instance.updateTelemetryState(
+					isTelemetryOptedIn(telemetrySetting) && vscode.env.isTelemetryEnabled,
+				)
 			})
 
 			provider.isViewLaunched = true
@@ -2470,11 +2475,15 @@ export const webviewMessageHandler = async (
 				TelemetryService.instance.captureTelemetrySettingsChanged(previousSetting, telemetrySetting)
 			}
 
-			// Update the telemetry state
+			// Update the telemetry state. vscode.env.isTelemetryEnabled is ANDed in
+			// (matching extension.ts's onDidChangeTelemetryEnabled listener) so this can't
+			// re-enable telemetry while VS Code's global toggle is off -- the
+			// captureTelemetrySettingsChanged calls above/below still track the user's
+			// stored preference transition on its own, independent of that live toggle.
 			await updateGlobalState("telemetrySetting", telemetrySetting)
 
 			if (TelemetryService.hasInstance()) {
-				TelemetryService.instance.updateTelemetryState(isOptedIn)
+				TelemetryService.instance.updateTelemetryState(isOptedIn && vscode.env.isTelemetryEnabled)
 			}
 
 			// If turning telemetry ON, fire event AFTER enabling