diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0190783b5f..931e2f17f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,57 @@
 # Changelog
 
+## 3.1.6 (2025-12-06)
+
+### Features
+
+- feat(vscode): add settings to enable per-block formatting (#5784) - Thanks to @serkodev!
+- feat(language-service): enhanced component auto import (#5790)
+- feat(component-meta): add component name and description fields (#5797)
+- feat(typescript-plugin): add support for template "Add Import" quick fix (#5799) - Thanks to @serkodev!
+- feat(typescript-plugin): mapping JSDoc informations from `<script setup>` (#5805)
+- feat(vscode): support tsdk path for Eclipse Theia (#5806) - Thanks to @serkodev!
+
+### Bug Fixes
+
+- fix(language-service): ignore intrinsic elements when detect tag name casing (#5771)
+- fix(language-core): `createParsedCommandLineByJson` parsed incorrect options since v3.1.5 (https://github.com/vuejs/language-tools/pull/5768#issuecomment-3569623037)
+- fix(vscode): make `vue.server.path` compatible with Windows (#5772)
+- fix(vscode): analyze interpolation highlight ranges based on AST (#5777)
+- fix(vscode): sync latest vscode html language configuration (#5740)
+- fix(language-core): enhance `getVIfNode` to support `v-else-if` directives (#5765) - Thanks to @serkodev!
+- fix(language-core): generate `{}` instead of its string value for `style="..."` (#5781) - Thanks to @KazariEX!
+- fix(language-core): `v-bind="$attrs"` loses navigation when `inferTemplateDollarAttrs` is disabled (#5783)
+- fix(language-service): skip `const props =` completion in StringLiteral (#5786)
+- fix(language-core): unable to get completion for the second scoped class name
+- fix(language-service): format components with HTML void-element names (#5788) - Thanks to @serkodev!
+- fix(language-service): properly handle promise when resolving CSS links (#5785)
+- fix(language-core): infer `$el` type for generic components using `inferComponentDollarEl` (#5794)
+- fix(language-core): ensure `<script>` content generates before `<script setup>` (#5795)
+- fix(language-core): remove `bypassDefineComponent` hack for better JS support (#4876) (#5379)
+- fix(language-core): `Prettify<T>` caused generic props gets inferred as `unknown`  (#5667) - Thanks to @so1ve!
+- fix(vscode): handle leading `<` as operator in SFC scripts (#5801) - Thanks to @serkodev!
+- fix(vscode): patch `isTypeScriptDocument` in VSCode for `typescript.preferences.autoImportSpecifierExcludeRegexes` config support (#5364)
+- fix(language-core): ensure type consistency for optional boolean props (#5803)
+- fix(language-core): add compatibility for `vapor` attr (#5496)
+- fix(language-core): AST fault tolerance for key binding on template (#5807)
+
+### Performance
+
+- perf(language-core): reuse ts asts for `:class` - Thanks to @KazariEX!
+
+### Other Changes
+
+- Revert "refactor(typescript-plugin): remove go to definition trick for auto imported components (#5733)"
+- docs(typescript-plugin): update Neovim configuration link (#5775) - Thanks to @AlexVagrant!
+- refactor(language-core): normalize template AST (#5782)
+- refactor(language-core): split style codegen (#5787)
+- refactor(language-core): remove `debugger` from virtual code for tsslint compatibility
+- refactor(language-core): remove legacy navigation support in `ref="xxx"`
+- refactor(language-core): reduce codegen options (#5804)
+- refactor(component-meta): deprecated `rawType` and `__internal__.tsLs` (#5808)
+- chore: update volar to 2.4.26
+  - feat: fallback resolution mode for `createResolveModuleName` (https://github.com/volarjs/volar.js/pull/293) (#5644) - Thanks to @serkodev!
+
 ## 3.1.5 (2025-11-23)
 
 ### Features
diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json
index 5081be2817..7a93e6323f 100644
--- a/extensions/vscode/package.json
+++ b/extensions/vscode/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "volar",
-	"version": "3.1.5",
+	"version": "3.1.6",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",
@@ -487,9 +487,9 @@
 		"@volar/vscode": "2.4.26",
 		"@vscode/vsce": "^3.2.1",
 		"@vue/compiler-sfc": "^3.5.0",
-		"@vue/language-core": "3.1.5",
-		"@vue/language-server": "3.1.5",
-		"@vue/typescript-plugin": "3.1.5",
+		"@vue/language-core": "3.1.6",
+		"@vue/language-server": "3.1.6",
+		"@vue/typescript-plugin": "3.1.6",
 		"laplacenoma": "^0.0.3",
 		"reactive-vscode": "^0.2.9",
 		"rolldown": "1.0.0-beta.8",
diff --git a/lerna.json b/lerna.json
index 6e0fba6fa4..0fa8b6be8b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -13,6 +13,6 @@
 		"packages/**",
 		"test-workspace"
 	],
-	"version": "3.1.5",
+	"version": "3.1.6",
 	"yes": true
 }
diff --git a/packages/component-meta/package.json b/packages/component-meta/package.json
index 666e4a1b1d..5a7acb38c9 100644
--- a/packages/component-meta/package.json
+++ b/packages/component-meta/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-meta",
-	"version": "3.1.5",
+	"version": "3.1.6",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -14,9 +14,9 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "2.4.26",
-		"@vue/language-core": "3.1.5",
+		"@vue/language-core": "3.1.6",
 		"path-browserify": "^1.0.1",
-		"vue-component-type-helpers": "3.1.5"
+		"vue-component-type-helpers": "3.1.6"
 	},
 	"peerDependencies": {
 		"typescript": "*"
diff --git a/packages/component-type-helpers/package.json b/packages/component-type-helpers/package.json
index a1c714e021..922c000958 100644
--- a/packages/component-type-helpers/package.json
+++ b/packages/component-type-helpers/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vue-component-type-helpers",
-	"version": "3.1.5",
+	"version": "3.1.6",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
diff --git a/packages/language-core/package.json b/packages/language-core/package.json
index e370fcff27..16c4a81835 100644
--- a/packages/language-core/package.json
+++ b/packages/language-core/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "3.1.5",
+	"version": "3.1.6",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
diff --git a/packages/language-plugin-pug/package.json b/packages/language-plugin-pug/package.json
index 2f994dd3dc..6b463d8059 100644
--- a/packages/language-plugin-pug/package.json
+++ b/packages/language-plugin-pug/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-plugin-pug",
-	"version": "3.1.5",
+	"version": "3.1.6",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -19,6 +19,6 @@
 	"devDependencies": {
 		"@types/node": "^22.10.4",
 		"@vue/compiler-dom": "^3.5.0",
-		"@vue/language-core": "3.1.5"
+		"@vue/language-core": "3.1.6"
 	}
 }
diff --git a/packages/language-server/package.json b/packages/language-server/package.json
index 35f180c47e..1ad7da7929 100644
--- a/packages/language-server/package.json
+++ b/packages/language-server/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-server",
-	"version": "3.1.5",
+	"version": "3.1.6",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -17,9 +17,9 @@
 	},
 	"dependencies": {
 		"@volar/language-server": "2.4.26",
-		"@vue/language-core": "3.1.5",
-		"@vue/language-service": "3.1.5",
-		"@vue/typescript-plugin": "3.1.5",
+		"@vue/language-core": "3.1.6",
+		"@vue/language-service": "3.1.6",
+		"@vue/typescript-plugin": "3.1.6",
 		"vscode-uri": "^3.0.8"
 	},
 	"peerDependencies": {
diff --git a/packages/language-service/package.json b/packages/language-service/package.json
index a9903c250d..8cbb150ad8 100644
--- a/packages/language-service/package.json
+++ b/packages/language-service/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-service",
-	"version": "3.1.5",
+	"version": "3.1.6",
 	"license": "MIT",
 	"files": [
 		"data",
@@ -18,7 +18,7 @@
 	},
 	"dependencies": {
 		"@volar/language-service": "2.4.26",
-		"@vue/language-core": "3.1.5",
+		"@vue/language-core": "3.1.6",
 		"@vue/shared": "^3.5.0",
 		"path-browserify": "^1.0.1",
 		"volar-service-css": "0.0.67",
@@ -37,7 +37,7 @@
 		"@volar/kit": "2.4.26",
 		"@volar/typescript": "2.4.26",
 		"@vue/compiler-dom": "^3.5.0",
-		"@vue/typescript-plugin": "3.1.5",
+		"@vue/typescript-plugin": "3.1.6",
 		"vscode-css-languageservice": "^6.3.1"
 	}
 }
diff --git a/packages/tsc/package.json b/packages/tsc/package.json
index dcd0b57b40..87ba7f85c8 100644
--- a/packages/tsc/package.json
+++ b/packages/tsc/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vue-tsc",
-	"version": "3.1.5",
+	"version": "3.1.6",
 	"license": "MIT",
 	"files": [
 		"bin",
@@ -21,7 +21,7 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "2.4.26",
-		"@vue/language-core": "3.1.5"
+		"@vue/language-core": "3.1.6"
 	},
 	"devDependencies": {
 		"@types/node": "^22.10.4"
diff --git a/packages/typescript-plugin/package.json b/packages/typescript-plugin/package.json
index 71e447ebd2..7b24b5b929 100644
--- a/packages/typescript-plugin/package.json
+++ b/packages/typescript-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "3.1.5",
+	"version": "3.1.6",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -14,7 +14,7 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "2.4.26",
-		"@vue/language-core": "3.1.5",
+		"@vue/language-core": "3.1.6",
 		"@vue/shared": "^3.5.0",
 		"path-browserify": "^1.0.1"
 	},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c1e7a3803a..829ad654bb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -60,13 +60,13 @@ importers:
         specifier: ^3.5.0
         version: 3.5.13
       '@vue/language-core':
-        specifier: 3.1.5
+        specifier: 3.1.6
         version: link:../../packages/language-core
       '@vue/language-server':
-        specifier: 3.1.5
+        specifier: 3.1.6
         version: link:../../packages/language-server
       '@vue/typescript-plugin':
-        specifier: 3.1.5
+        specifier: 3.1.6
         version: link:../../packages/typescript-plugin
       laplacenoma:
         specifier: ^0.0.3
@@ -93,7 +93,7 @@ importers:
         specifier: 2.4.26
         version: 2.4.26
       '@vue/language-core':
-        specifier: 3.1.5
+        specifier: 3.1.6
         version: link:../language-core
       path-browserify:
         specifier: ^1.0.1
@@ -102,7 +102,7 @@ importers:
         specifier: '*'
         version: 5.9.3
       vue-component-type-helpers:
-        specifier: 3.1.5
+        specifier: 3.1.6
         version: link:../component-type-helpers
     devDependencies:
       '@types/node':
@@ -173,7 +173,7 @@ importers:
         specifier: ^3.5.0
         version: 3.5.13
       '@vue/language-core':
-        specifier: 3.1.5
+        specifier: 3.1.6
         version: link:../language-core
 
   packages/language-server:
@@ -182,13 +182,13 @@ importers:
         specifier: 2.4.26
         version: 2.4.26
       '@vue/language-core':
-        specifier: 3.1.5
+        specifier: 3.1.6
         version: link:../language-core
       '@vue/language-service':
-        specifier: 3.1.5
+        specifier: 3.1.6
         version: link:../language-service
       '@vue/typescript-plugin':
-        specifier: 3.1.5
+        specifier: 3.1.6
         version: link:../typescript-plugin
       typescript:
         specifier: '*'
@@ -210,7 +210,7 @@ importers:
         specifier: 2.4.26
         version: 2.4.26
       '@vue/language-core':
-        specifier: 3.1.5
+        specifier: 3.1.6
         version: link:../language-core
       '@vue/shared':
         specifier: ^3.5.0
@@ -262,7 +262,7 @@ importers:
         specifier: ^3.5.0
         version: 3.5.13
       '@vue/typescript-plugin':
-        specifier: 3.1.5
+        specifier: 3.1.6
         version: link:../typescript-plugin
       vscode-css-languageservice:
         specifier: ^6.3.1
@@ -274,7 +274,7 @@ importers:
         specifier: 2.4.26
         version: 2.4.26
       '@vue/language-core':
-        specifier: 3.1.5
+        specifier: 3.1.6
         version: link:../language-core
       typescript:
         specifier: '>=5.0.0'
@@ -290,7 +290,7 @@ importers:
         specifier: 2.4.26
         version: 2.4.26
       '@vue/language-core':
-        specifier: 3.1.5
+        specifier: 3.1.6
         version: link:../language-core
       '@vue/shared':
         specifier: ^3.5.0
@@ -315,10 +315,10 @@ importers:
         specifier: https://pkg.pr.new/vue@e1bc0eb02e22bc0c236e1471c11d96a368764b72
         version: https://pkg.pr.new/vue@e1bc0eb02e22bc0c236e1471c11d96a368764b72(typescript@5.9.3)
       vue-component-meta:
-        specifier: 3.1.5
+        specifier: 3.1.6
         version: link:../packages/component-meta
       vue-component-type-helpers:
-        specifier: 3.1.5
+        specifier: 3.1.6
         version: link:../packages/component-type-helpers
       vue3.4:
         specifier: npm:vue@3.4.38
diff --git a/test-workspace/package.json b/test-workspace/package.json
index 8ecb0eaf0b..b0ecca252d 100644
--- a/test-workspace/package.json
+++ b/test-workspace/package.json
@@ -1,11 +1,11 @@
 {
 	"private": true,
-	"version": "3.1.5",
+	"version": "3.1.6",
 	"devDependencies": {
 		"typescript": "latest",
 		"vue": "https://pkg.pr.new/vue@e1bc0eb02e22bc0c236e1471c11d96a368764b72",
-		"vue-component-meta": "3.1.5",
-		"vue-component-type-helpers": "3.1.5",
+		"vue-component-meta": "3.1.6",
+		"vue-component-type-helpers": "3.1.6",
 		"vue3.4": "npm:vue@3.4.38"
 	}
 }