Merge remote-tracking branch 'origin/main' into feature/2122-editor-focus

# Conflicts:
#	packages/types/src/global-settings.ts
#	packages/types/src/provider-settings.ts
#	src/core/tools/__tests__/writeToFileTool.spec.ts
#	src/core/tools/writeToFileTool.ts
#	src/integrations/editor/DiffViewProvider.ts
#	src/integrations/editor/__tests__/DiffViewProvider.test.ts
#	src/package.json
#	src/package.nls.json

Author: felixAnhalt

.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/ISSUE_TEMPLATE/feature_request.yml

@@ -1,33 +1,28 @@
 name: Detailed Feature Proposal
-description: Propose a specific, actionable feature or enhancement for implementation
+description: Report a specific problem that needs solving in Roo Code
 labels: ["proposal", "enhancement"]
 body:
   - type: markdown
     attributes:
       value: |
-        **Thank you for proposing a feature for Roo Code!**
+        **Thank you for submitting a feature request for Roo Code!**
         
-        This template is for specific, actionable proposals following our [Issue-First Approach](https://github.com/RooCodeInc/Roo-Code/blob/main/CONTRIBUTING.md).
+        This template helps you describe problems that need solving. Focus on the problem - the Roo team will work to design solutions unless you want to contribute the implementation yourself.
         
-        **Quality over speed:** We prefer detailed, clear proposals over quick ones. Vague proposals often get closed or require multiple rounds of clarification, which wastes everyone's time.
+        **Quality over speed:** We prefer detailed, clear problem descriptions over quick ones. Vague requests often get closed or require multiple rounds of clarification, which wastes everyone's time.
         
         **Before submitting:**
         - Search existing [Issues](https://github.com/RooCodeInc/Roo-Code/issues) and [Discussions](https://github.com/RooCodeInc/Roo-Code/discussions) to avoid duplicates
-        - For general ideas, use [GitHub Discussions](https://github.com/RooCodeInc/Roo-Code/discussions/categories/feature-requests) first, or use the #collaboration-board channel in our [Discord](https://discord.gg/roocode)
-        - Join [Discord](https://discord.gg/roocode) and DM **Hannes Rudolph** (`hrudolph`) for guidance
-        
-        **Review process:** A maintainer (especially @hannesrudolph) will review this proposal. **Do not start implementation until approved and assigned.** We're a small team with limited resources, so every code addition needs careful consideration. We're always happy to receive clear, actionable proposals though!
+        - For general ideas, use [GitHub Discussions](https://github.com/RooCodeInc/Roo-Code/discussions/categories/feature-requests) instead of this template.
 
   - type: markdown
     attributes:
       value: |
-        ## ❌ Common mistakes that lead to proposal rejection:
+        ## ❌ Common mistakes that lead to request rejection:
         - **Vague problem descriptions:** "UI is bad" -> Should be: "Submit button is invisible on dark theme"
-        - **Solution without context:** "Add feature X" -> Should explain the problem first, then the solution
         - **Missing user impact:** "This would be cool" -> Should explain who benefits and how
-        - **No acceptance criteria:** How do we know when it's done? What does success look like?
+        - **No specific context:** Describe exactly when and how the problem occurs
 
-        If you're unsure how a good proposal should look like, you can check out our [Roadmap](https://github.com/orgs/RooCodeInc/projects/1/views/1?query=sort%3Aupdated-desc+is%3Aopen&filterQuery=is%3Aissue%2Copen%2Cclosed+label%3A%22feature+request%22+status%3A%22Issue+%5BUnassigned%5D%22%2C%22Issue+%5BIn+Progress%5D%22) where we have a list of all open feature requests that are ready to be implemented or currently being worked on.
 
   - type: textarea
     id: problem-description
@@ -55,11 +50,68 @@ body:
     validations:
       required: true
 
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context (optional)
+      description: Mockups, screenshots, links, user quotes, or other relevant information that supports your proposal.
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Request checklist
+      options:
+        - label: I've searched existing Issues and Discussions for duplicates
+          required: true
+        - label: This describes a specific problem with clear impact and context
+          required: true
+
+  - type: markdown
+    attributes:
+      value: |
+        ---
+        
+        ## 🛠️ **Optional: Contributing & Technical Analysis**
+        
+        **🎯 Just reporting a problem?** You can click "Submit new issue" right now! The sections below are only needed if you want to contribute a solution via pull request.
+        
+        **⚠️ Only continue if you want to:**
+        - Propose a specific solution design
+        - Implement the feature yourself via pull request
+        - Provide technical analysis to help with implementation
+        
+        **For contributors who continue:**
+        - A maintainer (especially @hannesrudolph) will review this proposal. **Do not start implementation until approved and assigned.** We're a small team with limited resources, so every code addition needs careful consideration. We're always happy to receive clear, actionable proposals though!
+        - Join [Discord](https://discord.gg/roocode) and DM **Hannes Rudolph** (`hrudolph`) for guidance on implementation
+        - Check our [Roadmap](https://github.com/orgs/RooCodeInc/projects/1/views/1?query=sort%3Aupdated-desc+is%3Aopen&filterQuery=is%3Aissue%2Copen%2Cclosed+label%3A%22feature+request%22+status%3A%22Issue+%5BUnassigned%5D%22%2C%22Issue+%5BIn+Progress%5D%22) to see open feature requests ready to be implemented or currently being worked on
+
+  - type: checkboxes
+    id: willingness-to-contribute
+    attributes:
+      label: Interested in implementing this?
+      description: |
+        **Important:** If you check "Yes" below, the technical sections become REQUIRED.
+        We need detailed technical analysis from contributors to ensure quality implementation.
+      options:
+        - label: Yes, I'd like to help implement this feature
+          required: false
+
+  - type: checkboxes
+    id: implementation-approval
+    attributes:
+      label: Implementation requirements
+      options:
+        - label: I understand this needs approval before implementation begins
+          required: false
+
   - type: textarea
     id: proposed-solution
     attributes:
-      label: How should this be solved?
+      label: How should this be solved? (REQUIRED if contributing, optional otherwise)
       description: |
+        **If you want to implement this feature, this section is REQUIRED.**
+        
         **Describe your solution in detail.** Explain not just what to build, but how it should work.
         
         ✅ **Good examples:**
@@ -77,14 +129,14 @@ body:
         - How will users interact with it?
         - What will the new behaviour look like?
       placeholder: Describe the specific changes and how they will work. Include user interaction details if relevant.
-    validations:
-      required: true
 
   - type: textarea
     id: acceptance-criteria
     attributes:
-      label: How will we know it works? (Acceptance Criteria)
+      label: How will we know it works? (Acceptance Criteria - REQUIRED if contributing, optional otherwise)
       description: |
+        **If you want to implement this feature, this section is REQUIRED.**
+        
         **This is crucial - don't skip it.** Define what "working" looks like with specific, testable criteria.
         
         **Format suggestion:**
@@ -108,42 +160,14 @@ body:
       placeholder: |
         Define specific, testable criteria. What should users be able to do? What should happen? What should NOT happen?
         Use the Given/When/Then format above or your own clear structure.
-    validations:
-      required: true
-
-  - type: textarea
-    id: estimated-effort
-    attributes:
-      label: Estimated effort and complexity
-      description: |
-        **Help us understand the scope.** This helps with planning and prioritisation.
-        
-        **Please include:**
-        - **Size estimate:** XS/Small/Medium/Large/XL (or hours/days if you prefer)
-        - **Reasoning:** What makes it this size? Which parts are complex?
-        - **Main challenges:** What's the trickiest bit to implement?
-        - **Dependencies:** Does this require other changes or external libraries?
-        
-        **Example:**
-        ```
-        Size: Large (2-3 weeks)
-        Reasoning: Touches task execution engine, UI components, and state management
-        Main challenges: Preventing memory leaks with parallel execution and managing shared resources
-        Dependencies: Might need to add a new dependency for the new feature
-        ```
-      placeholder: |
-        Size: [your estimate]
-        Reasoning: [why this size?]
-        Main challenges: [what's tricky?]
-        Dependencies: [what else is needed?]
-    validations:
-      required: true
 
   - type: textarea
     id: technical-considerations
     attributes:
-      label: Technical considerations (optional but helpful)
+      label: Technical considerations (REQUIRED if contributing, optional otherwise)
       description: |
+        **If you want to implement this feature, this section is REQUIRED.**
+        
         Share technical insights that could help planning:
         - Implementation approach or architecture changes
         - Performance implications
@@ -155,40 +179,13 @@ body:
   - type: textarea
     id: trade-offs-and-risks
     attributes:
-      label: Trade-offs and risks (optional)
+      label: Trade-offs and risks (REQUIRED if contributing, optional otherwise)
       description: |
+        **If you want to implement this feature, this section is REQUIRED.**
+        
         What could go wrong or what alternatives did you consider?
         - Alternative approaches and why you chose this one
         - Potential negative impacts (performance, UX, etc.)
         - Breaking changes or migration concerns
         - Edge cases that need careful handling
       placeholder: 'e.g., "Alternative: use library X but it is 500KB larger", "Risk: might slow older devices", "Breaking: changes API response format"'
-
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional context (optional)
-      description: Mockups, screenshots, links, user quotes, or other relevant information that supports your proposal.
-
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Proposal checklist
-      options:
-        - label: I've searched existing Issues and Discussions for duplicates
-          required: true
-        - label: This is a specific, actionable proposal with clear problem and solution
-          required: true
-        - label: I've included concrete acceptance criteria
-          required: true
-        - label: I understand this needs approval before implementation begins
-          required: true
-
-  - type: checkboxes
-    id: willingness-to-contribute
-    attributes:
-      label: Interested in implementing this?
-      description: Optional - doesn't affect proposal consideration
-      options:
-        - label: Yes, I'd like to help implement this feature
-          required: false

.github/ISSUE_TEMPLATE/marketplace.yml

@@ -0,0 +1,62 @@
+name: Marketplace Feedback
+description: Report issues or suggest improvements for marketplace items (custom modes and MCP servers)
+labels: ["marketplace"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **Thanks for your feedback!** Please check existing issues first: https://github.com/RooCodeInc/Roo-Code/issues
+
+  - type: dropdown
+    id: feedback-type
+    attributes:
+      label: What kind of feedback?
+      options:
+        - Problem with existing marketplace item
+        - Suggestion for new custom mode
+        - Suggestion for new MCP server
+        - General marketplace issue
+    validations:
+      required: true
+
+  - type: dropdown
+    id: item-type
+    attributes:
+      label: Item Type (if applicable)
+      options:
+        - Custom Mode
+        - MCP Server
+        - Marketplace UI/Functionality
+        - Not Applicable
+    validations:
+      required: false
+
+  - type: input
+    id: item-name
+    attributes:
+      label: Item Name (if applicable)
+      placeholder: e.g., "Debug Mode", "Weather API Server", "Code Formatter"
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: What's the issue or what would you like to see?
+      placeholder: Clear description of the problem or suggestion
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional-info
+    attributes:
+      label: Additional Details (optional)
+      description: Steps to reproduce, expected behavior, screenshots, etc.
+      placeholder: Any other helpful information
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Checklist
+      options:
+        - label: I've searched existing issues for duplicates
+          required: true

.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/pull_request_template.md

@@ -30,37 +30,15 @@ Detail the steps to test your changes. This helps reviewers verify your work.
 - Include relevant testing environment details if applicable.
 -->
 
-### Type of Change
-
-<!-- Mark all applicable boxes with an 'x'. -->
-
-- [ ] 🐛 **Bug Fix**: Non-breaking change that fixes an issue.
-- [ ] ✨ **New Feature**: Non-breaking change that adds functionality.
-- [ ] 💥 **Breaking Change**: Fix or feature that would cause existing functionality to not work as expected.
-- [ ] ♻️ **Refactor**: Code change that neither fixes a bug nor adds a feature.
-- [ ] 💅 **Style**: Changes that do not affect the meaning of the code (white-space, formatting, etc.).
-- [ ] 📚 **Documentation**: Updates to documentation files.
-- [ ] ⚙️ **Build/CI**: Changes to the build process or CI configuration.
-- [ ] 🧹 **Chore**: Other changes that don't modify `src` or test files.
-
 ### Pre-Submission Checklist
 
 <!-- Go through this checklist before marking your PR as ready for review. -->
 
 - [ ] **Issue Linked**: This PR is linked to an approved GitHub Issue (see "Related GitHub Issue" above).
 - [ ] **Scope**: My changes are focused on the linked issue (one major feature/fix per PR).
 - [ ] **Self-Review**: I have performed a thorough self-review of my code.
-- [ ] **Code Quality**:
-    - [ ] My code adheres to the project's style guidelines.
-    - [ ] There are no new linting errors or warnings (`npm run lint`).
-    - [ ] All debug code (e.g., `console.log`) has been removed.
-- [ ] **Testing**:
-    - [ ] New and/or updated tests have been added to cover my changes.
-    - [ ] All tests pass locally (`npm test`).
-    - [ ] The application builds successfully with my changes.
-- [ ] **Branch Hygiene**: My branch is up-to-date (rebased) with the `main` branch.
+- [ ] **Testing**: New and/or updated tests have been added to cover my changes (if applicable).
 - [ ] **Documentation Impact**: I have considered if my changes require documentation updates (see "Documentation Updates" section below).
-- [ ] **Changeset**: A changeset has been created using `npm run changeset` if this PR includes user-facing changes or dependency updates.
 - [ ] **Contribution Guidelines**: I have read and agree to the [Contributor Guidelines](/CONTRIBUTING.md).
 
 ### Screenshots / Videos

.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

.github/workflows/website-deploy.yml

@@ -13,9 +13,24 @@ env:
     VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
 
 jobs:
+    check-secrets:
+        runs-on: ubuntu-latest
+        outputs:
+            has-vercel-token: ${{ steps.check.outputs.has-vercel-token }}
+        steps:
+            - name: Check if VERCEL_TOKEN exists
+              id: check
+              run: |
+                if [ -n "${{ secrets.VERCEL_TOKEN }}" ]; then
+                  echo "has-vercel-token=true" >> $GITHUB_OUTPUT
+                else
+                  echo "has-vercel-token=false" >> $GITHUB_OUTPUT
+                fi
+
     deploy:
         runs-on: ubuntu-latest
-        if: ${{ secrets.VERCEL_TOKEN != '' }}
+        needs: check-secrets
+        if: ${{ needs.check-secrets.outputs.has-vercel-token == 'true' }}
         steps:
             - name: Checkout code
               uses: actions/checkout@v4