Merge branch 'main' into roo_provider_on_welcome

Author: mrubens

packages/types/src/telemetry.ts

@@ -63,6 +63,9 @@ export enum TelemetryEventName {
 
 	FEATURED_PROVIDER_CLICKED = "Featured Provider Clicked",
 
+	UPSELL_DISMISSED = "Upsell Dismissed",
+	UPSELL_CLICKED = "Upsell Clicked",
+
 	SCHEMA_VALIDATION_ERROR = "Schema Validation Error",
 	DIFF_APPLICATION_ERROR = "Diff Application Error",
 	SHELL_INTEGRATION_ERROR = "Shell Integration Error",
@@ -184,6 +187,8 @@ export const rooCodeTelemetryEventSchema = z.discriminatedUnion("type", [
 			TelemetryEventName.ACCOUNT_LOGOUT_CLICKED,
 			TelemetryEventName.ACCOUNT_LOGOUT_SUCCESS,
 			TelemetryEventName.FEATURED_PROVIDER_CLICKED,
+			TelemetryEventName.UPSELL_DISMISSED,
+			TelemetryEventName.UPSELL_CLICKED,
 			TelemetryEventName.SCHEMA_VALIDATION_ERROR,
 			TelemetryEventName.DIFF_APPLICATION_ERROR,
 			TelemetryEventName.SHELL_INTEGRATION_ERROR,

src/core/tools/multiApplyDiffTool.ts

@@ -463,7 +463,7 @@ Error: ${failPart.error}
 Suggested fixes:
 1. Verify the search content exactly matches the file content (including whitespace and case)
 2. Check for correct indentation and line endings
-3. Use <read_file> to see the current file content
+3. Use the read_file tool to verify the file's current contents
 4. Consider breaking complex changes into smaller diffs
 5. Ensure start_line parameter matches the actual content location
 ${errorDetails ? `\nDetailed error information:\n${errorDetails}\n` : ""}
@@ -476,7 +476,7 @@ Unable to apply diffs to file: ${absolutePath}
 Error: ${diffResult.error}
 
 Recovery suggestions:
-1. Use <read_file> to examine the current file content
+1. Use the read_file tool to verify the file's current contents
 2. Verify the diff format matches the expected search/replace pattern
 3. Check that the search content exactly matches what's in the file
 4. Consider using line numbers with start_line parameter

src/core/webview/ClineProvider.ts

@@ -2255,6 +2255,18 @@ export class ClineProvider
 			return
 		}
 
+		// Log out from cloud if authenticated
+		if (CloudService.hasInstance()) {
+			try {
+				await CloudService.instance.logout()
+			} catch (error) {
+				this.log(
+					`Failed to logout from cloud during reset: ${error instanceof Error ? error.message : String(error)}`,
+				)
+				// Continue with reset even if logout fails
+			}
+		}
+
 		await this.contextProxy.resetAllState()
 		await this.providerSettingsManager.resetAllConfigs()
 		await this.customModesManager.resetCustomModes()

webview-ui/src/components/common/DismissibleUpsell.tsx

@@ -1,6 +1,8 @@
 import { memo, ReactNode, useEffect, useState, useRef } from "react"
 import { vscode } from "@src/utils/vscode"
 import { useAppTranslation } from "@src/i18n/TranslationContext"
+import { telemetryClient } from "@src/utils/TelemetryClient"
+import { TelemetryEventName } from "@roo-code/types"
 
 interface DismissibleUpsellProps {
 	/** Required unique identifier for this upsell */
@@ -76,7 +78,12 @@ const DismissibleUpsell = memo(
 			}
 		}, [upsellId])
 
-		const handleDismiss = async () => {
+		const handleDismiss = () => {
+			// Track telemetry for dismissal
+			telemetryClient.capture(TelemetryEventName.UPSELL_DISMISSED, {
+				upsellId: upsellId,
+			})
+
 			// First notify the extension to persist the dismissal
 			// This ensures the message is sent even if the component unmounts quickly
 			vscode.postMessage({
@@ -134,6 +141,13 @@ const DismissibleUpsell = memo(
 			<div
 				className={containerClasses}
 				onClick={() => {
+					// Track telemetry for click
+					if (onClick) {
+						telemetryClient.capture(TelemetryEventName.UPSELL_CLICKED, {
+							upsellId: upsellId,
+						})
+					}
+
 					// Call the onClick handler if provided
 					onClick?.()
 					// Also dismiss if dismissOnClick is true

webview-ui/src/components/common/__tests__/DismissibleUpsell.spec.tsx

@@ -1,6 +1,7 @@
 import { render, screen, fireEvent, waitFor, act } from "@testing-library/react"
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest"
 import DismissibleUpsell from "../DismissibleUpsell"
+import { TelemetryEventName } from "@roo-code/types"
 
 // Mock the vscode API
 const mockPostMessage = vi.fn()
@@ -10,6 +11,14 @@ vi.mock("@src/utils/vscode", () => ({
 	},
 }))
 
+// Mock telemetryClient
+const mockCapture = vi.fn()
+vi.mock("@src/utils/TelemetryClient", () => ({
+	telemetryClient: {
+		capture: (eventName: string, properties?: Record<string, any>) => mockCapture(eventName, properties),
+	},
+}))
+
 // Mock the translation hook
 vi.mock("@src/i18n/TranslationContext", () => ({
 	useAppTranslation: () => ({
@@ -26,6 +35,7 @@ vi.mock("@src/i18n/TranslationContext", () => ({
 describe("DismissibleUpsell", () => {
 	beforeEach(() => {
 		mockPostMessage.mockClear()
+		mockCapture.mockClear()
 		vi.clearAllTimers()
 	})
 
@@ -72,7 +82,7 @@ describe("DismissibleUpsell", () => {
 		})
 	})
 
-	it("hides the upsell when dismiss button is clicked", async () => {
+	it("hides the upsell when dismiss button is clicked and tracks telemetry", async () => {
 		const onDismiss = vi.fn()
 		const { container } = render(
 			<DismissibleUpsell upsellId="test-upsell" onDismiss={onDismiss}>
@@ -92,6 +102,11 @@ describe("DismissibleUpsell", () => {
 		const dismissButton = screen.getByRole("button", { name: /dismiss/i })
 		fireEvent.click(dismissButton)
 
+		// Check that telemetry was tracked
+		expect(mockCapture).toHaveBeenCalledWith(TelemetryEventName.UPSELL_DISMISSED, {
+			upsellId: "test-upsell",
+		})
+
 		// Check that the dismiss message was sent BEFORE hiding
 		expect(mockPostMessage).toHaveBeenCalledWith({
 			type: "dismissUpsell",
@@ -351,7 +366,7 @@ describe("DismissibleUpsell", () => {
 		})
 	})
 
-	it("calls onClick when the container is clicked", async () => {
+	it("calls onClick when the container is clicked and tracks telemetry", async () => {
 		const onClick = vi.fn()
 		render(
 			<DismissibleUpsell upsellId="test-upsell" onClick={onClick}>
@@ -372,6 +387,11 @@ describe("DismissibleUpsell", () => {
 		fireEvent.click(container)
 
 		expect(onClick).toHaveBeenCalledTimes(1)
+
+		// Check that telemetry was tracked
+		expect(mockCapture).toHaveBeenCalledWith(TelemetryEventName.UPSELL_CLICKED, {
+			upsellId: "test-upsell",
+		})
 	})
 
 	it("does not call onClick when dismiss button is clicked", async () => {
@@ -470,7 +490,7 @@ describe("DismissibleUpsell", () => {
 		})
 	})
 
-	it("dismisses when clicked if dismissOnClick is true", async () => {
+	it("dismisses when clicked if dismissOnClick is true and tracks both telemetry events", async () => {
 		const onClick = vi.fn()
 		const onDismiss = vi.fn()
 		const { container } = render(
@@ -493,6 +513,14 @@ describe("DismissibleUpsell", () => {
 		expect(onClick).toHaveBeenCalledTimes(1)
 		expect(onDismiss).toHaveBeenCalledTimes(1)
 
+		// Check that both telemetry events were tracked
+		expect(mockCapture).toHaveBeenCalledWith(TelemetryEventName.UPSELL_CLICKED, {
+			upsellId: "test-upsell",
+		})
+		expect(mockCapture).toHaveBeenCalledWith(TelemetryEventName.UPSELL_DISMISSED, {
+			upsellId: "test-upsell",
+		})
+
 		expect(mockPostMessage).toHaveBeenCalledWith({
 			type: "dismissUpsell",
 			upsellId: "test-upsell",
@@ -503,6 +531,46 @@ describe("DismissibleUpsell", () => {
 		})
 	})
 
+	it("dismisses on container click when dismissOnClick is true and no onClick is provided; tracks only dismissal", async () => {
+		const onDismiss = vi.fn()
+		const { container } = render(
+			<DismissibleUpsell upsellId="test-upsell" onDismiss={onDismiss} dismissOnClick={true}>
+				<div>Test content</div>
+			</DismissibleUpsell>,
+		)
+
+		// Make component visible
+		makeUpsellVisible()
+
+		// Wait for component to be visible
+		await waitFor(() => {
+			expect(screen.getByText("Test content")).toBeInTheDocument()
+		})
+
+		// Click on the container (not the dismiss button)
+		const containerDiv = screen.getByText("Test content").parentElement as HTMLElement
+		fireEvent.click(containerDiv)
+
+		// onDismiss should be called
+		expect(onDismiss).toHaveBeenCalledTimes(1)
+
+		// Telemetry: only dismissal should be tracked
+		expect(mockCapture).toHaveBeenCalledWith(TelemetryEventName.UPSELL_DISMISSED, {
+			upsellId: "test-upsell",
+		})
+		expect(mockCapture).not.toHaveBeenCalledWith(TelemetryEventName.UPSELL_CLICKED, expect.anything())
+
+		// Dismiss message should be sent
+		expect(mockPostMessage).toHaveBeenCalledWith({
+			type: "dismissUpsell",
+			upsellId: "test-upsell",
+		})
+
+		// Component should be hidden
+		await waitFor(() => {
+			expect(container.firstChild).toBeNull()
+		})
+	})
 	it("does not dismiss when clicked if dismissOnClick is false", async () => {
 		const onClick = vi.fn()
 		const onDismiss = vi.fn()