Skip to content

Commit 626827a

Browse files
authored
Merge branch 'RooVetGit:main' into human-relay
2 parents 8a5f16c + 82b6fe6 commit 626827a

File tree

76 files changed

+6835
-1771
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+6835
-1771
lines changed

.changeset/chilly-bugs-pay.md

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"roo-cline": patch
3+
---
4+
5+
ExtensionStateContext does not correctly merge state

.changeset/weak-cameras-hope.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"roo-cline": patch
3+
---
4+
5+
Default middle-out compression to on for OpenRouter

.changeset/young-hornets-taste.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/pull_request_template.md

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,35 @@
1-
<!-- **Note:** Consider creating PRs as a DRAFT. For early feedback and self-review. -->
1+
## Context
22

3-
## Description
3+
<!-- Brief description of WHAT you’re doing and WHY. -->
44

5-
## Type of change
5+
## Implementation
66

7-
<!-- Please ignore options that are not relevant -->
7+
<!--
88
9-
- [ ] Bug fix (non-breaking change which fixes an issue)
10-
- [ ] New feature
11-
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
12-
- [ ] This change requires a documentation update
9+
Some description of HOW you achieved it. Perhaps give a high level description of the program flow. Did you need to refactor something? What tradeoffs did you take? Are there things in here which you’d particularly like people to pay close attention to?
1310
14-
## How Has This Been Tested?
11+
-->
1512

16-
<!-- Please describe the tests that you ran to verify your changes -->
13+
## Screenshots
1714

18-
## Checklist:
15+
| before | after |
16+
| ------ | ----- |
17+
| | |
1918

20-
<!-- Go over all the following points, and put an `x` in all the boxes that apply -->
19+
## How to Test
2120

22-
- [ ] My code follows the patterns of this project
23-
- [ ] I have performed a self-review of my own code
24-
- [ ] I have commented my code, particularly in hard-to-understand areas
25-
- [ ] I have made corresponding changes to the documentation
21+
<!--
2622
27-
## Additional context
23+
A straightforward scenario of how to test your changes will help reviewers that are not familiar with the part of the code that you are changing but want to see it in action. This section can include a description or step-by-step instructions of how to get to the state of v2 that your change affects.
2824
29-
<!-- Add any other context or screenshots about the pull request here -->
25+
A "How To Test" section can look something like this:
3026
31-
## Related Issues
27+
- Sign in with a user with tracks
28+
- Activate `show_awesome_cat_gifs` feature (add `?feature.show_awesome_cat_gifs=1` to your URL)
29+
- You should see a GIF with cats dancing
3230
33-
<!-- List any related issues here. Use the GitHub issue linking syntax: #issue-number -->
31+
-->
3432

35-
## Reviewers
33+
## Get in Touch
3634

37-
<!-- @mention specific team members or individuals who should review this PR -->
35+
<!-- We'd love to have a way to chat with you about your changes if necessary. If you're in the [Roo Code Discord](https://discord.gg/roocode), please share your handle here. -->

.github/workflows/changeset-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
cache: 'npm'
3838

3939
- name: Install Dependencies
40-
run: npm run install:all
40+
run: npm run install:ci
4141

4242
# Check if there are any new changesets to process
4343
- name: Check for changesets

.github/workflows/code-qa.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
node-version: '18'
2121
cache: 'npm'
2222
- name: Install dependencies
23-
run: npm run install:all
23+
run: npm run install:ci
2424
- name: Compile
2525
run: npm run compile
2626
- name: Check types
@@ -39,7 +39,7 @@ jobs:
3939
node-version: '18'
4040
cache: 'npm'
4141
- name: Install dependencies
42-
run: npm run install:all
42+
run: npm run install:ci
4343
- name: Run knip checks
4444
run: npm run knip
4545

@@ -54,7 +54,7 @@ jobs:
5454
node-version: '18'
5555
cache: 'npm'
5656
- name: Install dependencies
57-
run: npm run install:all
57+
run: npm run install:ci
5858
- name: Run unit tests
5959
run: npx jest --silent
6060

@@ -69,7 +69,7 @@ jobs:
6969
node-version: '18'
7070
cache: 'npm'
7171
- name: Install dependencies
72-
run: npm run install:all
72+
run: npm run install:ci
7373
- name: Run unit tests
7474
working-directory: webview-ui
7575
run: npx jest --silent
@@ -108,9 +108,11 @@ jobs:
108108
with:
109109
node-version: '18'
110110
cache: 'npm'
111+
- name: Install dependencies
112+
run: npm run install:ci
111113
- name: Create env.integration file
114+
working-directory: e2e
112115
run: echo "OPENROUTER_API_KEY=${{ secrets.OPENROUTER_API_KEY }}" > .env.integration
113-
- name: Install dependencies
114-
run: npm run install:all
115116
- name: Run integration tests
116-
run: xvfb-run -a npm run test:integration
117+
working-directory: e2e
118+
run: xvfb-run -a npm run ci

.github/workflows/marketplace-publish.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ jobs:
2929
- name: Install Dependencies
3030
run: |
3131
npm install -g vsce ovsx
32-
npm install
33-
cd webview-ui
34-
npm install
35-
cd ..
32+
npm run install:ci
3633
- name: Package and Publish Extension
3734
env:
3835
VSCE_PAT: ${{ secrets.VSCE_PAT }}

.vscodeignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
.vscode/**
55
.vscode-test/**
66
out/**
7+
out-integration/**
8+
e2e/**
79
node_modules/**
810
src/**
911
.gitignore
@@ -25,7 +27,6 @@ demo.gif
2527
.roomodes
2628
cline_docs/**
2729
coverage/**
28-
out-integration/**
2930

3031
# Ignore all webview-ui files except the build directory (https://github.com/microsoft/vscode-webview-ui-toolkit-samples/blob/main/frameworks/hello-world-react-cra/.vscodeignore)
3132
webview-ui/src/**

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
# Roo Code Changelog
22

3+
## [3.7.11]
4+
5+
- Don't honor custom max tokens for non thinking models
6+
- Include custom modes in mode switching keyboard shortcut
7+
- Support read-only modes that can run commands
8+
9+
## [3.7.10]
10+
11+
- Add Gemini models on Vertex AI (thanks @ashktn!)
12+
- Keyboard shortcuts to switch modes (thanks @aheizi!)
13+
- Add support for Mermaid diagrams (thanks Cline!)
14+
15+
## [3.7.9]
16+
17+
- Delete task confirmation enhancements
18+
- Smarter context window management
19+
- Prettier thinking blocks
20+
- Fix maxTokens defaults for Claude 3.7 Sonnet models
21+
- Terminal output parsing improvements (thanks @KJ7LNW!)
22+
- UI fix to dropdown hover colors (thanks @SamirSaji!)
23+
- Add support for Claude Sonnet 3.7 thinking via Vertex AI (thanks @lupuletic!)
24+
325
## [3.7.8]
426

527
- Add Vertex AI prompt caching support for Claude models (thanks @aitoroses and @lupuletic!)

0 commit comments

Comments
 (0)