Make it clear that we don't capture messages in default telemetry

Author: cte

packages/cloud/src/CloudService.ts

@@ -1,7 +1,7 @@
 import * as vscode from "vscode"
 import EventEmitter from "events"
 
-import type { CloudUserInfo } from "@roo-code/types"
+import type { CloudUserInfo, TelemetryEvent } from "@roo-code/types"
 import { TelemetryService } from "@roo-code/telemetry"
 
 import { AuthService, type AuthServiceEvents } from "./AuthService"
@@ -117,6 +117,13 @@ export class CloudService extends EventEmitter<CloudServiceEvents> {
 		return this.settingsService!.getAllowList()
 	}
 
+	// TelemetryClient
+
+	public captureEvent(event: TelemetryEvent): void {
+		this.ensureInitialized()
+		this.telemetryClient!.capture(event)
+	}
+
 	// Lifecycle
 
 	public dispose(): void {
@@ -165,4 +172,8 @@ export class CloudService extends EventEmitter<CloudServiceEvents> {
 			this._instance = null
 		}
 	}
+
+	static isEnabled(): boolean {
+		return !!this._instance?.isAuthenticated()
+	}
 }

packages/telemetry/src/TelemetryService.ts

@@ -1,11 +1,6 @@
 import { ZodError } from "zod"
 
-import {
-	type TelemetryClient,
-	type TelemetryPropertiesProvider,
-	type ClineMessage,
-	TelemetryEventName,
-} from "@roo-code/types"
+import { type TelemetryClient, type TelemetryPropertiesProvider, TelemetryEventName } from "@roo-code/types"
 
 /**
  * TelemetryService wrapper class that defers initialization.
@@ -77,10 +72,6 @@ export class TelemetryService {
 		this.captureEvent(TelemetryEventName.TASK_COMPLETED, { taskId })
 	}
 
-	public captureTaskMessage(taskId: string, message: ClineMessage): void {
-		this.captureEvent(TelemetryEventName.TASK_MESSAGE, { taskId, message })
-	}
-
 	public captureConversationMessage(taskId: string, source: "user" | "assistant"): void {
 		this.captureEvent(TelemetryEventName.TASK_CONVERSATION_MESSAGE, { taskId, source })
 	}

src/core/task/Task.ts

@@ -8,19 +8,21 @@ import delay from "delay"
 import pWaitFor from "p-wait-for"
 import { serializeError } from "serialize-error"
 
-import type {
-	ProviderSettings,
-	TokenUsage,
-	ToolUsage,
-	ToolName,
-	ContextCondense,
-	ClineAsk,
-	ClineMessage,
-	ClineSay,
-	ToolProgressStatus,
-	HistoryItem,
+import {
+	type ProviderSettings,
+	type TokenUsage,
+	type ToolUsage,
+	type ToolName,
+	type ContextCondense,
+	type ClineAsk,
+	type ClineMessage,
+	type ClineSay,
+	type ToolProgressStatus,
+	type HistoryItem,
+	TelemetryEventName,
 } from "@roo-code/types"
 import { TelemetryService } from "@roo-code/telemetry"
+import { CloudService } from "@roo-code/cloud"
 
 // api
 import { ApiHandler, ApiHandlerCreateMessageMetadata, buildApiHandler } from "../../api"
@@ -322,8 +324,13 @@ export class Task extends EventEmitter<ClineEvents> {
 		this.emit("message", { action: "created", message })
 		await this.saveClineMessages()
 
-		if (message.partial !== true) {
-			TelemetryService.instance.captureTaskMessage(this.taskId, message)
+		const shouldCaptureMessage = message.partial !== true && CloudService.isEnabled()
+
+		if (shouldCaptureMessage) {
+			CloudService.instance.captureEvent({
+				event: TelemetryEventName.TASK_MESSAGE,
+				properties: { taskId: this.taskId, message },
+			})
 		}
 	}
 
@@ -336,8 +343,13 @@ export class Task extends EventEmitter<ClineEvents> {
 		await this.providerRef.deref()?.postMessageToWebview({ type: "partialMessage", partialMessage })
 		this.emit("message", { action: "updated", message: partialMessage })
 
-		if (partialMessage.partial !== true) {
-			TelemetryService.instance.captureTaskMessage(this.taskId, partialMessage)
+		const shouldCaptureMessage = partialMessage.partial !== true && CloudService.isEnabled()
+
+		if (shouldCaptureMessage) {
+			CloudService.instance.captureEvent({
+				event: TelemetryEventName.TASK_MESSAGE,
+				properties: { taskId: this.taskId, message: partialMessage },
+			})
 		}
 	}