Merge branch 'main' into max-api-retry

Author: ryanjoachim

.git-blame-ignore-revs

@@ -1,3 +1,3 @@
-# Ran Prettier on all files - https://github.com/RooVetGit/Roo-Cline/pull/404
+# Ran Prettier on all files - https://github.com/RooVetGit/Roo-Code/pull/404
 60a0a824b96a0b326af4d8871b6903f4ddcfe114
 579bdd9dbf6d2d569e5e7adb5ff6292b1e42ea34

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
     - name: Feature Request
-      url: https://github.com/RooVetGit/Roo-Cline/discussions/categories/feature-requests
-      about: Share and vote on feature requests for Roo Cline
+      url: https://github.com/RooVetGit/Roo-Code/discussions/categories/feature-requests
+      about: Share and vote on feature requests for Roo Code
     - name: Leave a Review
       url: https://marketplace.visualstudio.com/items?itemName=RooVeterinaryInc.roo-cline&ssr=false#review-details
-      about: Enjoying Roo Cline? Leave a review here!
+      about: Enjoying Roo Code? Leave a review here!

.github/workflows/code-qa.yml

@@ -1,4 +1,4 @@
-name: Code QA Roo Cline
+name: Code QA Roo Code
 
 on:
   push:

CHANGELOG.md

@@ -1,4 +1,24 @@
-# Roo Cline Changelog
+# Roo Code Changelog
+
+## [3.2.4]
+
+- Only allow use of the diff tool if it's enabled in settings
+
+## [3.2.3]
+
+- Fix bug where language selector wasn't working
+
+## [3.2.0 - 3.2.2]
+
+- **Name Change From Roo Cline to Roo Code:** We're excited to announce our new name! After growing beyond 50,000 installations, we've rebranded from Roo Cline to Roo Code to better reflect our identity as we chart our own course.
+
+- **Custom Modes:** Create your own personas for Roo Code! While our built-in modes (Code, Architect, Ask) are still here, you can now shape entirely new ones:
+    - Define custom prompts
+    - Choose which tools each mode can access
+    - Create specialized assistants for any workflow
+    - Just type "Create a new mode for <X>" or visit the Prompts tab in the top menu to get started
+
+Join us at https://www.reddit.com/r/RooCode to share your custom modes and be part of our next chapter!
 
 ## [3.1.7]
 
@@ -51,7 +71,7 @@
 
 ## [3.0.0]
 
-- This release adds chat modes! Now you can ask Roo Cline questions about system architecture or the codebase without immediately jumping into writing code. You can even assign different API configuration profiles to each mode if you prefer to use different models for thinking vs coding. Would love feedback in the new Roo Cline Reddit! https://www.reddit.com/r/roocline
+- This release adds chat modes! Now you can ask Roo Code questions about system architecture or the codebase without immediately jumping into writing code. You can even assign different API configuration profiles to each mode if you prefer to use different models for thinking vs coding. Would love feedback in the new Roo Code Reddit! https://www.reddit.com/r/RooCode
 
 ## [2.2.46]
 

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2024 Cline Bot Inc.
+   Copyright 2025 Roo Veterinary Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1,9 +1,9 @@
 {
 	"name": "roo-cline",
-	"displayName": "Roo Cline",
-	"description": "A fork of Cline, an autonomous coding agent, with some added experimental configuration and automation features.",
+	"displayName": "Roo Code (prev. Roo Cline)",
+	"description": "A VS Code plugin that enhances coding with AI-powered automation, multi-model support, and experimental features.",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.1.7",
+	"version": "3.2.4",
 	"icon": "assets/icons/rocket.png",
 	"galleryBanner": {
 		"color": "#617A91",
@@ -17,9 +17,9 @@
 	},
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/RooVetGit/Roo-Cline"
+		"url": "https://github.com/RooVetGit/Roo-Code"
 	},
