Skip to content

Commit 4ada518

Browse files
authored
Merge branch 'main' into jbbrown/bedrock_cost_intelligent_prompt_routing
2 parents 6c74e9b + cd9fb24 commit 4ada518

File tree

121 files changed

+5915
-3305
lines changed

Some content is hidden

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

121 files changed

+5915
-3305
lines changed

.changeset/automatic-tags-publish.md

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

.changeset/lemon-bulldogs-unite.md

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

.changeset/tidy-queens-pay.md

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

.github/workflows/code-qa.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ jobs:
110110
cache: 'npm'
111111
- name: Install dependencies
112112
run: npm run install:all
113-
- name: Create env.integration file
113+
- name: Create .env.local file
114114
working-directory: e2e
115-
run: echo "OPENROUTER_API_KEY=${{ secrets.OPENROUTER_API_KEY }}" > .env.integration
115+
run: echo "OPENROUTER_API_KEY=${{ secrets.OPENROUTER_API_KEY }}" > .env.local
116116
- name: Run integration tests
117117
working-directory: e2e
118118
run: xvfb-run -a npm run ci

.github/workflows/marketplace-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
node-version: 18
2828

2929
- run: |
30-
git config user.name github-actions
31-
git config user.email github-actions@github.com
30+
git config user.name "github-actions[bot]"
31+
git config user.email "github-actions[bot]@users.noreply.github.com"
3232
3333
- name: Install Dependencies
3434
run: |

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ docs/_site/
2222

2323
# Dotenv
2424
.env
25-
.env.integration
25+
.env.*
26+
!.env.*.sample
27+
2628

2729
#Local lint config
2830
.eslintrc.local.json

.roomodes

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"customModes": [
3+
{
4+
"slug": "translate",
5+
"name": "Translate",
6+
"roleDefinition": "You are Roo, a linguistic specialist focused on translating and managing localization files. Your responsibility is to help maintain and update translation files for the application, ensuring consistency and accuracy across all language resources.",
7+
"groups": [
8+
"read",
9+
["edit", { "fileRegex": "src/i18n/locales/", "description": "Translation files only" }]
10+
],
11+
"customInstructions": "When translating content:\n- Maintain consistent terminology across all translations\n- Respect the JSON structure of translation files\n- Consider context when translating UI strings\n- Watch for placeholders (like {{variable}}) and preserve them in translations\n- Be mindful of text length in UI elements when translating to languages that might require more characters\n- If you need context for a translation, use read_file to examine the components using these strings"
12+
},
13+
{
14+
"slug": "test",
15+
"name": "Test",
16+
"roleDefinition": "You are Roo, a Jest testing specialist with deep expertise in:\n- Writing and maintaining Jest test suites\n- Test-driven development (TDD) practices\n- Mocking and stubbing with Jest\n- Integration testing strategies\n- TypeScript testing patterns\n- Code coverage analysis\n- Test performance optimization\n\nYour focus is on maintaining high test quality and coverage across the codebase, working primarily with:\n- Test files in __tests__ directories\n- Mock implementations in __mocks__\n- Test utilities and helpers\n- Jest configuration and setup\n\nYou ensure tests are:\n- Well-structured and maintainable\n- Following Jest best practices\n- Properly typed with TypeScript\n- Providing meaningful coverage\n- Using appropriate mocking strategies",
17+
"groups": [
18+
"read",
19+
"browser",
20+
"command",
21+
["edit", {
22+
"fileRegex": "(__tests__/.*|__mocks__/.*|\\.test\\.(ts|tsx|js|jsx)$|/test/.*|jest\\.config\\.(js|ts)$)",
23+
"description": "Test files, mocks, and Jest configuration"
24+
}]
25+
],
26+
"customInstructions": "When writing tests:\n- Always use describe/it blocks for clear test organization\n- Include meaningful test descriptions\n- Use beforeEach/afterEach for proper test isolation\n- Implement proper error cases\n- Add JSDoc comments for complex test scenarios\n- Ensure mocks are properly typed\n- Verify both positive and negative test cases"
27+
}
28+
]
29+
}

CHANGELOG.md

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

