PR feedback

Author: mrubens

packages/cloud/src/CloudAPI.ts

@@ -6,6 +6,7 @@ import {
 	type ShareResponse,
 	shareResponseSchema,
 	type CloudAgent,
+	cloudAgentsResponseSchema,
 } from "@roo-code/types"
 
 import { getRooCodeApiUrl } from "./config.js"
@@ -144,11 +145,12 @@ export class CloudAPI {
 	async getCloudAgents(): Promise<CloudAgent[]> {
 		this.log("[CloudAPI] Fetching cloud agents")
 
-		const response = await this.request<{ success: boolean; data: CloudAgent[] }>("/api/cloud-agents", {
+		const agents = await this.request<CloudAgent[]>("/api/cloud-agents", {
 			method: "GET",
+			parseResponse: (data) => cloudAgentsResponseSchema.parse(data).data,
 		})
 
-		this.log("[CloudAPI] Cloud agents response:", response)
-		return response.data || []
+		this.log("[CloudAPI] Cloud agents response:", agents)
+		return agents
 	}
 }

packages/cloud/src/__tests__/CloudAPI.test.ts

@@ -27,7 +27,7 @@ describe("CloudAPI", () => {
 				{ id: "2", name: "Agent 2", type: "chat", icon: "chat" },
 			]
 
-			// Mock successful response
+			// Mock successful response with schema-compliant format
 			;(global.fetch as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
 				ok: true,
 				json: async () => ({ success: true, data: mockAgents }),
@@ -66,11 +66,11 @@ describe("CloudAPI", () => {
 			await expect(cloudAPI.getCloudAgents()).rejects.toThrow(AuthenticationError)
 		})
 
-		it("should return empty array when data is missing", async () => {
-			// Mock response with no data
+		it("should return empty array when agents array is empty", async () => {
+			// Mock response with empty agents array
 			;(global.fetch as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
 				ok: true,
-				json: async () => ({ success: true }),
+				json: async () => ({ success: true, data: [] }),
 			})
 
 			const agents = await cloudAPI.getCloudAgents()

packages/types/src/cloud.ts

@@ -739,7 +739,8 @@ export interface CloudAgent {
  */
 
 export const cloudAgentsResponseSchema = z.object({
-	agents: z.array(
+	success: z.boolean(),
+	data: z.array(
 		z.object({
 			id: z.string(),
 			name: z.string(),

src/core/webview/webviewMessageHandler.ts

@@ -2470,24 +2470,13 @@ export const webviewMessageHandler = async (
 					`[getCloudAgents] Error fetching cloud agents: ${error instanceof Error ? error.message : String(error)}`,
 				)
 
-				// Check if it's an authentication error
-				const errorMessage = error instanceof Error ? error.message : String(error)
-				const isAuthError = errorMessage.includes("Authentication") || errorMessage.includes("401")
-
-				// Send empty array with error information
+				// Send response to stop loading state in UI
+				// The CloudAgents component will handle this gracefully by returning null
 				await provider.postMessageToWebview({
 					type: "cloudAgents",
 					agents: [],
-					error: errorMessage,
+					error: error instanceof Error ? error.message : String(error),
 				})
-
-				// If it's an authentication error, show a user-friendly message
-				if (isAuthError) {
-					vscode.window.showErrorMessage(
-						t("common:errors.auth_required_for_cloud_agents") ||
-							"Authentication required to access cloud agents",
-					)
-				}
 			}
 			break
 		}