diff --git a/.changeset/blue-wasps-destroy.md b/.changeset/blue-wasps-destroy.md
deleted file mode 100644
index 2243752a7b..0000000000
--- a/.changeset/blue-wasps-destroy.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Remove the clsx / tailwind merge dependencies and replace with template literals
diff --git a/.changeset/friendly-flowers-drum.md b/.changeset/friendly-flowers-drum.md
deleted file mode 100644
index 1a8a4d50e5..0000000000
--- a/.changeset/friendly-flowers-drum.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Migrate fetchUserCreditsData to protobus
diff --git a/.changeset/nervous-clocks-grin.md b/.changeset/nervous-clocks-grin.md
deleted file mode 100644
index 2fa8b51e9c..0000000000
--- a/.changeset/nervous-clocks-grin.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-fix: Improve claude code error handling
diff --git a/.changeset/quick-moons-do.md b/.changeset/quick-moons-do.md
deleted file mode 100644
index d09d6fbe88..0000000000
--- a/.changeset/quick-moons-do.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Migrate authStateChanged to protobus
diff --git a/.changeset/strange-paws-relate.md b/.changeset/strange-paws-relate.md
deleted file mode 100644
index 4be1daec47..0000000000
--- a/.changeset/strange-paws-relate.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Add taskId as metadata to use from LiteLLM
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 378d5280bb..0ca4ff9b8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [3.17.16]
+
+-   Fix Claude Code provider error handling for incomplete messages during long-running tasks (Thanks @BarreiroT!)
+-   Add taskId as metadata to LiteLLM API requests for better request tracing (Thanks @jorgegarciarey!)
+
 ## [3.17.15]
 
 -   Fix LiteLLM provider to properly respect selected model IDs when switching between Plan and Act modes (Thanks @sammcj!)
diff --git a/package-lock.json b/package-lock.json
index f0cb90b3b2..bf4b69f28d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "claude-dev",
-	"version": "3.17.15",
+	"version": "3.17.16",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "claude-dev",
-			"version": "3.17.15",
+			"version": "3.17.16",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"@anthropic-ai/sdk": "^0.37.0",
diff --git a/package.json b/package.json
index 3359212bb7..e4581ee157 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"name": "claude-dev",
 	"displayName": "Cline",
 	"description": "Autonomous coding agent right in your IDE, capable of creating/editing files, running commands, using the browser, and more with your permission every step of the way.",
-	"version": "3.17.15",
+	"version": "3.17.16",
 	"icon": "assets/icons/icon.png",
 	"engines": {
 		"vscode": "^1.84.0"