diff --git a/.changeset/cuddly-trains-pay.md b/.changeset/cuddly-trains-pay.md
deleted file mode 100644
index 6da84cede4a8..000000000000
--- a/.changeset/cuddly-trains-pay.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro-vscode': patch
----
-
-Fixes failed publish for 2.16.11.
diff --git a/.changeset/dirty-eggs-repeat.md b/.changeset/dirty-eggs-repeat.md
deleted file mode 100644
index 0bb1ea7d2085..000000000000
--- a/.changeset/dirty-eggs-repeat.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/rss': patch
----
-
-Pin `fast-xml-parser` to 5.4.1 in order to fix an upstream bug
diff --git a/.changeset/green-dingos-care.md b/.changeset/green-dingos-care.md
deleted file mode 100644
index 3060c2383689..000000000000
--- a/.changeset/green-dingos-care.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fixes `astro add` so the tsconfig preview shows the actual pending changes before confirmation
diff --git a/examples/basics/package.json b/examples/basics/package.json
index 9b06d0afd344..b6bf74d5f2e5 100644
--- a/examples/basics/package.json
+++ b/examples/basics/package.json
@@ -13,6 +13,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^6.0.0"
+    "astro": "^6.0.2"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index ba388621def7..8806e1e75b25 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -14,9 +14,9 @@
   },
   "dependencies": {
     "@astrojs/mdx": "^5.0.0",
-    "@astrojs/rss": "^4.0.16",
+    "@astrojs/rss": "^4.0.17",
     "@astrojs/sitemap": "^3.7.1",
-    "astro": "^6.0.0",
+    "astro": "^6.0.2",
     "sharp": "^0.34.3"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
index 2b5f83c9ecdf..e1ce8b9b15b6 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^6.0.0"
+    "astro": "^6.0.2"
   },
   "peerDependencies": {
     "astro": "^5.0.0 || ^6.0.0"
diff --git a/examples/container-with-vitest/package.json b/examples/container-with-vitest/package.json
index d034c12a6d31..358f65c35a53 100644
--- a/examples/container-with-vitest/package.json
+++ b/examples/container-with-vitest/package.json
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@astrojs/react": "^5.0.0",
-    "astro": "^6.0.0",
+    "astro": "^6.0.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "vitest": "^3.2.4"
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
index 2259d1ad4d2a..5199ee48b5d4 100644
--- a/examples/framework-alpine/package.json
+++ b/examples/framework-alpine/package.json
@@ -16,6 +16,6 @@
     "@astrojs/alpinejs": "^0.5.0",
     "@types/alpinejs": "^3.13.11",
     "alpinejs": "^3.15.8",
-    "astro": "^6.0.0"
+    "astro": "^6.0.2"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index f2640e721d38..b674b9a9bd23 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -20,7 +20,7 @@
     "@astrojs/vue": "^6.0.0",
     "@types/react": "^18.3.28",
     "@types/react-dom": "^18.3.7",
-    "astro": "^6.0.0",
+    "astro": "^6.0.2",
     "preact": "^10.28.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index 6017c7b1266f..4ce0e3d434d1 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "@astrojs/preact": "^5.0.0",
     "@preact/signals": "^2.8.1",
-    "astro": "^6.0.0",
+    "astro": "^6.0.2",
     "preact": "^10.28.4"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index 8a68466be5e7..6f350bb02c68 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -16,7 +16,7 @@
     "@astrojs/react": "^5.0.0",
     "@types/react": "^18.3.28",
     "@types/react-dom": "^18.3.7",
-    "astro": "^6.0.0",
+    "astro": "^6.0.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index 3e6bade94bd8..f4ecb35cab3f 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^6.0.0",
-    "astro": "^6.0.0",
+    "astro": "^6.0.2",
     "solid-js": "^1.9.11"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index 61c3ad8c3dc0..9c79cbe0f380 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^8.0.0",
-    "astro": "^6.0.0",
+    "astro": "^6.0.2",
     "svelte": "^5.53.5"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index b7fd22b5dc3d..e3495a184d1a 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^6.0.0",
-    "astro": "^6.0.0",
+    "astro": "^6.0.2",
     "vue": "^3.5.29"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
index c57dd84eabec..8d1fcdf42605 100644
--- a/examples/hackernews/package.json
+++ b/examples/hackernews/package.json
@@ -14,6 +14,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^10.0.0",
-    "astro": "^6.0.0"
+    "astro": "^6.0.2"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
index ab5245c39b26..07d651529af5 100644
--- a/examples/integration/package.json
+++ b/examples/integration/package.json
@@ -18,7 +18,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^6.0.0"
+    "astro": "^6.0.2"
   },
   "peerDependencies": {
     "astro": "^4.0.0"
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index 8e4a4f4b4fb9..346a09693be0 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -13,6 +13,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^6.0.0"
+    "astro": "^6.0.2"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index 9087f02c5d13..bd31884b5b13 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -13,6 +13,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^6.0.0"
+    "astro": "^6.0.2"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
index 909d72081be9..f1526e701667 100644
--- a/examples/ssr/package.json
+++ b/examples/ssr/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "@astrojs/node": "^10.0.0",
     "@astrojs/svelte": "^8.0.0",
-    "astro": "^6.0.0",
+    "astro": "^6.0.2",
     "svelte": "^5.53.5"
   }
 }
