Merge branch 'RooCodeInc:main' into main

Author: KanTakahiro

.dockerignore

@@ -61,7 +61,6 @@ __tests__
 # Ignore development config files
 .eslintrc*
 .prettierrc*
-jest.config*
 
 # Ignore most directories except what we need for the build
 apps/

.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

.github/workflows/evals.yml

@@ -41,7 +41,7 @@ jobs:
                   EOF
 
             - name: Build image
-              uses: docker/build-push-action@v5
+              uses: docker/build-push-action@v6
               with:
                   context: .
                   file: packages/evals/Dockerfile.runner

.gitignore

@@ -32,6 +32,7 @@ docs/_site/
 
 # Logging
 logs
+*.log
 
 # Vite development
 .vite-port

.roo/rules-issue-writer/1_workflow.xml

@@ -88,9 +88,12 @@
       - read_file on specific files to understand implementation
       - search_files for specific error messages or patterns
 
+      Formulate an independent technical plan to solve the problem, disregarding any solution proposed by the issue author.
+      
       Document all relevant findings including:
       - File paths and line numbers
       - Current implementation details
+      - Your proposed implementation plan
       - Related code that might be affected
     </instructions>
   </step>
@@ -134,12 +137,13 @@
       [paste any error messages or logs]
       ```
 
-      ## Technical Context (from codebase exploration)
+      ## Technical Analysis
 
       Based on my investigation:
       - The issue appears to be in [file:line]
       - Related code: [brief description with file references]
       - Possible cause: [technical explanation]
+      - **Proposed Fix:** [Detail the fix from your implementation plan.]
       ```
 
       For Feature Requests, format as:
@@ -156,7 +160,7 @@
 
       ## How should this be solved?
 
-      [Detailed solution description]
+      [Based on your independent analysis, describe your proposed solution here. Disregard the author's proposal.]
 
       **What will change:**
       - [Specific change 1]
@@ -185,13 +189,14 @@
       **Main challenges:** [technical difficulties]
       **Dependencies:** [what's needed]
 
-      ## Technical Implementation Details (from codebase exploration)
+      ## Technical Implementation Plan
 
-      Based on my analysis:
+      Based on my analysis from the previous step:
       - Key files to modify: [list with paths]
       - Current architecture: [brief description]
       - Integration points: [where this fits]
       - Similar patterns in codebase: [examples]
+      - Implementation Steps: [Provide a detailed, step-by-step guide for your proposed solution.]
 
       ## Technical Considerations
 

.roo/rules-issue-writer/5_github_mcp_tool_usage.xml

@@ -221,8 +221,8 @@
   <post_creation_tools>
     <tool name="add_issue_comment">
       <when_to_use>
-        Use if user wants to add additional information after creation.
-        Also use to link related issues.
+        ONLY Use if user wants to add additional information after creation.
+
       </when_to_use>
       <example>
         <use_mcp_tool>
@@ -233,7 +233,7 @@
           "owner": "RooCodeInc",
           "repo": "Roo-Code",
           "issue_number": 456,
-          "body": "Related to #123 - both issues affect dark theme visibility"
+          "body": "Blah blah blah, additional context or comments."
         }
         </arguments>
         </use_mcp_tool>

.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:
 

.roomodes

@@ -28,10 +28,10 @@ customModes:
   - slug: test
     name: 🧪 Test
     roleDefinition: >-
-      You are Roo, a Jest testing specialist with deep expertise in:
-      - Writing and maintaining Jest test suites
+      You are Roo, a Vitest testing specialist with deep expertise in:
+      - Writing and maintaining Vitest test suites
       - Test-driven development (TDD) practices
-      - Mocking and stubbing with Jest
+      - Mocking and stubbing with Vitest
       - Integration testing strategies
       - TypeScript testing patterns
       - Code coverage analysis
@@ -41,21 +41,23 @@ customModes:
       - Test files in __tests__ directories
       - Mock implementations in __mocks__
       - Test utilities and helpers
-      - Jest configuration and setup
+      - Vitest configuration and setup
 
       You ensure tests are:
       - Well-structured and maintainable
-      - Following Jest best practices
+      - Following Vitest best practices
       - Properly typed with TypeScript
       - Providing meaningful coverage
       - Using appropriate mocking strategies
+    whenToUse: >-
+      Use this mode when you need to write, modify, or maintain tests for the codebase.
     groups:
       - read
       - browser
       - command
       - - edit
-        - fileRegex: (__tests__/.*|__mocks__/.*|\.test\.(ts|tsx|js|jsx)$|/test/.*|jest\.config\.(js|ts)$)
-          description: Test files, mocks, and Jest configuration
+        - fileRegex: (__tests__/.*|__mocks__/.*|\.test\.(ts|tsx|js|jsx)$|\.spec\.(ts|tsx|js|jsx)$|/test/.*|vitest\.config\.(js|ts)$|vitest\.setup\.(js|ts)$)
+          description: Test files, mocks, and Vitest configuration
     customInstructions: |-
       When writing tests:
       - Always use describe/it blocks for clear test organization
@@ -66,6 +68,8 @@ customModes:
       - Ensure mocks are properly typed
       - Verify both positive and negative test cases
       - Always use data-testid attributes when testing webview-ui
+      - 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`
   - slug: design-engineer
     name: 🎨 Design Engineer
     roleDefinition: >-

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Roo Code Changelog
 
+## [3.21.0] - 2025-06-17
+
+- Add Roo Marketplace to make it easy to discover and install great MCPs and modes!
+- Add Gemini 2.5 models (Pro, Flash and Flash Lite) (thanks @daniel-lxs!)
+- Add support for Excel (.xlsx) files in tools (thanks @chrarnoldus!)
+- Add max tokens checkbox option for OpenAI compatible provider (thanks @AlexandruSmirnov!)
+- Update provider models and prices for Groq & Mistral (thanks @KanTakahiro!)
+- Add proper error handling for API conversation history issues (thanks @KJ7LNW!)
+- Fix ambiguous model id error (thanks @elianiva!)
+- Fix save/discard/revert flow for Prompt Settings (thanks @hassoncs!)
+- Fix codebase indexing alignment with list-files hidden directory filtering (thanks @daniel-lxs!)
+- Fix subtask completion mismatch (thanks @feifei325!)
+- Fix Windows path normalization in MCP variable injection (thanks @daniel-lxs!)
+- Update marketplace branding to 'Roo Marketplace' (thanks @SannidhyaSah!)
+- Refactor to more consistent history UI (thanks @elianiva!)
+- Adjust context menu positioning to be near Copilot
+- Update evals Docker setup to work on Windows (thanks @StevenTCramer!)
+- Include current working directory in terminal details
+- Encourage use of start_line in multi-file diff to match legacy diff
+- Always focus the panel when clicked to ensure menu buttons are visible (thanks @hassoncs!)
+
 ## [3.20.3] - 2025-06-13
 
 - Resolve diff editor race condition in multi-monitor setups (thanks @daniel-lxs!)