Merge remote-tracking branch 'origin/main' into feature/2122-editor-focus

# Conflicts:
#	src/exports/roo-code.d.ts
#	src/exports/types.ts
#	src/integrations/editor/DiffViewProvider.ts
#	src/schemas/index.ts
#	src/shared/WebviewMessage.ts

Author: felixAnhalt

.changeset/twelve-ants-scream.md

@@ -0,0 +1,5 @@
+---
+"roo-cline": patch
+---
+
+Requesty: Fix token usage counts

.gitignore

@@ -4,6 +4,7 @@ out
 out-*
 node_modules
 coverage/
+mock/
 
 .DS_Store
 

CHANGELOG.md

@@ -1,8 +1,15 @@
 # Roo Code Changelog
 
+## [3.16.6] - 2025-05-12
+
+- Restore "Improve provider profile management in the external API"
+- Fix to subtask sequencing (thanks @wkordalski!)
+- Fix webview terminal output processing error (thanks @KJ7LNW!)
+- Fix textarea empty string fallback logic (thanks @elianiva!)
+
 ## [3.16.5] - 2025-05-10
 
-- Revert profile management changes until we track down a bug with defaults
+- Revert "Improve provider profile management in the external API" until we track down a bug with defaults
 
 ## [3.16.4] - 2025-05-09
 

CONTRIBUTING.md

@@ -16,6 +16,6 @@
 		"@vscode/test-cli": "^0.0.10",
 		"@vscode/test-electron": "^2.4.0",
 		"mocha": "^11.1.0",
-		"typescript": "^5.4.5"
+		"typescript": "5.8.3"
 	}
 }

e2e/package-lock.json

@@ -31,8 +31,8 @@
 		"clsx": "^2.1.1",
 		"cmdk": "^1.1.0",
 		"fuzzysort": "^3.1.0",
-		"lucide-react": "^0.479.0",
-		"next": "15.2.2",
+		"lucide-react": "^0.510.0",
+		"next": "15.3.2",
 		"next-themes": "^0.4.6",
 		"p-map": "^7.0.3",
 		"ps-tree": "^1.2.0",

e2e/package.json

@@ -16,7 +16,6 @@
 		"eslint-plugin-react-hooks": "^5.2.0",
 		"eslint-plugin-turbo": "^2.4.4",
 		"globals": "^16.0.0",
-		"typescript": "^5",
 		"typescript-eslint": "^8.26.0"
 	}
 }

evals/apps/web/package.json

@@ -20,7 +20,7 @@
 		"prettier": "^3.5.3",
 		"tsx": "^4.19.4",
 		"turbo": "^2.5.2",
-		"typescript": "^5.8.3",
+		"typescript": "5.8.3",
 		"typescript-eslint": "^8.31.1"
 	}
 }

evals/config/eslint/package.json

@@ -22,7 +22,7 @@
 	"dependencies": {
 		"@evals/types": "workspace:^",
 		"@libsql/client": "^0.15.0",
-		"drizzle-orm": "^0.40.0",
+		"drizzle-orm": "^0.43.0",
 		"drizzle-zod": "^0.7.0",
 		"p-map": "^7.0.3",
 		"zod": "^3.24.2"