diff --git a/examples/starlog/package.json b/examples/starlog/package.json
index e6306b370630..ae999b119354 100644
--- a/examples/starlog/package.json
+++ b/examples/starlog/package.json
@@ -9,7 +9,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^6.0.0",
+    "astro": "^6.0.2",
     "sass": "^1.97.3",
     "sharp": "^0.34.3"
   },
diff --git a/examples/toolbar-app/package.json b/examples/toolbar-app/package.json
index 85c03a14591d..7fccf9e806f7 100644
--- a/examples/toolbar-app/package.json
+++ b/examples/toolbar-app/package.json
@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@types/node": "^18.17.8",
-    "astro": "^6.0.0"
+    "astro": "^6.0.2"
   },
   "engines": {
     "node": ">=22.12.0"
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
index 7bbb2b570ea3..c63782127b76 100644
--- a/examples/with-markdoc/package.json
+++ b/examples/with-markdoc/package.json
@@ -14,6 +14,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^1.0.0",
-    "astro": "^6.0.0"
+    "astro": "^6.0.2"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
index 311a3492df8b..9f06ce842d2f 100644
--- a/examples/with-mdx/package.json
+++ b/examples/with-mdx/package.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "@astrojs/mdx": "^5.0.0",
     "@astrojs/preact": "^5.0.0",
-    "astro": "^6.0.0",
+    "astro": "^6.0.2",
     "preact": "^10.28.4"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index 0e5eb98a57a1..eb9a3e6ebb06 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "@astrojs/preact": "^5.0.0",
     "@nanostores/preact": "^1.0.0",
-    "astro": "^6.0.0",
+    "astro": "^6.0.2",
     "nanostores": "^1.1.1",
     "preact": "^10.28.4"
   }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index 5307b7c1fcbd..67ddcbe22089 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -16,7 +16,7 @@
     "@astrojs/mdx": "^5.0.0",
     "@tailwindcss/vite": "^4.2.1",
     "@types/canvas-confetti": "^1.9.0",
-    "astro": "^6.0.0",
+    "astro": "^6.0.2",
     "canvas-confetti": "^1.9.4",
     "tailwindcss": "^4.2.1"
   }
diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
index 893487e953d1..e994b30e5367 100644
--- a/examples/with-vitest/package.json
+++ b/examples/with-vitest/package.json
@@ -14,7 +14,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^6.0.0",
+    "astro": "^6.0.2",
     "vitest": "^3.2.4"
   }
 }
diff --git a/packages/astro-rss/CHANGELOG.md b/packages/astro-rss/CHANGELOG.md
index 64901c164d68..a3f66305980c 100644
--- a/packages/astro-rss/CHANGELOG.md
+++ b/packages/astro-rss/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/rss
 
