PR feedback

Author: mrubens

packages/telemetry/src/TelemetryService.ts

@@ -1,6 +1,11 @@
 import { ZodError } from "zod"
 
-import { type TelemetryClient, type TelemetryPropertiesProvider, TelemetryEventName } from "@roo-code/types"
+import {
+	type TelemetryClient,
+	type TelemetryPropertiesProvider,
+	TelemetryEventName,
+	type TelemetrySetting,
+} from "@roo-code/types"
 
 /**
  * TelemetryService wrapper class that defers initialization.
@@ -231,7 +236,7 @@ export class TelemetryService {
 	 * @param previousSetting The previous telemetry setting
 	 * @param newSetting The new telemetry setting
 	 */
-	public captureTelemetrySettingsChanged(previousSetting: string, newSetting: string): void {
+	public captureTelemetrySettingsChanged(previousSetting: TelemetrySetting, newSetting: TelemetrySetting): void {
 		this.captureEvent(TelemetryEventName.TELEMETRY_SETTINGS_CHANGED, {
 			previousSetting,
 			newSetting,

packages/types/src/telemetry.ts

@@ -200,10 +200,17 @@ export const rooCodeTelemetryEventSchema = z.discriminatedUnion("type", [
 			TelemetryEventName.TAB_SHOWN,
 			TelemetryEventName.MODE_SETTINGS_CHANGED,
 			TelemetryEventName.CUSTOM_MODE_CREATED,
-			TelemetryEventName.TELEMETRY_SETTINGS_CHANGED,
 		]),
 		properties: telemetryPropertiesSchema,
 	}),
+	z.object({
+		type: z.literal(TelemetryEventName.TELEMETRY_SETTINGS_CHANGED),
+		properties: z.object({
+			...telemetryPropertiesSchema.shape,
+			previousSetting: telemetrySettingsSchema,
+			newSetting: telemetrySettingsSchema,
+		}),
+	}),
 	z.object({
 		type: z.literal(TelemetryEventName.TASK_MESSAGE),
 		properties: z.object({

src/core/webview/webviewMessageHandler.ts

@@ -2304,10 +2304,11 @@ export const webviewMessageHandler = async (
 			if (wasPreviouslyOptedIn && !isOptedIn && TelemetryService.hasInstance()) {
 				TelemetryService.instance.captureTelemetrySettingsChanged(previousSetting, telemetrySetting)
 			}
-
 			// Update the telemetry state
 			await updateGlobalState("telemetrySetting", telemetrySetting)
-			TelemetryService.instance.updateTelemetryState(isOptedIn)
+			if (TelemetryService.hasInstance()) {
+				TelemetryService.instance.updateTelemetryState(isOptedIn)
+			}
 
 			// If turning telemetry ON, fire event AFTER enabling
 			if (!wasPreviouslyOptedIn && isOptedIn && TelemetryService.hasInstance()) {