Merge branch 'lm-studio-and-ollama-usage-fix' of https://github.com/xyOz-dev/Roo-Code into lm-studio-and-ollama-usage-fix

Author: xyOz-dev

.changeset/seven-ghosts-tan.md

@@ -0,0 +1,5 @@
+---
+"roo-cline": patch
+---
+
+Fix settings import when global settings are omitted

.changeset/young-dancers-join.md

@@ -29,9 +29,7 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
       - name: Install Dependencies
-        run: |
-          npm install -g vsce ovsx
-          npm run install:all
+        run: npm run install:all
       - name: Create .env file
         run: echo "POSTHOG_API_KEY=${{ secrets.POSTHOG_API_KEY }}" >> .env
       - name: Package Extension

.github/workflows/marketplace-publish.yml

@@ -36,3 +36,7 @@ logs
 
 # Vite development
 .vite-port
+
+# IntelliJ and Qodo plugin folders
+.idea/
+.qodo/

.gitignore

@@ -68,3 +68,7 @@ assets/docs/**
 
 # Include .env file for telemetry
 !.env
+
+# Ignore IntelliJ and Qodo plugin folders
+.idea/**
+.qodo/**

.vscodeignore

@@ -1,5 +1,15 @@
 # Roo Code Changelog
 
+## [3.17.2] - 2025-05-15
+
+- Revert "Switch to the new Roo message parser" (appears to cause a tool parsing bug)
+- Lock the versions of vsce and ovsx
+
+## [3.17.1] - 2025-05-15
+
+- Fix the display of the command to execute during approval
+- Fix incorrect reserved tokens calculation on OpenRouter (thanks @daniel-lxs!)
+
 ## [3.17.0] - 2025-05-14
 
 - Enable Gemini implicit caching

CHANGELOG.md

@@ -34,10 +34,17 @@ const copyWasmFiles = {
 
 			// tiktoken WASM file
 			fs.copyFileSync(
-				path.join(nodeModulesDir, "tiktoken", "tiktoken_bg.wasm"),
+				path.join(nodeModulesDir, "tiktoken", "lite", "tiktoken_bg.wasm"),
 				path.join(distDir, "tiktoken_bg.wasm"),
 			)
 
+			// Also copy to the workers directory
+			fs.mkdirSync(path.join(distDir, "workers"), { recursive: true })
+			fs.copyFileSync(
+				path.join(nodeModulesDir, "tiktoken", "lite", "tiktoken_bg.wasm"),
+				path.join(distDir, "workers", "tiktoken_bg.wasm"),
+			)
+
 			// Main tree-sitter WASM file
 			fs.copyFileSync(
 				path.join(nodeModulesDir, "web-tree-sitter", "tree-sitter.wasm"),

esbuild.js

@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.17.0",
+	"version": "3.17.2",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",
@@ -342,7 +342,7 @@
 		"test:extension-esm": "vitest run",
 		"test:webview": "cd webview-ui && npm run test",
 		"prepare": "husky",
-		"publish:marketplace": "vsce publish && ovsx publish",
+		"publish:marketplace": "npx vsce publish && npx ovsx publish",
 		"publish": "npm run build && changeset publish && npm install --package-lock-only",
 		"version-packages": "changeset version && npm install --package-lock-only",
 		"vscode:prepublish": "npm run package",
@@ -442,7 +442,7 @@
 		"@typescript-eslint/eslint-plugin": "^7.14.1",
 		"@typescript-eslint/parser": "^7.11.0",
 		"@vscode/test-electron": "^2.5.2",
-		"@vscode/vsce": "^3.3.2",
+		"@vscode/vsce": "3.3.2",
 		"esbuild": "^0.25.0",
 		"eslint": "^8.57.0",
 		"execa": "^9.5.2",
@@ -455,6 +455,7 @@
 		"mkdirp": "^3.0.1",
 		"nock": "^14.0.4",
 		"npm-run-all2": "^8.0.1",
+		"ovsx": "0.10.2",
 		"prettier": "^3.4.2",
 		"rimraf": "^6.0.1",
 		"ts-jest": "^29.2.5",

package-lock.json

@@ -1,3 +1,2 @@
 export { type AssistantMessageContent, parseAssistantMessage } from "./parseAssistantMessage"
 export { presentAssistantMessage } from "./presentAssistantMessage"
-export { parseAssistantMessageV2 } from "./parseAssistantMessageV2"