Skip to content

Commit 95342d3

Browse files
authored
Merge branch 'RooVetGit:main' into footgun-evals
2 parents 5637712 + 4550a91 commit 95342d3

35 files changed

+283
-198
lines changed

.changeset/ten-stars-occur.md

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

.changeset/young-dancers-join.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+
Fix settings import when global settings are omitted

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,7 @@ logs
3636

3737
# Vite development
3838
.vite-port
39+
40+
# IntelliJ and Qodo plugin folders
41+
.idea/
42+
.qodo/

.vscodeignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,7 @@ assets/docs/**
6868

6969
# Include .env file for telemetry
7070
!.env
71+
72+
# Ignore IntelliJ and Qodo plugin folders
73+
.idea/**
74+
.qodo/**

CHANGELOG.md

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

3+
## [3.17.2] - 2025-05-15
4+
5+
- Revert "Switch to the new Roo message parser" (appears to cause a tool parsing bug)
6+
- Lock the versions of vsce and ovsx
7+
38
## [3.17.1] - 2025-05-15
49

510
- Fix the display of the command to execute during approval

esbuild.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,17 @@ const copyWasmFiles = {
3434

3535
// tiktoken WASM file
3636
fs.copyFileSync(
37-
path.join(nodeModulesDir, "tiktoken", "tiktoken_bg.wasm"),
37+
path.join(nodeModulesDir, "tiktoken", "lite", "tiktoken_bg.wasm"),
3838
path.join(distDir, "tiktoken_bg.wasm"),
3939
)
4040

41+
// Also copy to the workers directory
42+
fs.mkdirSync(path.join(distDir, "workers"), { recursive: true })
43+
fs.copyFileSync(
44+
path.join(nodeModulesDir, "tiktoken", "lite", "tiktoken_bg.wasm"),
45+
path.join(distDir, "workers", "tiktoken_bg.wasm"),
46+
)
47+
4148
// Main tree-sitter WASM file
4249
fs.copyFileSync(
4350
path.join(nodeModulesDir, "web-tree-sitter", "tree-sitter.wasm"),

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"displayName": "%extension.displayName%",
44
"description": "%extension.description%",
55
"publisher": "RooVeterinaryInc",
6-
"version": "3.17.1",
6+
"version": "3.17.2",
77
"icon": "assets/icons/icon.png",
88
"galleryBanner": {
99
"color": "#617A91",
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
export { type AssistantMessageContent, parseAssistantMessage } from "./parseAssistantMessage"
22
export { presentAssistantMessage } from "./presentAssistantMessage"
3-
export { parseAssistantMessageV2 } from "./parseAssistantMessageV2"

0 commit comments

Comments
 (0)