Revert "Merge branch 'main' into watsonx-ai-integration"

This reverts commit 798f3cc.

Author: PrasangAPrajapati

CHANGELOG.md

@@ -1,10 +1,39 @@
 # Roo Code Changelog
 
-## 3.28.5
+## [3.28.7] - 2025-09-23
 
-### Patch Changes
+![3.28.7 Release - Hidden Thinking](/releases/3.28.7-release.png)
 
--   - Add an announcement for Supernova (thanks @mrubens!)
+- UX: Collapse thinking blocks by default with UI settings to always show them (thanks @brunobergher!)
+- Fix: Resolve checkpoint restore popover positioning issue (#8219 by @NaccOll, PR by @app/roomote)
+- Add cloud account switcher functionality (thanks @mrubens!)
+- Add support for zai-org/GLM-4.5-turbo model in Chutes provider (#8155 by @mugnimaestra, PR by @app/roomote)
+
+## [3.28.6] - 2025-09-23
+
+![3.28.6 Release - Kangaroo studying ancient codex](/releases/3.28.6-release.png)
+
+- Feat: Add GPT-5-Codex model (thanks @daniel-lxs!)
+- Feat: Add keyboard shortcut for toggling auto-approve (Cmd/Ctrl+Alt+A) (thanks @brunobergher!)
+- Fix: Improve reasoning block formatting for better readability (thanks @daniel-lxs!)
+- Fix: Respect Ollama Modelfile num_ctx configuration (#7797 by @hannesrudolph, PR by @app/roomote)
+- Fix: Prevent checkpoint text from wrapping in non-English languages (#8206 by @NaccOll, PR by @app/roomote)
+- Remove language selection and word wrap toggle from CodeBlock (thanks @mrubens!)
+- Feat: Add package.nls.json checking to find-missing-translations script (thanks @app/roomote!)
+- Fix: Bare metal evals fixes (thanks @cte!)
+- Fix: Follow-up questions should trigger the "interactive" state (thanks @cte!)
+
+## [3.28.5] - 2025-09-20
+
+![3.28.5 Release - Kangaroo staying hydrated](/releases/3.28.5-release.png)
+
+- Fix: Resolve duplicate rehydrate during reasoning; centralize rehydrate and preserve cancel metadata (#8153 by @hannesrudolph, PR by @hannesrudolph)
+- Add an announcement for Supernova (thanks @mrubens!)
+- Wrap code blocks by default for improved readability (thanks @mrubens!)
+- Fix: Support dash prefix in parseMarkdownChecklist for todo lists (#8054 by @NaccOll, PR by app/roomote)
+- Fix: Apply tiered pricing for Gemini models via Vertex AI (#8017 by @ikumi3, PR by app/roomote)
+- Update SambaNova models to latest versions (thanks @snova-jorgep!)
+- Update privacy policy to allow occasional emails (thanks @jdilla1277!)
 
 ## [3.28.4] - 2025-09-19
 

apps/web-evals/package.json

@@ -8,7 +8,7 @@
 		"dev": "scripts/check-services.sh && next dev -p 3446",
 		"format": "prettier --write src",
 		"build": "next build",
-		"start": "next start",
+		"start": "next start -p 3446",
 		"clean": "rimraf tsconfig.tsbuildinfo .next .turbo"
 	},
 	"dependencies": {

apps/web-roo-code/public/opengraph.png

@@ -3,15 +3,15 @@ const SITE_URL = process.env.NEXT_PUBLIC_SITE_URL ?? "https://roocode.com"
 export const SEO = {
 	url: SITE_URL,
 	name: "Roo Code",
-	title: "Roo Code – Your AI-Powered Dev Team in VS Code",
+	title: "Roo Code – Your AI-Powered Dev Team in VS Code and Beyond",
 	description:
 		"Roo Code puts an entire AI dev team right in your editor, outpacing closed tools with deep project-wide context, multi-step agentic coding, and unmatched developer-centric flexibility.",
 	locale: "en_US",
 	ogImage: {
-		url: "/android-chrome-512x512.png",
-		width: 512,
-		height: 512,
-		alt: "Roo Code Logo",
+		url: "/opengraph.png",
+		width: 1200,
+		height: 600,
+		alt: "Roo Code",
 	},
 	keywords: [
 		"Roo Code",

apps/web-roo-code/src/lib/seo.ts

@@ -0,0 +1,141 @@
+// npx vitest run src/components/chat/checkpoints/__tests__/CheckpointSaved.spec.tsx
+
+vi.mock("@/components/ui", () => {
+	// Minimal UI primitives to ensure deterministic behavior in tests
+	return {
+		Button: ({ children, ...rest }: any) => <button {...rest}>{children}</button>,
+		StandardTooltip: ({ children }: any) => <>{children}</>,
+		Popover: ({ children, onOpenChange, open }: any) => {
+			lastOnOpenChange = onOpenChange
+			return (
+				<div data-testid="popover-root" data-open={open}>
+					{children}
+				</div>
+			)
+		},
+		PopoverTrigger: ({ children }: any) => <div data-testid="popover-trigger">{children}</div>,
+		PopoverContent: ({ children }: any) => <div data-testid="popover-content">{children}</div>,
+	}
+})
+
+import { render, waitFor, screen } from "@/utils/test-utils"
+import React from "react"
+import userEvent from "@testing-library/user-event"
+import { CheckpointSaved } from "../CheckpointSaved"
+
+// Capture onOpenChange from Popover to control open/close in tests
+let lastOnOpenChange: ((open: boolean) => void) | undefined
+
+const waitForOpenHandler = async () => {
+	await waitFor(() => {
+		// ensure Popover mock captured the onOpenChange handler before using it
+		expect(lastOnOpenChange).toBeTruthy()
+	})
+}
+
+describe("CheckpointSaved popover visibility", () => {
+	// Timers are controlled per-test to avoid interfering with i18n init
+	const baseProps = {
+		ts: 123,
+		commitHash: "abc123",
+		currentHash: "zzz999",
+		checkpoint: { from: "prev123", to: "abc123" } as Record<string, unknown>,
+	}
+
+	it("shows menu while popover is open and hides when closed", async () => {
+		const { getByTestId } = render(<CheckpointSaved {...baseProps} />)
+
+		const getMenu = () => getByTestId("checkpoint-menu-container") as HTMLElement
+
+		// Initially hidden (relies on group-hover)
+		expect(getMenu()).toBeTruthy()
+		expect(getMenu().className).toContain("hidden")
+
+		// Open via captured handler
+		await waitForOpenHandler()
+		lastOnOpenChange?.(true)
+
+		await waitFor(() => {
+			expect(getMenu().className).toContain("block")
+			expect(getMenu().className).not.toContain("hidden")
+		})
+
+		// Close via captured handler — menu remains visible briefly, then hides
+		lastOnOpenChange?.(false)
+
+		await waitFor(() => {
+			expect(getMenu().className).toContain("block")
+		})
+
+		await waitFor(() => {
+			expect(getMenu().className).toContain("hidden")
+		})
+	})
+
+	it("resets confirm state when popover closes", async () => {
+		const { getByTestId } = render(<CheckpointSaved {...baseProps} />)
+
+		// Open the popover
+		await waitForOpenHandler()
+		lastOnOpenChange?.(true)
+
+		// Enter confirm state
+		const restoreFilesAndTaskBtn = await waitFor(() => getByTestId("restore-files-and-task-btn"))
+		await userEvent.click(restoreFilesAndTaskBtn)
+
+		// Confirm warning should be visible
+		expect(getByTestId("checkpoint-confirm-warning")).toBeTruthy()
+
+		// Close popover -> confirm state should reset
+		lastOnOpenChange?.(false)
+
+		// Reopen
+		lastOnOpenChange?.(true)
+
+		// Confirm warning should be gone after reopening
+		await waitFor(() => {
+			expect(screen.queryByTestId("checkpoint-confirm-warning")).toBeNull()
+		})
+	})
+
+	it("closes popover after preview and after confirm restore", async () => {
+		const { getByTestId } = render(<CheckpointSaved {...baseProps} />)
+
+		const popoverRoot = () => getByTestId("popover-root")
+		const menuContainer = () => getByTestId("checkpoint-menu-container")
+
+		// Open
+		await waitForOpenHandler()
+		lastOnOpenChange?.(true)
+		await waitFor(() => {
+			expect(popoverRoot().getAttribute("data-open")).toBe("true")
+			expect(menuContainer().className).toContain("block")
+		})
+
+		// Click preview -> popover closes; menu remains briefly visible, then hides
+		await userEvent.click(getByTestId("restore-files-btn"))
+		await waitFor(() => {
+			expect(popoverRoot().getAttribute("data-open")).toBe("false")
+			expect(menuContainer().className).toContain("block")
+		})
+		await waitFor(() => {
+			expect(menuContainer().className).toContain("hidden")
+		})
+
+		// Reopen
+		lastOnOpenChange?.(true)
+		await waitFor(() => {
+			expect(popoverRoot().getAttribute("data-open")).toBe("true")
+		})
+
+		// Enter confirm and confirm restore -> popover closes; menu then hides
+		await userEvent.click(getByTestId("restore-files-and-task-btn"))
+		await userEvent.click(getByTestId("confirm-restore-btn"))
+		await waitFor(() => {
+			expect(popoverRoot().getAttribute("data-open")).toBe("false")
+		})
+		await waitFor(() => {
+			expect(menuContainer().className).toContain("hidden")
+		})
+	})
+})

releases/3.28.5-release.png

@@ -0,0 +1,146 @@
+import { useState, useEffect } from "react"
+import { Building2 } from "lucide-react"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectSeparator } from "@/components/ui/select"
+import { useAppTranslation } from "@src/i18n/TranslationContext"
+import { vscode } from "@src/utils/vscode"
+import { useExtensionState } from "@src/context/ExtensionStateContext"
+import { cn } from "@src/lib/utils"
+
+export const CloudAccountSwitcher = () => {
+	const { t } = useAppTranslation()
+	const { cloudUserInfo, cloudOrganizations = [] } = useExtensionState()
+	const [selectedOrgId, setSelectedOrgId] = useState<string | null>(cloudUserInfo?.organizationId || null)
+	const [isLoading, setIsLoading] = useState(false)
+
+	// Update selected org when userInfo changes
+	useEffect(() => {
+		setSelectedOrgId(cloudUserInfo?.organizationId || null)
+	}, [cloudUserInfo?.organizationId])
+
+	// Don't show the switcher if user has no organizations
+	if (!cloudOrganizations || cloudOrganizations.length === 0 || !cloudUserInfo) {
+		return null
+	}
+
+	const handleOrganizationChange = async (value: string) => {
+		const newOrgId = value === "personal" ? null : value
+
+		// Don't do anything if selecting the same organization
+		if (newOrgId === selectedOrgId) {
+			return
+		}
+
+		setIsLoading(true)
+
+		// Send message to switch organization
+		vscode.postMessage({
+			type: "switchOrganization",
+			organizationId: newOrgId,
+		})
+
+		// Update local state optimistically
+		setSelectedOrgId(newOrgId)
+
+		// Reset loading state after a delay
+		setTimeout(() => {
+			setIsLoading(false)
+		}, 1000)
+	}
+
+	const currentValue = selectedOrgId || "personal"
+	const currentOrg = cloudOrganizations.find((org) => org.organization.id === selectedOrgId)
+
+	// Render the account icon based on current context
+	const renderAccountIcon = () => {
+		if (selectedOrgId && currentOrg?.organization.image_url) {
+			// Organization with logo
+			return (
+				<img
+					src={currentOrg.organization.image_url}
+					alt={currentOrg.organization.name}
+					className="w-5 h-5 rounded object-cover"
+				/>
+			)
+		} else if (selectedOrgId) {
+			// Organization without logo
+			return <Building2 className="w-4.5 h-4.5" />
+		} else if (cloudUserInfo.picture) {
+			// Personal account with avatar
+			return (
+				<img
+					src={cloudUserInfo.picture}
+					alt={cloudUserInfo.name || cloudUserInfo.email}
+					className="w-5 h-5 rounded-full object-cover"
+				/>
+			)
+		} else {
+			// Personal account without avatar - show initials
+			const initial = cloudUserInfo.name?.charAt(0) || cloudUserInfo.email?.charAt(0) || "?"
+			return (
+				<div className="w-5 h-5 rounded-full flex items-center justify-center bg-vscode-button-background text-vscode-button-foreground text-xs">
+					{initial}
+				</div>
+			)
+		}
+	}
+
+	return (
+		<div className="inline-block ml-1">
+			<Select value={currentValue} onValueChange={handleOrganizationChange} disabled={isLoading}>
+				<SelectTrigger
+					className={cn(
+						"h-4.5 w-4.5 p-0 gap-0",
+						"bg-transparent opacity-90 hover:opacity-50",
+						"flex items-center justify-center",
+						"rounded-lg overflow-clip",
+						"border border-vscode-dropdown-border",
+						"[&>svg]:hidden", // Hide the default chevron/caret
+						isLoading && "opacity-50",
+					)}
+					aria-label={selectedOrgId ? currentOrg?.organization.name : t("cloud:personalAccount")}>
+					{renderAccountIcon()}
+				</SelectTrigger>
+
+				<SelectContent>
+					{/* Personal Account Option */}
+					<SelectItem value="personal">
+						<div className="flex items-center gap-2">
+							{cloudUserInfo.picture ? (
+								<img
+									src={cloudUserInfo.picture}
+									alt={cloudUserInfo.name || cloudUserInfo.email}
+									className="w-4.5 h-4.5 rounded-full object-cover overflow-clip"
+								/>
+							) : (
+								<div className="w-4.5 h-4.5 rounded-full flex items-center justify-center bg-vscode-button-background text-vscode-button-foreground text-xs">
+									{cloudUserInfo.name?.charAt(0) || cloudUserInfo.email?.charAt(0) || "?"}
+								</div>
+							)}
+							<span>{t("cloud:personalAccount")}</span>
+						</div>
+					</SelectItem>
+
+					{cloudOrganizations.length > 0 && <SelectSeparator />}
+
+					{/* Organization Options */}
+					{cloudOrganizations.map((org) => (
+						<SelectItem key={org.organization.id} value={org.organization.id}>
+							<div className="flex items-center gap-2">
+								{org.organization.image_url ? (
+									<img
+										src={org.organization.image_url}
+										alt=""
+										className="w-4.5 h-4.5 rounded-full object-cover overflow-clip"
+									/>
+								) : (
+									<Building2 className="w-4.5 h-4.5" />
+								)}
+								<span className="truncate">{org.organization.name}</span>
+							</div>
+						</SelectItem>
+					))}
+				</SelectContent>
+			</Select>
+		</div>
+	)
+}