+## 4.0.17
+
+### Patch Changes
+
+- [#15830](https://github.com/withastro/astro/pull/15830) [`8d3f3aa`](https://github.com/withastro/astro/commit/8d3f3aa1fdefebc22bb45de26591d3ec3d6da580) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Pin `fast-xml-parser` to 5.4.1 in order to fix an upstream bug
+
 ## 4.0.16
 
 ### Patch Changes
diff --git a/packages/astro-rss/package.json b/packages/astro-rss/package.json
index 19c791c246eb..61d90bf25c62 100644
--- a/packages/astro-rss/package.json
+++ b/packages/astro-rss/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/rss",
   "description": "Add RSS feeds to your Astro projects",
-  "version": "4.0.16",
+  "version": "4.0.17",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 2eb244df718d..029d084542d1 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,17 @@
 # astro
 
+## 6.0.2
+
+### Patch Changes
+
+- [#15832](https://github.com/withastro/astro/pull/15832) [`95e12a2`](https://github.com/withastro/astro/commit/95e12a250ece206f55f8c0c07c9c05489f3df93f) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fixes `return;` syntax not working in the frontmatter correctly in certain contexts
+
+## 6.0.1
+
+### Patch Changes
+
+- [#15827](https://github.com/withastro/astro/pull/15827) [`a4c0d0b`](https://github.com/withastro/astro/commit/a4c0d0b4df540b23fa85bf926f9cc97470737fa1) Thanks [@matthewp](https://github.com/matthewp)! - Fixes `astro add` so the tsconfig preview shows the actual pending changes before confirmation
+
 ## 6.0.0
 
 ### Major Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 8ed5106915c6..787d31d56b0d 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
diff --git a/packages/astro/src/vite-plugin-astro/compile.ts b/packages/astro/src/vite-plugin-astro/compile.ts
index 0d8b000b29d6..ebd7760d4048 100644
--- a/packages/astro/src/vite-plugin-astro/compile.ts
+++ b/packages/astro/src/vite-plugin-astro/compile.ts
@@ -110,7 +110,9 @@ async function enhanceCompileError({
 	const scannedFrontmatter = frontmatterRE.exec(source);
 	if (scannedFrontmatter) {
 		// Top-level return is not supported, so replace `return` with throw
-		const frontmatter = scannedFrontmatter[1].replace(/\breturn\b/g, 'throw');
+		const frontmatter = scannedFrontmatter[1]
+			.replace(/\breturn\s*;/g, 'throw 0;')
+			.replace(/\breturn\b/g, 'throw ');
 
 		// If frontmatter does not actually include the offending line, skip
 		if (lineText && !frontmatter.includes(lineText)) throw err;
diff --git a/packages/integrations/cloudflare/CHANGELOG.md b/packages/integrations/cloudflare/CHANGELOG.md
index 41bee451ec8a..858236ea3a24 100644
--- a/packages/integrations/cloudflare/CHANGELOG.md
+++ b/packages/integrations/cloudflare/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @astrojs/cloudflare
 
+## 13.0.2
+
+### Patch Changes
+
+- [#15832](https://github.com/withastro/astro/pull/15832) [`95e12a2`](https://github.com/withastro/astro/commit/95e12a250ece206f55f8c0c07c9c05489f3df93f) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fixes `return;` syntax not working in the frontmatter correctly in certain contexts
+
+- [#15803](https://github.com/withastro/astro/pull/15803) [`e42b015`](https://github.com/withastro/astro/commit/e42b015916b7f46a80676628f6d7c95279baf55a) Thanks [@merlinnot](https://github.com/merlinnot)! - Fixes the Cloudflare adapter adding a `SESSION` KV binding even when sessions are explicitly configured to use a different driver, such as `unstorage/drivers/null`.
+
+- Updated dependencies []:
+  - @astrojs/underscore-redirects@1.0.1
+
 ## 13.0.1
 
 ### Patch Changes
diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json
index 4dfb96a1d4d5..2d4f1d966012 100644
--- a/packages/integrations/cloudflare/package.json
+++ b/packages/integrations/cloudflare/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers",
-  "version": "13.0.1",
+  "version": "13.0.2",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/integrations/cloudflare/src/esbuild-plugin-astro-frontmatter.ts b/packages/integrations/cloudflare/src/esbuild-plugin-astro-frontmatter.ts
index 44fbc3739d20..db8d117637ff 100644
--- a/packages/integrations/cloudflare/src/esbuild-plugin-astro-frontmatter.ts
+++ b/packages/integrations/cloudflare/src/esbuild-plugin-astro-frontmatter.ts
@@ -30,7 +30,9 @@ export function astroFrontmatterScanPlugin(): ESBuildPlugin {
 						//
 						// Known Limitation: Using regex /\breturn\b/ will incorrectly match
 						// identifiers like `$return` or aliases like `import { return as ret }`.
-						const contents = frontmatterMatch[1].replace(/\breturn\b/g, 'throw ');
+						const contents = frontmatterMatch[1]
+							.replace(/\breturn\s*;/g, 'throw 0;')
+							.replace(/\breturn\b/g, 'throw ');
 
 						return {
 							contents,
diff --git a/packages/integrations/cloudflare/src/index.ts b/packages/integrations/cloudflare/src/index.ts
index abd80abe0d2b..013db549d128 100644
--- a/packages/integrations/cloudflare/src/index.ts
+++ b/packages/integrations/cloudflare/src/index.ts
@@ -23,6 +23,28 @@ import { sessionDrivers } from 'astro/config';
 import { createCloudflarePrerenderer } from './prerenderer.js';
 import { createRequire } from 'node:module';
 
+const CLOUDFLARE_KV_SESSION_DRIVER_ENTRYPOINT = sessionDrivers.cloudflareKVBinding().entrypoint;
+
+function usesCloudflareKVSessionDriver(session: AstroConfig['session']): boolean {
+	const driver = session?.driver;
+
+	if (!driver) {
+		return false;
+	}
+
+	if (typeof driver === 'string') {
+		return driver === 'cloudflareKVBinding' || driver === 'cloudflare-kv-binding';
+	}
+
+	const entrypoint =
+		typeof driver.entrypoint === 'string' ? driver.entrypoint : driver.entrypoint.toString();
+
+	return (
+		entrypoint === CLOUDFLARE_KV_SESSION_DRIVER_ENTRYPOINT ||
+		entrypoint.endsWith('cloudflare-kv-binding')
+	);
+}
+
 export type { Runtime } from './utils/handler.js';
 
 export interface Options
@@ -111,6 +133,8 @@ export default function createIntegration({
 					};
 				}
 
+				const needsSessionKVBinding = usesCloudflareKVSessionDriver(session);
+
 				// In dev, `compile` needs the IMAGES binding for real transforms
 				// (the image-transform-endpoint uses it). At build time,
 				// `compile` uses Sharp on the Node side instead.
@@ -118,6 +142,7 @@ export default function createIntegration({
 
 				cfPluginConfig = {
 					config: cloudflareConfigCustomizer({
+						needsSessionKVBinding,
 						sessionKVBindingName,
 						imagesBindingName:
 							needsImagesBinding || needsImagesBindingForDev ? imagesBindingName : false,
diff --git a/packages/integrations/cloudflare/src/wrangler.ts b/packages/integrations/cloudflare/src/wrangler.ts
index 36898bf98d6c..96b1d6803fbc 100644
--- a/packages/integrations/cloudflare/src/wrangler.ts
+++ b/packages/integrations/cloudflare/src/wrangler.ts
@@ -6,6 +6,7 @@ export const DEFAULT_ASSETS_BINDING_NAME = 'ASSETS';
 
 interface CloudflareConfigOptions {
 	sessionKVBindingName: string | undefined;
+	needsSessionKVBinding?: boolean;
 	imagesBindingName: string | false | undefined;
 }
 
@@ -17,6 +18,7 @@ export function cloudflareConfigCustomizer(
 	options: CloudflareConfigOptions,
 ): PluginConfig['config'] {
 	const sessionKVBindingName = options?.sessionKVBindingName ?? DEFAULT_SESSION_KV_BINDING_NAME;
+	const needsSessionKVBinding = options?.needsSessionKVBinding ?? true;
 	const imagesBindingName =
 		options?.imagesBindingName === false
 			? undefined
@@ -31,13 +33,14 @@ export function cloudflareConfigCustomizer(
 
 		return {
 			main: config.main ?? '@astrojs/cloudflare/entrypoints/server',
-			kv_namespaces: hasSessionBinding
-				? undefined
-				: [
-						{
-							binding: sessionKVBindingName,
-						},
-					],
+			kv_namespaces:
+				!needsSessionKVBinding || hasSessionBinding
+					? undefined
+					: [
+							{
+								binding: sessionKVBindingName,
+							},
+						],
 			images:
 				hasImagesBinding || !imagesBindingName
 					? undefined
diff --git a/packages/integrations/cloudflare/test/fixtures/top-level-return/src/pages/index.astro b/packages/integrations/cloudflare/test/fixtures/top-level-return/src/pages/index.astro
index 171a79ab888c..2912fa3b1a16 100644
--- a/packages/integrations/cloudflare/test/fixtures/top-level-return/src/pages/index.astro
+++ b/packages/integrations/cloudflare/test/fixtures/top-level-return/src/pages/index.astro
@@ -13,6 +13,10 @@ if (guard()) {
   return Astro.redirect("/404")
 }
 
+// Bare return (no value) — must not produce invalid `throw ;` syntax during dep scanning
+const source = "hello";
+if (!source) return;
+
 ---
 
 <html>
diff --git a/packages/integrations/cloudflare/test/sessions.test.js b/packages/integrations/cloudflare/test/sessions.test.js
index b1df629d776a..cd2a3de04fcc 100644
--- a/packages/integrations/cloudflare/test/sessions.test.js
+++ b/packages/integrations/cloudflare/test/sessions.test.js
@@ -106,3 +106,42 @@ describe('sessions with custom binding name', () => {
 		);
 	});
 });
+
+describe('session wrangler config', () => {
+	it('does not include the SESSION KV binding when sessions are disabled', async () => {
+		const fixture = await loadFixture({
+			root: './fixtures/static/',
+		});
+
+		await fixture.build({
+			session: {
+				driver: {
+					entrypoint: 'unstorage/drivers/null',
+				},
+			},
+		});
+
+		const wrangler = JSON.parse(await fixture.readFile('/server/wrangler.json'));
+		assert.equal(
+			wrangler.kv_namespaces?.some(({ binding }) => binding === 'SESSION'),
+			false,
+		);
+	});
+
+	it('includes the SESSION KV binding when Cloudflare KV is configured explicitly', async () => {
+		const fixture = await loadFixture({
+			root: './fixtures/static/',
+		});
+
+		await fixture.build({
+			session: {
+				driver: {
+					entrypoint: 'unstorage/drivers/cloudflare-kv-binding',
+				},
+			},
+		});
+
+		const wrangler = JSON.parse(await fixture.readFile('/server/wrangler.json'));
+		assert.deepEqual(wrangler.kv_namespaces, [{ binding: 'SESSION' }]);
+	});
+});
diff --git a/packages/integrations/cloudflare/test/wrangler.test.js b/packages/integrations/cloudflare/test/wrangler.test.js
index b9d176f54d60..0304b2237a43 100644
--- a/packages/integrations/cloudflare/test/wrangler.test.js
+++ b/packages/integrations/cloudflare/test/wrangler.test.js
@@ -65,6 +65,13 @@ describe('cloudflareConfigCustomizer', () => {
 
 			assert.deepEqual(result.kv_namespaces, [{ binding: DEFAULT_SESSION_KV_BINDING_NAME }]);
 		});
+
+		it('does not add SESSION binding when session KV binding is disabled', () => {
+			const customizer = cloudflareConfigCustomizer({ needsSessionKVBinding: false });
+			const result = customizer({});
+
+			assert.equal(result.kv_namespaces, undefined);
+		});
 	});
 
 	describe('images binding', () => {
diff --git a/packages/language-tools/vscode/CHANGELOG.md b/packages/language-tools/vscode/CHANGELOG.md
index 79ba6b781628..4192d8b8dfc9 100644
--- a/packages/language-tools/vscode/CHANGELOG.md
+++ b/packages/language-tools/vscode/CHANGELOG.md
@@ -1,5 +1,11 @@
 # astro-vscode
 
+## 2.16.11
+
+### Patch Changes
+
+- [#15825](https://github.com/withastro/astro/pull/15825) [`2cfe935`](https://github.com/withastro/astro/commit/2cfe935db452fce91553784157e31c26bb3b2a05) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fixes failed publish for 2.16.11.
+
 ## 2.16.10
 
 ### Patch Changes
diff --git a/packages/language-tools/vscode/package.json b/packages/language-tools/vscode/package.json
index 04b48492381b..156e6ef95c98 100644
--- a/packages/language-tools/vscode/package.json
+++ b/packages/language-tools/vscode/package.json
@@ -24,7 +24,7 @@
     "color": "#17191E",
     "theme": "dark"
   },
-  "version": "2.16.10",
+  "version": "2.16.11",
   "author": "withastro",
   "license": "MIT",
   "publisher": "astro-build",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 545b83b7be96..25e6a71825d3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -189,7 +189,7 @@ importers:
   examples/basics:
     dependencies:
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
 
   examples/blog:
@@ -198,13 +198,13 @@ importers:
         specifier: ^5.0.0
         version: link:../../packages/integrations/mdx
       '@astrojs/rss':
-        specifier: ^4.0.16
+        specifier: ^4.0.17
         version: link:../../packages/astro-rss
       '@astrojs/sitemap':
         specifier: ^3.7.1
         version: link:../../packages/integrations/sitemap
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
       sharp:
         specifier: ^0.34.3
@@ -213,7 +213,7 @@ importers:
   examples/component:
     devDependencies:
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
 
   examples/container-with-vitest:
@@ -222,7 +222,7 @@ importers:
         specifier: ^5.0.0
         version: link:../../packages/integrations/react
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
       react:
         specifier: ^18.3.1
@@ -253,7 +253,7 @@ importers:
         specifier: ^3.15.8
         version: 3.15.8
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
 
   examples/framework-multiple:
@@ -280,7 +280,7 @@ importers:
         specifier: ^18.3.7
         version: 18.3.7(@types/react@18.3.28)
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
       preact:
         specifier: ^10.28.4
@@ -310,7 +310,7 @@ importers:
         specifier: ^2.8.1
         version: 2.8.1(preact@10.28.4)
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
       preact:
         specifier: ^10.28.4
@@ -328,7 +328,7 @@ importers:
         specifier: ^18.3.7
         version: 18.3.7(@types/react@18.3.28)
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
       react:
         specifier: ^18.3.1
@@ -343,7 +343,7 @@ importers:
         specifier: ^6.0.0
         version: link:../../packages/integrations/solid
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
       solid-js:
         specifier: ^1.9.11
@@ -355,7 +355,7 @@ importers:
         specifier: ^8.0.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
       svelte:
         specifier: ^5.53.5
@@ -367,7 +367,7 @@ importers:
         specifier: ^6.0.0
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
       vue:
         specifier: ^3.5.29
@@ -379,25 +379,25 @@ importers:
         specifier: ^10.0.0
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
 
   examples/integration:
     devDependencies:
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
 
   examples/minimal:
     dependencies:
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
 
   examples/portfolio:
     dependencies:
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
 
   examples/ssr:
@@ -409,7 +409,7 @@ importers:
         specifier: ^8.0.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
       svelte:
         specifier: ^5.53.5
@@ -418,7 +418,7 @@ importers:
   examples/starlog:
     dependencies:
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
       sass:
         specifier: ^1.97.3
@@ -433,7 +433,7 @@ importers:
         specifier: ^18.17.8
         version: 18.19.130
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
 
   examples/with-markdoc:
@@ -442,7 +442,7 @@ importers:
         specifier: ^1.0.0
         version: link:../../packages/integrations/markdoc
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
 
   examples/with-mdx:
@@ -454,7 +454,7 @@ importers:
         specifier: ^5.0.0
         version: link:../../packages/integrations/preact
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
       preact:
         specifier: ^10.28.4
@@ -469,7 +469,7 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0(nanostores@1.1.1)(preact@10.28.4)
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
       nanostores:
         specifier: ^1.1.1
@@ -490,7 +490,7 @@ importers:
         specifier: ^1.9.0
         version: 1.9.0
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
       canvas-confetti:
         specifier: ^1.9.4
@@ -502,7 +502,7 @@ importers:
   examples/with-vitest:
     dependencies:
       astro:
-        specifier: ^6.0.0
+        specifier: ^6.0.2
         version: link:../../packages/astro
       vitest:
         specifier: ^3.2.4