Merge branch 'main' into feat/issue-4258-latex-rendering

Author: hannesrudolph

.github/actions/setup-node-pnpm/action.yml

@@ -27,11 +27,21 @@ runs:
           uses: pnpm/action-setup@v4
           with:
               version: ${{ inputs.pnpm-version }}
+        - name: Get pnpm store directory
+          shell: bash
+          run: |
+              echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+        - name: Setup pnpm cache
+          uses: actions/cache@v4
+          with:
+              path: ${{ env.STORE_PATH }}
+              key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+              restore-keys: |
+                  ${{ runner.os }}-pnpm-store-
         - name: Setup Node.js
           uses: actions/setup-node@v4
           with:
               node-version: ${{ inputs.node-version }}
-              cache: "pnpm"
         - name: Install dependencies
           if: ${{ inputs.skip-install != 'true' }}
           shell: bash

.roo/rules/rules.md

@@ -4,6 +4,8 @@
 
     - Before attempting completion, always make sure that any code changes have test coverage
     - Ensure all tests pass before submitting changes
+    - The vitest framework is used for testing; the `describe`, `test`, `it`, etc functions are defined by default in `tsconfig.json` and therefore don't need to be imported
+    - Tests must be run from the same directory as the `package.json` file that specifies `vitest` in `devDependencies`
 
 2. Lint Rules:
 

apps/web-evals/package.json

@@ -54,6 +54,6 @@
 		"@types/react": "^18.3.23",
 		"@types/react-dom": "^18.3.5",
 		"tailwindcss": "^4",
-		"vitest": "^3.2.1"
+		"vitest": "^3.2.3"
 	}
 }

packages/build/package.json

@@ -19,6 +19,6 @@
 		"@roo-code/config-eslint": "workspace:^",
 		"@roo-code/config-typescript": "workspace:^",
 		"@types/node": "20.x",
-		"vitest": "^3.1.3"
+		"vitest": "^3.2.3"
 	}
 }

packages/cloud/package.json

@@ -21,6 +21,6 @@
 		"@roo-code/config-typescript": "workspace:^",
 		"@types/node": "20.x",
 		"@types/vscode": "^1.84.0",
-		"vitest": "^3.1.3"
+		"vitest": "^3.2.3"
 	}
 }

packages/cloud/src/AuthService.ts

@@ -5,7 +5,7 @@ import axios from "axios"
 import * as vscode from "vscode"
 import { z } from "zod"
 
-import type { CloudUserInfo } from "@roo-code/types"
+import type { CloudUserInfo, CloudOrganizationMembership } from "@roo-code/types"
 
 import { getClerkBaseUrl, getRooCodeApiUrl } from "./Config"
 import { RefreshTimer } from "./RefreshTimer"
@@ -420,9 +420,42 @@ export class AuthService extends EventEmitter<AuthServiceEvents> {
 		}
 
 		userInfo.picture = userData?.image_url
+
+		// Fetch organization memberships separately
+		try {
+			const orgMemberships = await this.clerkGetOrganizationMemberships()
+			if (orgMemberships && orgMemberships.length > 0) {
+				// Get the first (or active) organization membership
+				const primaryOrgMembership = orgMemberships[0]
+				const organization = primaryOrgMembership?.organization
+
+				if (organization) {
+					userInfo.organizationId = organization.id
+					userInfo.organizationName = organization.name
+					userInfo.organizationRole = primaryOrgMembership.role
+				}
+			}
+		} catch (error) {
+			this.log("[auth] Failed to fetch organization memberships:", error)
+			// Don't throw - organization info is optional
+		}
+
 		return userInfo
 	}
 
