Roo to main

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -82,7 +82,6 @@ body:
         - DeepSeek
         - Featherless AI
         - Fireworks AI
-        - Glama
         - Google Gemini
         - Google Vertex AI
         - Groq

.roo/roomotes.yml

@@ -1,25 +1,6 @@
 version: "1.0"
 
 commands:
-    - name: Pull latest changes
-      run: git pull
-      timeout: 60
-      execution_phase: task_run
     - name: Install dependencies
       run: pnpm install
       timeout: 60
-      execution_phase: task_run
-
-github_events:
-    - event: issues.opened
-      action:
-          name: github.issue.fix
-    - event: issue_comment.created
-      action:
-          name: github.issue.comment.respond
-    - event: pull_request.opened
-      action:
-          name: github.pr.review
-    - event: pull_request_review_comment.created
-      action:
-          name: github.pr.comment.respond

apps/web-roo-code/src/app/terms/terms.md

@@ -70,7 +70,7 @@ Customer may access and use the Service solely for its internal business purpose
 
 ## 6. Privacy & Data
 
-Roo Code's Privacy Notice ([https://roocode.com/privacy](https://roocode.com/privacy)) explains how Roo Code collects and handles personal information. If Customer requires a DPA, email [support@roocode.com](mailto:support@roocode.com).
+Roo Code's Privacy Notice ([https://roocode.com/privacy](https://roocode.com/privacy)) explains how Roo Code collects and handles personal information. If Customer requires a DPA, email [zgsm@sangfor.com.cn](mailto:zgsm@sangfor.com.cn).
 
 ## 7. Warranty Disclaimer
 
@@ -98,4 +98,4 @@ The caps in Section 2 apply to all claims under the Agreement, whether in contra
 
 **Roo Code, Inc.**  
 98 Graceland Dr, San Rafael, CA 94901 USA  
-Email: [support@roocode.com](mailto:support@roocode.com)
+Email: [zgsm@sangfor.com.cn](mailto:zgsm@sangfor.com.cn)

apps/web-roo-code/src/components/chromes/footer.tsx

@@ -225,7 +225,7 @@ export function Footer() {
 								<ul className="mt-6 space-y-4">
 									<li>
 										<a
-											href="mailto:support@roocode.com"
+											href="mailto:zgsm@sangfor.com.cn"
 											className="text-sm leading-6 text-muted-foreground transition-colors hover:text-foreground">
 											Contact
 										</a>

packages/cloud/src/TelemetryClient.ts

@@ -69,9 +69,7 @@ abstract class BaseTelemetryClient implements TelemetryClient {
 
 	public abstract capture(event: TelemetryEvent): Promise<void>
 
-	public captureException(_error: Error, _additionalProperties?: Record<string, unknown>): void {
-		// No-op - exception capture is only supported by PostHog
-	}
+	public async captureException(_error: Error, _additionalProperties?: Record<string, unknown>): Promise<void> {}
 
 	public setProvider(provider: TelemetryPropertiesProvider): void {
 		this.providerRef = new WeakRef(provider)

packages/evals/src/cli/utils.ts

@@ -20,7 +20,7 @@ export const isDockerContainer = () => {
 
 export const resetEvalsRepo = async ({ run, cwd }: { run: Run; cwd: string }) => {
 	await execa({ cwd })`git config user.name "CoStrict"`
-	await execa({ cwd })`git config user.email "support@roocode.com"`
+	await execa({ cwd })`git config user.email "zgsm@sangfor.com.cn"`
 	await execa({ cwd })`git checkout -f`
 	await execa({ cwd })`git clean -fd`
 	await execa({ cwd })`git checkout -b runs/${run.id}-${crypto.randomUUID().slice(0, 8)} main`

packages/telemetry/src/BaseTelemetryClient.ts

@@ -59,7 +59,7 @@ export abstract class BaseTelemetryClient implements TelemetryClient {
 
 	public abstract capture(event: TelemetryEvent): Promise<void>
 
-	public abstract captureException(error: Error, additionalProperties?: Record<string, unknown>): void
+	public abstract captureException(error: Error, additionalProperties?: Record<string, unknown>): Promise<void>
 
 	public setProvider(provider: TelemetryPropertiesProvider): void {
 		this.providerRef = new WeakRef(provider)

packages/telemetry/src/PostHogTelemetryClient.ts

@@ -2,7 +2,16 @@ import { getClientId } from "./../../../src/utils/getClientId"
 import { PostHog } from "posthog-node"
 import * as vscode from "vscode"
 
-import { TelemetryEventName, type TelemetryEvent } from "@roo-code/types"
+import {
+	type TelemetryProperties,
+	type TelemetryEvent,
+	TelemetryEventName,
+	getErrorStatusCode,
+	getErrorMessage,
+	shouldReportApiErrorToTelemetry,
+	isApiProviderError,
+	extractApiProviderErrorProperties,
+} from "@roo-code/types"
 
 import { BaseTelemetryClient } from "./BaseTelemetryClient"
 
@@ -62,7 +71,10 @@ export class PostHogTelemetryClient extends BaseTelemetryClient {
 		})
 	}
 
-	public override captureException(error: Error, additionalProperties?: Record<string, unknown>): void {
+	public override async captureException(
+		error: Error,
+		additionalProperties?: Record<string, unknown>,
+	): Promise<void> {
 		if (!this.isTelemetryEnabled()) {
 			if (this.debug) {
 				console.info(`[PostHogTelemetryClient#captureException] Skipping exception: ${error.message}`)
@@ -71,11 +83,51 @@ export class PostHogTelemetryClient extends BaseTelemetryClient {
 			return
 		}
 
+		// Extract error status code and message for filtering.
+		const errorCode = getErrorStatusCode(error)
+		const errorMessage = getErrorMessage(error) ?? error.message
+
+		// Filter out expected errors (e.g., 402 billing, 429 rate limits)
+		if (!shouldReportApiErrorToTelemetry(errorCode, errorMessage)) {
+			if (this.debug) {
+				console.info(
+					`[PostHogTelemetryClient#captureException] Filtering out expected error: ${errorCode} - ${errorMessage}`,
+				)
+			}
+			return
+		}
+
 		if (this.debug) {
 			console.info(`[PostHogTelemetryClient#captureException] ${error.message}`)
 		}
 
-		this.client.captureException(error, this.distinctId, additionalProperties)
+		// Auto-extract properties from ApiProviderError and merge with additionalProperties.
+		// Explicit additionalProperties take precedence over auto-extracted properties.
+		let mergedProperties = additionalProperties
+
+		if (isApiProviderError(error)) {
+			const extractedProperties = extractApiProviderErrorProperties(error)
+			mergedProperties = { ...extractedProperties, ...additionalProperties }
+		}
+
+		// Override the error message with the extracted error message.
+		error.message = errorMessage
+
+		const provider = this.providerRef?.deref()
+		let telemetryProperties: TelemetryProperties | undefined = undefined
+
+		if (provider) {
+			try {
+				telemetryProperties = await provider.getTelemetryProperties()
+			} catch (_error) {
+				// Ignore.
+			}
+		}
+
+		this.client.captureException(error, this.distinctId, {
+			...mergedProperties,
+			$app_version: telemetryProperties?.appVersion,
+		})
 	}
 
 	/**