More progress

Author: cte

packages/telemetry/src/PostHogTelemetryClient.ts

@@ -5,7 +5,7 @@ import {
 	TelemetryEventName,
 	type TelemetryEvent,
 	getErrorStatusCode,
-	getOpenAISdkErrorMessage,
+	getErrorMessage,
 	shouldReportApiErrorToTelemetry,
 	isApiProviderError,
 	extractApiProviderErrorProperties,
@@ -78,9 +78,9 @@ export class PostHogTelemetryClient extends BaseTelemetryClient {
 			return
 		}
 
-		// Extract error status code and message for filtering
+		// Extract error status code and message for filtering.
 		const errorCode = getErrorStatusCode(error)
-		const errorMessage = getOpenAISdkErrorMessage(error) ?? error.message
+		const errorMessage = getErrorMessage(error) ?? error.message
 
 		// Filter out expected errors (e.g., 429 rate limits)
 		if (!shouldReportApiErrorToTelemetry(errorCode, errorMessage)) {
@@ -105,6 +105,9 @@ export class PostHogTelemetryClient extends BaseTelemetryClient {
 			mergedProperties = { ...extractedProperties, ...additionalProperties }
 		}
 
+		// Override the error message with the extracted error message.
+		error.message = errorMessage
+
 		this.client.captureException(error, this.distinctId, mergedProperties)
 	}
 

packages/telemetry/src/__tests__/PostHogTelemetryClient.test.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-// npx vitest run src/__tests__/PostHogTelemetryClient.test.ts
+// pnpm --filter @roo-code/telemetry test src/__tests__/PostHogTelemetryClient.test.ts
 
 import * as vscode from "vscode"
 import { PostHog } from "posthog-node"
@@ -452,7 +452,7 @@ describe("PostHogTelemetryClient", () => {
 			expect(mockPostHogClient.captureException).toHaveBeenCalledWith(error, "test-machine-id", undefined)
 		})
 
-		it("should use nested error message from OpenAI SDK error structure", () => {
+		it("should use nested error message from OpenAI SDK error structure for filtering", () => {
 			const client = new PostHogTelemetryClient()
 			client.updateTelemetryState(true)
 
@@ -470,6 +470,61 @@ describe("PostHogTelemetryClient", () => {
 			expect(mockPostHogClient.captureException).not.toHaveBeenCalled()
 		})
 
+		it("should modify error.message with extracted message from nested metadata.raw", () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			// Create an OpenAI SDK-like error with nested metadata (non-rate-limit error)
+			const error = Object.assign(new Error("Generic request failed"), {
+				status: 500,
+				error: {
+					message: "Nested error message",
+					metadata: { raw: "Upstream provider error: model overloaded" },
+				},
+			})
+
+			client.captureException(error)
+
+			// Verify error message was modified to use metadata.raw (highest priority)
+			expect(error.message).toBe("Upstream provider error: model overloaded")
+			expect(mockPostHogClient.captureException).toHaveBeenCalledWith(error, "test-machine-id", undefined)
+		})
+
+		it("should modify error.message with nested error.message when metadata.raw is not available", () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			// Create an OpenAI SDK-like error with nested message but no metadata.raw
+			const error = Object.assign(new Error("Generic request failed"), {
+				status: 500,
+				error: {
+					message: "Upstream provider: connection timeout",
+				},
+			})
+
+			client.captureException(error)
+
+			// Verify error message was modified to use nested error.message
+			expect(error.message).toBe("Upstream provider: connection timeout")
+			expect(mockPostHogClient.captureException).toHaveBeenCalledWith(error, "test-machine-id", undefined)
+		})
+
+		it("should use primary message when no nested error structure exists", () => {
+			const client = new PostHogTelemetryClient()
+			client.updateTelemetryState(true)
+
+			// Create an OpenAI SDK-like error without nested error object
+			const error = Object.assign(new Error("Primary error message"), {
+				status: 500,
+			})
+
+			client.captureException(error)
+
+			// Verify error message remains the primary message
+			expect(error.message).toBe("Primary error message")
+			expect(mockPostHogClient.captureException).toHaveBeenCalledWith(error, "test-machine-id", undefined)
+		})
+
 		it("should auto-extract properties from ApiProviderError", () => {
 			const client = new PostHogTelemetryClient()
 			client.updateTelemetryState(true)

packages/types/src/__tests__/telemetry.test.ts

@@ -1,6 +1,8 @@
+// pnpm --filter @roo-code/types test src/__tests__/telemetry.test.ts
+
 import {
 	getErrorStatusCode,
-	getOpenAISdkErrorMessage,
+	getErrorMessage,
 	shouldReportApiErrorToTelemetry,
 	EXPECTED_API_ERROR_CODES,
 	ApiProviderError,
@@ -45,16 +47,16 @@ describe("telemetry error utilities", () => {
 		})
 	})
 
-	describe("getOpenAISdkErrorMessage", () => {
+	describe("getErrorMessage", () => {
 		it("should return undefined for non-OpenAI SDK errors", () => {
-			expect(getOpenAISdkErrorMessage(null)).toBeUndefined()
-			expect(getOpenAISdkErrorMessage(undefined)).toBeUndefined()
-			expect(getOpenAISdkErrorMessage({ message: "error" })).toBeUndefined()
+			expect(getErrorMessage(null)).toBeUndefined()
+			expect(getErrorMessage(undefined)).toBeUndefined()
+			expect(getErrorMessage({ message: "error" })).toBeUndefined()
 		})
 
 		it("should return the primary message for simple OpenAI SDK errors", () => {
 			const error = { status: 400, message: "Bad request" }
-			expect(getOpenAISdkErrorMessage(error)).toBe("Bad request")
+			expect(getErrorMessage(error)).toBe("Bad request")
 		})
 
 		it("should prioritize nested error.message over primary message", () => {
@@ -63,7 +65,7 @@ describe("telemetry error utilities", () => {
 				message: "Request failed",
 				error: { message: "Upstream provider error" },
 			}
-			expect(getOpenAISdkErrorMessage(error)).toBe("Upstream provider error")
+			expect(getErrorMessage(error)).toBe("Upstream provider error")
 		})
 
 		it("should prioritize metadata.raw over other messages", () => {
@@ -75,7 +77,7 @@ describe("telemetry error utilities", () => {
 					metadata: { raw: "Rate limit exceeded: free-models-per-day" },
 				},
 			}
-			expect(getOpenAISdkErrorMessage(error)).toBe("Rate limit exceeded: free-models-per-day")
+			expect(getErrorMessage(error)).toBe("Rate limit exceeded: free-models-per-day")
 		})
 
 		it("should fallback to nested error.message when metadata.raw is undefined", () => {
@@ -87,7 +89,7 @@ describe("telemetry error utilities", () => {
 					metadata: {},
 				},
 			}
-			expect(getOpenAISdkErrorMessage(error)).toBe("Detailed error message")
+			expect(getErrorMessage(error)).toBe("Detailed error message")
 		})
 
 		it("should fallback to primary message when no nested messages exist", () => {
@@ -96,7 +98,7 @@ describe("telemetry error utilities", () => {
 				message: "Forbidden",
 				error: {},
 			}
-			expect(getOpenAISdkErrorMessage(error)).toBe("Forbidden")
+			expect(getErrorMessage(error)).toBe("Forbidden")
 		})
 	})
 

packages/types/src/telemetry.ts

@@ -341,7 +341,7 @@ export function getErrorStatusCode(error: unknown): number | undefined {
  * @param error - The error to extract message from
  * @returns The best available error message, or undefined if not an OpenAI SDK error
  */
-export function getOpenAISdkErrorMessage(error: unknown): string | undefined {
+export function getErrorMessage(error: unknown): string | undefined {
 	if (isOpenAISdkError(error)) {
 		// Prioritize nested metadata which may contain upstream provider details
 		return error.error?.metadata?.raw || error.error?.message || error.message