3+
## [3.8.6] - 2025-03-13
4+
5+
- Revert SSE MCP support while we debug some config validation issues
6+
7+
## [3.8.5] - 2025-03-12
8+
9+
- Refactor terminal architecture to address critical issues with the current design (thanks @KJ7LNW!)
10+
- MCP over SSE (thanks @aheizi!)
11+
- Support for remote browser connections (thanks @afshawnlotfi!)
12+
- Preserve parent-child relationship when cancelling subtasks (thanks @cannuri!)
13+
- Custom baseUrl for Google AI Studio Gemini (thanks @dqroid!)
14+
- PowerShell-specific command handling (thanks @KJ7LNW!)
15+
- OpenAI-compatible DeepSeek/QwQ reasoning support (thanks @lightrabbit!)
16+
- Anthropic-style prompt caching in the OpenAI-compatible provider (thanks @dleen!)
17+
- Add Deepseek R1 for AWS Bedrock (thanks @ATempsch!)
18+
- Fix MarkdownBlock text color for Dark High Contrast theme (thanks @cannuri!)
19+
- Add gemini-2.0-pro-exp-02-05 model to vertex (thanks @shohei-ihaya!)
20+
- Bring back progress status for multi-diff edits (thanks @qdaxb!)
21+
- Refactor alert dialog styles to use the correct vscode theme (thanks @cannuri!)
22+
- Custom ARNs in AWS Bedrock (thanks @Smartsheet-JB-Brown!)
23+
- Update MCP servers directory path for platform compatibility (thanks @hannesrudolph!)
24+
- Fix browser system prompt inclusion rules (thanks @cannuri!)
25+
- Publish git tags to github from CI (thanks @pdecat!)
26+
- Fixes to OpenAI-style cost calculations (thanks @dtrugman!)
27+
- Fix to allow using an excluded directory as your working directory (thanks @Szpadel!)
28+
- Kotlin language support in list_code_definition_names tool (thanks @kohii!)
29+
- Better handling of diff application errors (thanks @qdaxb!)
30+
- Update Bedrock prices to the latest (thanks @Smartsheet-JB-Brown!)
31+
- Fixes to OpenRouter custom baseUrl support
32+
- Fix usage tracking for SiliconFlow and other providers that include usage on every chunk
33+
- Telemetry for checkpoint save/restore/diff and diff strategies
34+
335
## [3.8.4] - 2025-03-09
436

537
- Roll back multi-diff progress indicator temporarily to fix a double-confirmation in saving edits
File renamed without changes.

e2e/VSCODE_INTEGRATION_TESTS.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The test runner (`runTest.ts`) is responsible for:
3030

3131
### Environment Setup
3232

33-
1. Create a `.env.integration` file in the root directory with required environment variables:
33+
1. Create a `.env.local` file in the root directory with required environment variables:
3434

3535
```
3636
OPENROUTER_API_KEY=sk-or-v1-...
@@ -67,7 +67,7 @@ declare global {
6767

6868
## Running Tests
6969

70-
1. Ensure you have the required environment variables set in `.env.integration`
70+
1. Ensure you have the required environment variables set in `.env.local`
7171

7272
2. Run the integration tests:
7373

@@ -117,8 +117,10 @@ const interval = 1000
117117
2. **State Management**: Reset extension state before/after tests:
118118

119119
```typescript
120-
await globalThis.provider.updateGlobalState("mode", "Ask")
121-
await globalThis.provider.updateGlobalState("alwaysAllowModeSwitch", true)
120+
await globalThis.api.setConfiguration({
121+
mode: "Ask",
122+
alwaysAllowModeSwitch: true,
123+
})
122124
```
123125

124126
3. **Assertions**: Use clear assertions with meaningful messages:
@@ -141,8 +143,12 @@ try {
141143

142144
```typescript
143145
let startTime = Date.now()
146+
144147
while (Date.now() - startTime < timeout) {
145-
if (condition) break
148+
if (condition) {
149+
break
150+
}
151+
146152
await new Promise((resolve) => setTimeout(resolve, interval))
147153
}
148154
```

0 commit comments

Comments
 (0)