Roo to main

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/src/lib/seo.ts

@@ -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",

packages/evals/Dockerfile.web

@@ -60,5 +60,5 @@ RUN chmod +x /usr/local/bin/entrypoint.sh
 
 ENV DATABASE_URL=postgresql://postgres:password@db:5432/evals_development
 ENV REDIS_URL=redis://redis:6379
-EXPOSE 3000
+EXPOSE 3446
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

packages/evals/README.md

@@ -29,7 +29,7 @@ Start the evals service:
 pnpm evals
 ```
 
-The initial build process can take a minute or two. Upon success you should see output indicating that a web service is running on localhost:3000:
+The initial build process can take a minute or two. Upon success you should see output indicating that a web service is running on localhost:3446:
 <img width="1182" src="https://github.com/user-attachments/assets/34f25a59-1362-458c-aafa-25e13cdb2a7a" />
 
 Additionally, you'll find in Docker Desktop that database and redis services are running:

packages/types/src/provider-settings.ts

@@ -515,6 +515,11 @@ export const providerSettingsSchema = z.object({
 })
 
 export type ProviderSettings = z.infer<typeof providerSettingsSchema>
+export interface QuotaInfo {
+	total_quota?: number
+	used_quota?: number
+	is_star?: string
+}
 
 export const providerSettingsWithIdSchema = providerSettingsSchema.extend({ id: z.string().optional() })
 

packages/types/src/providers/roo.ts

@@ -1,6 +1,10 @@
 import type { ModelInfo } from "../model.js"
 
-export type RooModelId = "xai/grok-code-fast-1" | "roo/code-supernova"
+export type RooModelId =
+	| "xai/grok-code-fast-1"
+	| "roo/code-supernova"
+	| "xai/grok-4-fast"
+	| "deepseek/deepseek-chat-v3.1"
 
 export const rooDefaultModelId: RooModelId = "xai/grok-code-fast-1"
 
@@ -25,4 +29,24 @@ export const rooModels = {
 		description:
 			"A versatile agentic coding stealth model that supports image inputs, accessible for free through Roo Code Cloud for a limited time. (Note: the free prompts and completions are logged by the model provider and used to improve the model.)",
 	},
+	"xai/grok-4-fast": {
+		maxTokens: 30_000,
+		contextWindow: 2_000_000,
+		supportsImages: false,
+		supportsPromptCache: false,
+		inputPrice: 0,
+		outputPrice: 0,
+		description:
+			"Grok 4 Fast is xAI's latest multimodal model with SOTA cost-efficiency and a 2M token context window. (Note: prompts and completions are logged by xAI and used to improve the model.)",
+	},
+	"deepseek/deepseek-chat-v3.1": {
+		maxTokens: 16_384,
+		contextWindow: 163_840,
+		supportsImages: false,
+		supportsPromptCache: false,
+		inputPrice: 0,
+		outputPrice: 0,
+		description:
+			"DeepSeek-V3.1 is a large hybrid reasoning model (671B parameters, 37B active). It extends the DeepSeek-V3 base with a two-phase long-context training process, reaching up to 128K tokens, and uses FP8 microscaling for efficient inference.",
+	},
 } as const satisfies Record<string, ModelInfo>

packages/types/src/telemetry.ts

@@ -61,6 +61,9 @@ export enum TelemetryEventName {
 	ACCOUNT_LOGOUT_CLICKED = "Account Logout Clicked",
 	ACCOUNT_LOGOUT_SUCCESS = "Account Logout Success",
 
+	UPSELL_DISMISSED = "Upsell Dismissed",
+	UPSELL_CLICKED = "Upsell Clicked",
+
 	SCHEMA_VALIDATION_ERROR = "Schema Validation Error",
 	DIFF_APPLICATION_ERROR = "Diff Application Error",
 	SHELL_INTEGRATION_ERROR = "Shell Integration Error",
@@ -187,6 +190,8 @@ export const rooCodeTelemetryEventSchema = z.discriminatedUnion("type", [
 			TelemetryEventName.ACCOUNT_CONNECT_SUCCESS,
 			TelemetryEventName.ACCOUNT_LOGOUT_CLICKED,
 			TelemetryEventName.ACCOUNT_LOGOUT_SUCCESS,
+			TelemetryEventName.UPSELL_DISMISSED,
+			TelemetryEventName.UPSELL_CLICKED,
 			TelemetryEventName.SCHEMA_VALIDATION_ERROR,
 			TelemetryEventName.DIFF_APPLICATION_ERROR,
 			TelemetryEventName.SHELL_INTEGRATION_ERROR,

src/api/providers/fetchers/zgsm.ts

@@ -1,7 +1,7 @@
 import axios from "axios"
 import { v7 as uuidv7 } from "uuid"
 import { COSTRICT_DEFAULT_HEADERS } from "../../../shared/headers"
-import type { IZgsmModelResponseData } from "@roo-code/types"
+import type { IZgsmModelResponseData, QuotaInfo } from "@roo-code/types"
 import { readModels } from "./modelCache"
 
 // let modelsCache = new WeakRef<string[]>([])
@@ -44,3 +44,36 @@ export async function getZgsmModels(baseUrl?: string, apiKey?: string, openAiHea
 		return Object.keys(modelCache).map((key) => modelCache[key])
 	}
 }
+
+export async function fetchZgsmQuotaInfo(baseUrl?: string, apiKey?: string): Promise<QuotaInfo | null> {
+	try {
+		if (!baseUrl || !apiKey) {
+			return null
+		}
+
+		// Trim whitespace from baseUrl to handle cases where users accidentally include spaces
+		const trimmedBaseUrl = baseUrl.trim()
+
+		if (!URL.canParse(trimmedBaseUrl)) {
+			return null
+		}
+
+		const config: Record<string, any> = {}
+		const headers: Record<string, string> = {
+			...COSTRICT_DEFAULT_HEADERS,
+			"X-Request-ID": uuidv7(),
+			Authorization: `Bearer ${apiKey}`,
+			"Content-Type": "application/json",
+		}
+
+		if (Object.keys(headers).length > 0) {
+			config["headers"] = headers
+		}
+		const response = await axios.get(`${baseUrl}/quota-manager/api/v1/quota`, config)
+
+		return response?.data?.data as QuotaInfo
+	} catch (error) {
+		console.warn(`Error fetching zgsmModels from [${baseUrl}/quota-manager/api/v1/quota]:`, error.message)
+		return null
+	}
+}

src/core/condense/__tests__/index.spec.ts

@@ -283,6 +283,32 @@ describe("summarizeConversation", () => {
 		const mockCallArgs = (maybeRemoveImageBlocks as Mock).mock.calls[0][0] as any[]
 		expect(mockCallArgs[mockCallArgs.length - 1]).toEqual(expectedFinalMessage)
 	})
+	it("should include the original first user message in summarization input", async () => {
+		const messages: ApiMessage[] = [
+			{ role: "user", content: "Initial ask", ts: 1 },
+			{ role: "assistant", content: "Ack", ts: 2 },
+			{ role: "user", content: "Follow-up", ts: 3 },
+			{ role: "assistant", content: "Response", ts: 4 },
+			{ role: "user", content: "More", ts: 5 },
+			{ role: "assistant", content: "Later", ts: 6 },
+			{ role: "user", content: "Newest", ts: 7 },
+		]
+
+		await summarizeConversation(messages, mockApiHandler, defaultSystemPrompt, taskId, DEFAULT_PREV_CONTEXT_TOKENS)
+
+		const mockCallArgs = (maybeRemoveImageBlocks as Mock).mock.calls[0][0] as any[]
+
+		// Expect the original first user message to be present in the messages sent to the summarizer
+		const hasInitialAsk = mockCallArgs.some(
+			(m) =>
+				m.role === "user" &&
+				(typeof m.content === "string"
+					? m.content === "Initial ask"
+					: Array.isArray(m.content) &&
+						m.content.some((b: any) => b.type === "text" && b.text === "Initial ask")),
+		)
+		expect(hasInitialAsk).toBe(true)
+	})
 
 	it("should calculate newContextTokens correctly with systemPrompt", async () => {
 		const messages: ApiMessage[] = [

src/core/condense/index.ts

@@ -103,8 +103,8 @@ export async function summarizeConversation(
 
 	// Always preserve the first message (which may contain slash command content)
 	const firstMessage = messages[0]
-	// Get messages to summarize, excluding the first message and last N messages
-	const messagesToSummarize = getMessagesSinceLastSummary(messages.slice(1, -N_MESSAGES_TO_KEEP))
+	// Get messages to summarize, including the first message and excluding the last N messages
+	const messagesToSummarize = getMessagesSinceLastSummary(messages.slice(0, -N_MESSAGES_TO_KEEP))
 
 	if (messagesToSummarize.length <= 1) {
 		const error =

src/core/prompts/sections/tool-use.ts

@@ -3,7 +3,7 @@ export function getSharedToolUseSection(): string {
 
 TOOL USE
 
-You have access to a set of tools that are executed upon the user's approval. You can use one tool per message, and will receive the result of that tool use in the user's response. You use tools step-by-step to accomplish a given task, with each tool use informed by the result of the previous tool use.
+You have access to a set of tools that are executed upon the user's approval. You must use exactly one tool per message, and every assistant message must include a tool call. You use tools step-by-step to accomplish a given task, with each tool use informed by the result of the previous tool use.
 
 # Tool Use Formatting
 

src/core/tools/multiApplyDiffTool.ts

@@ -464,7 +464,7 @@ Error: ${failPart.error}
 Suggested fixes:
 1. Verify the search content exactly matches the file content (including whitespace and case)
 2. Check for correct indentation and line endings
-3. Use <read_file> to see the current file content
+3. Use the read_file tool to verify the file's current contents
 4. Consider breaking complex changes into smaller diffs
 5. Ensure start_line parameter matches the actual content location
 ${errorDetails ? `\nDetailed error information:\n${errorDetails}\n` : ""}
@@ -477,7 +477,7 @@ Unable to apply diffs to file: ${absolutePath}
 Error: ${diffResult.error}
 
 Recovery suggestions:
-1. Use <read_file> to examine the current file content
+1. Use the read_file tool to verify the file's current contents
 2. Verify the diff format matches the expected search/replace pattern
 3. Check that the search content exactly matches what's in the file
 4. Consider using line numbers with start_line parameter

src/core/webview/ClineProvider.ts

@@ -2305,6 +2305,18 @@ export class ClineProvider
 			return
 		}
 
+		// // Log out from cloud if authenticated
+		// if (CloudService.hasInstance()) {
+		// 	try {
+		// 		await CloudService.instance.logout()
+		// 	} catch (error) {
+		// 		this.log(
+		// 			`Failed to logout from cloud during reset: ${error instanceof Error ? error.message : String(error)}`,
+		// 		)
+		// 		// Continue with reset even if logout fails
+		// 	}
+		// }
+
 		await this.contextProxy.resetAllState()
 		await this.providerSettingsManager.resetAllConfigs()
 		await this.customModesManager.resetCustomModes()