Sharing improvements (#5082)

Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
Co-authored-by: John Richmond <[email protected]>
Co-authored-by: cte <[email protected]>

Author: 4 people

packages/build/src/__tests__/index.test.ts

@@ -70,7 +70,7 @@ describe("generatePackageJson", () => {
 							{
 								command: "roo-cline.accountButtonClicked",
 								group: "navigation@6",
-								when: "activeWebviewPanelId == roo-cline.TabPanelProvider && config.roo-cline.rooCodeCloudEnabled",
+								when: "activeWebviewPanelId == roo-cline.TabPanelProvider",
 							},
 						],
 					},
@@ -183,7 +183,7 @@ describe("generatePackageJson", () => {
 						{
 							command: "roo-code-nightly.accountButtonClicked",
 							group: "navigation@6",
-							when: "activeWebviewPanelId == roo-code-nightly.TabPanelProvider && config.roo-code-nightly.rooCodeCloudEnabled",
+							when: "activeWebviewPanelId == roo-code-nightly.TabPanelProvider",
 						},
 					],
 				},

packages/cloud/package.json

@@ -13,7 +13,6 @@
 	"dependencies": {
 		"@roo-code/telemetry": "workspace:^",
 		"@roo-code/types": "workspace:^",
-		"axios": "^1.7.4",
 		"zod": "^3.25.61"
 	},
 	"devDependencies": {

packages/cloud/src/AuthService.ts

@@ -42,8 +42,8 @@ const clerkCreateSessionTokenResponseSchema = z.object({
 
 const clerkMeResponseSchema = z.object({
 	response: z.object({
-		first_name: z.string().optional(),
-		last_name: z.string().optional(),
+		first_name: z.string().optional().nullable(),
+		last_name: z.string().optional().nullable(),
 		image_url: z.string().optional(),
 		primary_email_address_id: z.string().optional(),
 		email_addresses: z
@@ -531,7 +531,8 @@ export class AuthService extends EventEmitter<AuthServiceEvents> {
 
 		const userInfo: CloudUserInfo = {}
 
-		userInfo.name = `${userData.first_name} ${userData.last_name}`
+		const names = [userData.first_name, userData.last_name].filter((name) => !!name)
+		userInfo.name = names.length > 0 ? names.join(" ") : undefined
 		const primaryEmailAddressId = userData.primary_email_address_id
 		const emailAddresses = userData.email_addresses
 

packages/cloud/src/CloudService.ts

@@ -1,13 +1,19 @@
 import * as vscode from "vscode"
 
-import type { CloudUserInfo, TelemetryEvent, OrganizationAllowList } from "@roo-code/types"
+import type {
+	CloudUserInfo,
+	TelemetryEvent,
+	OrganizationAllowList,
+	ClineMessage,
+	ShareVisibility,
+} from "@roo-code/types"
 import { TelemetryService } from "@roo-code/telemetry"
 
 import { CloudServiceCallbacks } from "./types"
 import { AuthService } from "./AuthService"
 import { SettingsService } from "./SettingsService"
 import { TelemetryClient } from "./TelemetryClient"
-import { ShareService } from "./ShareService"
+import { ShareService, TaskNotFoundError } from "./ShareService"
 
 export class CloudService {
 	private static _instance: CloudService | null = null
@@ -161,9 +167,23 @@ export class CloudService {
 
 	// ShareService
 
-	public async shareTask(taskId: string, visibility: "organization" | "public" = "organization") {
+	public async shareTask(
+		taskId: string,
+		visibility: ShareVisibility = "organization",
+		clineMessages?: ClineMessage[],
+	) {
 		this.ensureInitialized()
-		return this.shareService!.shareTask(taskId, visibility)
+
+		try {
+			return await this.shareService!.shareTask(taskId, visibility)
+		} catch (error) {
+			if (error instanceof TaskNotFoundError && clineMessages) {
+				// Backfill messages and retry
+				await this.telemetryClient!.backfillMessages(clineMessages, taskId)
+				return await this.shareService!.shareTask(taskId, visibility)
+			}
+			throw error
+		}
 	}
 
 	public async canShareTask(): Promise<boolean> {

packages/cloud/src/ShareService.ts

@@ -1,4 +1,3 @@
-import axios from "axios"
 import * as vscode from "vscode"
 
 import { shareResponseSchema } from "@roo-code/types"
@@ -9,6 +8,13 @@ import { getUserAgent } from "./utils"
 
 export type ShareVisibility = "organization" | "public"
 
+export class TaskNotFoundError extends Error {
+	constructor(taskId?: string) {
+		super(taskId ? `Task '${taskId}' not found` : "Task not found")
+		Object.setPrototypeOf(this, TaskNotFoundError.prototype)
+	}
+}
+
 export class ShareService {
 	private authService: AuthService
 	private settingsService: SettingsService
@@ -31,19 +37,25 @@ export class ShareService {
 				throw new Error("Authentication required")
 			}
 
-			const response = await axios.post(
-				`${getRooCodeApiUrl()}/api/extension/share`,
-				{ taskId, visibility },
-				{
-					headers: {
-						"Content-Type": "application/json",
-						Authorization: `Bearer ${sessionToken}`,
-						"User-Agent": getUserAgent(),
-					},
+			const response = await fetch(`${getRooCodeApiUrl()}/api/extension/share`, {
+				method: "POST",
+				headers: {
+					"Content-Type": "application/json",
+					Authorization: `Bearer ${sessionToken}`,
+					"User-Agent": getUserAgent(),
 				},
-			)
+				body: JSON.stringify({ taskId, visibility }),
+				signal: AbortSignal.timeout(10000),
+			})
+
+			if (!response.ok) {
+				if (response.status === 404) {
+					throw new TaskNotFoundError(taskId)
+				}
+				throw new Error(`HTTP ${response.status}: ${response.statusText}`)
+			}
 
-			const data = shareResponseSchema.parse(response.data)
+			const data = shareResponseSchema.parse(await response.json())
 			this.log("[share] Share link created successfully:", data)
 
 			if (data.success && data.shareUrl) {

packages/cloud/src/TelemetryClient.ts

@@ -1,4 +1,9 @@
-import { TelemetryEventName, type TelemetryEvent, rooCodeTelemetryEventSchema } from "@roo-code/types"
+import {
+	TelemetryEventName,
+	type TelemetryEvent,
+	rooCodeTelemetryEventSchema,
+	type ClineMessage,
+} from "@roo-code/types"
 import { BaseTelemetryClient } from "@roo-code/telemetry"
 
 import { getRooCodeApiUrl } from "./Config"
@@ -79,6 +84,66 @@ export class TelemetryClient extends BaseTelemetryClient {
 		}
 	}
 
+	public async backfillMessages(messages: ClineMessage[], taskId: string): Promise<void> {
+		if (!this.authService.isAuthenticated()) {
+			if (this.debug) {
+				console.info(`[TelemetryClient#backfillMessages] Skipping: Not authenticated`)
+			}
+			return
+		}
+
+		const token = this.authService.getSessionToken()
+
+		if (!token) {
+			console.error(`[TelemetryClient#backfillMessages] Unauthorized: No session token available.`)
+			return
+		}
+
+		try {
+			const mergedProperties = await this.getEventProperties({
+				event: TelemetryEventName.TASK_MESSAGE,
+				properties: { taskId },
+			})
+
+			const formData = new FormData()
+			formData.append("taskId", taskId)
+			formData.append("properties", JSON.stringify(mergedProperties))
+
+			formData.append(
+				"file",
+				new File([JSON.stringify(messages)], "task.json", {
+					type: "application/json",
+				}),
+			)
+
+			if (this.debug) {
+				console.info(
+					`[TelemetryClient#backfillMessages] Uploading ${messages.length} messages for task ${taskId}`,
+				)
+			}
+
+			// Custom fetch for multipart - don't set Content-Type header (let browser set it)
+			const response = await fetch(`${getRooCodeApiUrl()}/api/events/backfill`, {
+				method: "POST",
+				headers: {
+					Authorization: `Bearer ${token}`,
+					// Note: No Content-Type header - browser will set multipart/form-data with boundary
+				},
+				body: formData,
+			})
+
+			if (!response.ok) {
+				console.error(
+					`[TelemetryClient#backfillMessages] POST events/backfill -> ${response.status} ${response.statusText}`,
+				)
+			} else if (this.debug) {
+				console.info(`[TelemetryClient#backfillMessages] Successfully uploaded messages for task ${taskId}`)
+			}
+		} catch (error) {
+			console.error(`[TelemetryClient#backfillMessages] Error uploading messages: ${error}`)
+		}
+	}
+
 	public override updateTelemetryState(_didUserOptIn: boolean) {}
 
 	public override isTelemetryEnabled(): boolean {