-	"homepage": "https://github.com/RooVetGit/Roo-Cline",
+	"homepage": "https://github.com/RooVetGit/Roo-Code",
 	"categories": [
 		"AI",
 		"Chat",
@@ -52,7 +52,7 @@
 			"activitybar": [
 				{
 					"id": "roo-cline-ActivityBar",
-					"title": "Roo Cline",
+					"title": "Roo Code",
 					"icon": "$(rocket)"
 				}
 			]
@@ -100,7 +100,7 @@
 			{
 				"command": "roo-cline.openInNewTab",
 				"title": "Open In New Tab",
-				"category": "Roo Cline"
+				"category": "Roo Code"
 			}
 		],
 		"menus": {
@@ -138,7 +138,7 @@
 			]
 		},
 		"configuration": {
-			"title": "RooCline",
+			"title": "Roo Code",
 			"properties": {
 				"roo-cline.allowedCommands": {
 					"type": "array",

package-lock.json

@@ -0,0 +1,195 @@
+// Mock file system data
+const mockFiles = new Map()
+const mockDirectories = new Set()
+
+// Initialize base test directories
+const baseTestDirs = [
+	"/mock",
+	"/mock/extension",
+	"/mock/extension/path",
+	"/mock/storage",
+	"/mock/storage/path",
+	"/mock/settings",
+	"/mock/settings/path",
+	"/mock/mcp",
+	"/mock/mcp/path",
+	"/test",
+	"/test/path",
+	"/test/storage",
+	"/test/storage/path",
+	"/test/storage/path/settings",
+	"/test/extension",
+	"/test/extension/path",
+	"/test/global-storage",
+	"/test/log/path",
+]
+
+// Helper function to format instructions
+const formatInstructions = (sections: string[]): string => {
+	const joinedSections = sections.filter(Boolean).join("\n\n")
+	return joinedSections
+		? `
+====
+
+USER'S CUSTOM INSTRUCTIONS
+
+The following additional instructions are provided by the user, and should be followed to the best of your ability without interfering with the TOOL USE guidelines.
+
+${joinedSections}`
+		: ""
+}
+
+// Helper function to format rule content
+const formatRuleContent = (ruleFile: string, content: string): string => {
+	return `Rules:\n# Rules from ${ruleFile}:\n${content}`
+}
+
+type RuleFiles = {
+	".clinerules-code": string
+	".clinerules-ask": string
+	".clinerules-architect": string
+	".clinerules-test": string
+	".clinerules-review": string
+	".clinerules": string
+}
+
+// Helper function to ensure directory exists
+const ensureDirectoryExists = (path: string) => {
+	const parts = path.split("/")
+	let currentPath = ""
+	for (const part of parts) {
+		if (!part) continue
+		currentPath += "/" + part
+		mockDirectories.add(currentPath)
+	}
+}
+
+const mockFs = {
+	readFile: jest.fn().mockImplementation(async (filePath: string, encoding?: string) => {
+		// Return stored content if it exists
+		if (mockFiles.has(filePath)) {
+			return mockFiles.get(filePath)
+		}
+
+		// Handle rule files
+		const ruleFiles: RuleFiles = {
+			".clinerules-code": "# Code Mode Rules\n1. Code specific rule",
+			".clinerules-ask": "# Ask Mode Rules\n1. Ask specific rule",
+			".clinerules-architect": "# Architect Mode Rules\n1. Architect specific rule",
+			".clinerules-test":
+				"# Test Engineer Rules\n1. Always write tests first\n2. Get approval before modifying non-test code",
+			".clinerules-review":
+				"# Code Reviewer Rules\n1. Provide specific examples in feedback\n2. Focus on maintainability and best practices",
+			".clinerules": "# Test Rules\n1. First rule\n2. Second rule",
+		}
+
+		// Check for exact file name match
+		const fileName = filePath.split("/").pop()
+		if (fileName && fileName in ruleFiles) {
+			return ruleFiles[fileName as keyof RuleFiles]
+		}
+
+		// Check for file name in path
+		for (const [ruleFile, content] of Object.entries(ruleFiles)) {
+			if (filePath.includes(ruleFile)) {
+				return content
+			}
+		}
+
+		// Handle file not found
+		const error = new Error(`ENOENT: no such file or directory, open '${filePath}'`)
+		;(error as any).code = "ENOENT"
+		throw error
+	}),
+
+	writeFile: jest.fn().mockImplementation(async (path: string, content: string) => {
+		// Ensure parent directory exists
+		const parentDir = path.split("/").slice(0, -1).join("/")
+		ensureDirectoryExists(parentDir)
+		mockFiles.set(path, content)
+		return Promise.resolve()
+	}),
+
+	mkdir: jest.fn().mockImplementation(async (path: string, options?: { recursive?: boolean }) => {
+		// Always handle recursive creation
+		const parts = path.split("/")
+		let currentPath = ""
+
+		// For recursive or test/mock paths, create all parent directories
+		if (options?.recursive || path.startsWith("/test") || path.startsWith("/mock")) {
+			for (const part of parts) {
+				if (!part) continue
+				currentPath += "/" + part
+				mockDirectories.add(currentPath)
+			}
+			return Promise.resolve()
+		}
+
+		// For non-recursive paths, verify parent exists
+		for (let i = 0; i < parts.length - 1; i++) {
+			if (!parts[i]) continue
+			currentPath += "/" + parts[i]
+			if (!mockDirectories.has(currentPath)) {
+				const error = new Error(`ENOENT: no such file or directory, mkdir '${path}'`)
+				;(error as any).code = "ENOENT"
+				throw error
+			}
+		}
+
+		// Add the final directory
+		currentPath += "/" + parts[parts.length - 1]
+		mockDirectories.add(currentPath)
+		return Promise.resolve()
+		return Promise.resolve()
+	}),
+
+	access: jest.fn().mockImplementation(async (path: string) => {
+		// Check if the path exists in either files or directories
+		if (mockFiles.has(path) || mockDirectories.has(path) || path.startsWith("/test")) {
+			return Promise.resolve()
+		}
+		const error = new Error(`ENOENT: no such file or directory, access '${path}'`)
+		;(error as any).code = "ENOENT"
+		throw error
+	}),
+
+	constants: jest.requireActual("fs").constants,
+
+	// Expose mock data for test assertions
+	_mockFiles: mockFiles,
+	_mockDirectories: mockDirectories,
+
+	// Helper to set up initial mock data
+	_setInitialMockData: () => {
+		// Set up default MCP settings
+		mockFiles.set(
+			"/mock/settings/path/cline_mcp_settings.json",
+			JSON.stringify({
+				mcpServers: {
+					"test-server": {
+						command: "node",
+						args: ["test.js"],
+						disabled: false,
+						alwaysAllow: ["existing-tool"],
+					},
+				},
+			}),
+		)
+
+		// Ensure all base directories exist
+		baseTestDirs.forEach((dir) => {
+			const parts = dir.split("/")
+			let currentPath = ""
+			for (const part of parts) {
+				if (!part) continue
+				currentPath += "/" + part
+				mockDirectories.add(currentPath)
+			}
+		})
+	},
+}
+
+// Initialize mock data
+mockFs._setInitialMockData()
+
+module.exports = mockFs

package.json

@@ -36,7 +36,7 @@ describe("OpenRouterHandler", () => {
 			apiKey: mockOptions.openRouterApiKey,
 			defaultHeaders: {
 				"HTTP-Referer": "https://github.com/RooVetGit/Roo-Cline",
-				"X-Title": "Roo-Cline",
+				"X-Title": "Roo Code",
 			},
 		})
 	})