+	private async clerkGetOrganizationMemberships(): Promise<CloudOrganizationMembership[]> {
+		const response = await axios.get(`${getClerkBaseUrl()}/v1/me/organization_memberships`, {
+			headers: {
+				Authorization: `Bearer ${this.credentials!.clientToken}`,
+				"User-Agent": this.userAgent(),
+			},
+		})
+
+		// The response structure is: { response: [...] }
+		// Extract the organization memberships from the response.response array
+		return response.data?.response || []
+	}
+
 	private async clerkLogout(credentials: AuthCredentials): Promise<void> {
 		const formData = new URLSearchParams()
 		formData.append("_is_native", "1")

packages/cloud/src/CloudService.ts

@@ -92,6 +92,24 @@ export class CloudService {
 		return this.authService!.getUserInfo()
 	}
 
+	public getOrganizationId(): string | null {
+		this.ensureInitialized()
+		const userInfo = this.authService!.getUserInfo()
+		return userInfo?.organizationId || null
+	}
+
+	public getOrganizationName(): string | null {
+		this.ensureInitialized()
+		const userInfo = this.authService!.getUserInfo()
+		return userInfo?.organizationName || null
+	}
+
+	public getOrganizationRole(): string | null {
+		this.ensureInitialized()
+		const userInfo = this.authService!.getUserInfo()
+		return userInfo?.organizationRole || null
+	}
+
 	public getAuthState(): string {
 		this.ensureInitialized()
 		return this.authService!.getState()

packages/cloud/src/Config.ts

@@ -1,2 +1,7 @@
-export const getClerkBaseUrl = () => process.env.CLERK_BASE_URL || "https://clerk.roocode.com"
-export const getRooCodeApiUrl = () => process.env.ROO_CODE_API_URL || "https://app.roocode.com"
+// Production constants
+export const PRODUCTION_CLERK_BASE_URL = "https://clerk.roocode.com"
+export const PRODUCTION_ROO_CODE_API_URL = "https://app.roocode.com"
+
+// Functions with environment variable fallbacks
+export const getClerkBaseUrl = () => process.env.CLERK_BASE_URL || PRODUCTION_CLERK_BASE_URL
+export const getRooCodeApiUrl = () => process.env.ROO_CODE_API_URL || PRODUCTION_ROO_CODE_API_URL

packages/cloud/src/__mocks__/vscode.ts

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { vi } from "vitest"
 
 export const window = {
 	showInformationMessage: vi.fn(),

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

@@ -184,6 +184,72 @@ describe("CloudService", () => {
 			expect(mockAuthService.getUserInfo).toHaveBeenCalled()
 		})
 
+		it("should return organization ID from user info", () => {
+			const mockUserInfo = {
+				name: "Test User",
+				email: "[email protected]",
+				organizationId: "org_123",
+				organizationName: "Test Org",
+				organizationRole: "admin",
+			}
+			mockAuthService.getUserInfo.mockReturnValue(mockUserInfo)
+
+			const result = cloudService.getOrganizationId()
+			expect(mockAuthService.getUserInfo).toHaveBeenCalled()
+			expect(result).toBe("org_123")
+		})
+
+		it("should return null when no organization ID available", () => {
+			mockAuthService.getUserInfo.mockReturnValue(null)
+
+			const result = cloudService.getOrganizationId()
+			expect(result).toBe(null)
+		})
+
+		it("should return organization name from user info", () => {
+			const mockUserInfo = {
+				name: "Test User",
+				email: "[email protected]",
+				organizationId: "org_123",
+				organizationName: "Test Org",
+				organizationRole: "admin",
+			}
+			mockAuthService.getUserInfo.mockReturnValue(mockUserInfo)
+
+			const result = cloudService.getOrganizationName()
+			expect(mockAuthService.getUserInfo).toHaveBeenCalled()
+			expect(result).toBe("Test Org")
+		})
+
+		it("should return null when no organization name available", () => {
+			mockAuthService.getUserInfo.mockReturnValue(null)
+
+			const result = cloudService.getOrganizationName()
+			expect(result).toBe(null)
+		})
+
+		it("should return organization role from user info", () => {
+			const mockUserInfo = {
+				name: "Test User",
+				email: "[email protected]",
+				organizationId: "org_123",
+				organizationName: "Test Org",
+				organizationRole: "admin",
+			}
+			mockAuthService.getUserInfo.mockReturnValue(mockUserInfo)
+
+			const result = cloudService.getOrganizationRole()
+			expect(mockAuthService.getUserInfo).toHaveBeenCalled()
+			expect(result).toBe("admin")
+		})
+
+		it("should return null when no organization role available", () => {
+			mockAuthService.getUserInfo.mockReturnValue(null)
+
+			const result = cloudService.getOrganizationRole()
+			expect(result).toBe(null)
+		})
+
 		it("should delegate getAuthState to AuthService", () => {
 			const result = cloudService.getAuthState()
 			expect(mockAuthService.getState).toHaveBeenCalled()