Skip to content

Commit 638bb3c

Browse files
authored
Merge branch 'RooVetGit:main' into log-cleanup
2 parents 7a0a896 + 6e958df commit 638bb3c

35 files changed

+342
-269
lines changed

.changeset/seven-ghosts-tan.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

.github/workflows/marketplace-publish.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ jobs:
2929
git config user.name "github-actions[bot]"
3030
git config user.email "github-actions[bot]@users.noreply.github.com"
3131
- name: Install Dependencies
32-
run: |
33-
npm install -g vsce ovsx
34-
npm run install:all
32+
run: npm run install:all
3533
- name: Create .env file
3634
run: echo "POSTHOG_API_KEY=${{ secrets.POSTHOG_API_KEY }}" >> .env
3735
- name: Package Extension

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
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+
8+
## [3.17.1] - 2025-05-15
9+
10+
- Fix the display of the command to execute during approval
11+
- Fix incorrect reserved tokens calculation on OpenRouter (thanks @daniel-lxs!)
12+
313
## [3.17.0] - 2025-05-14
414

515
- Enable Gemini implicit caching

package-lock.json

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

package.json

Lines changed: 4 additions & 3 deletions
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.0",
6+
"version": "3.17.2",
77
"icon": "assets/icons/icon.png",
88
"galleryBanner": {
99
"color": "#617A91",
@@ -342,7 +342,7 @@
342342
"test:extension-esm": "vitest run",
343343
"test:webview": "cd webview-ui && npm run test",
344344
"prepare": "husky",
345-
"publish:marketplace": "vsce publish && ovsx publish",
345+
"publish:marketplace": "npx vsce publish && npx ovsx publish",
346346
"publish": "npm run build && changeset publish && npm install --package-lock-only",
347347
"version-packages": "changeset version && npm install --package-lock-only",
348348
"vscode:prepublish": "npm run package",
@@ -442,7 +442,7 @@
442442
"@typescript-eslint/eslint-plugin": "^7.14.1",
443443
"@typescript-eslint/parser": "^7.11.0",
444444
"@vscode/test-electron": "^2.5.2",
445-
"@vscode/vsce": "^3.3.2",
445+
"@vscode/vsce": "3.3.2",
446446
"esbuild": "^0.25.0",
447447
"eslint": "^8.57.0",
448448
"execa": "^9.5.2",
@@ -455,6 +455,7 @@
455455
"mkdirp": "^3.0.1",
456456
"nock": "^14.0.4",
457457
"npm-run-all2": "^8.0.1",
458+
"ovsx": "0.10.2",
458459
"prettier": "^3.4.2",
459460
"rimraf": "^6.0.1",
460461
"ts-jest": "^29.2.5",
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)