From 4b604f389ee68e0ff7d4b85c5343b4e8d69d41ab Mon Sep 17 00:00:00 2001
From: Matt Kane <m@mk.gg>
Date: Tue, 15 Apr 2025 14:44:55 +0100
Subject: [PATCH] fix: improve autocomplete for session keys

---
 .changeset/young-peaches-serve.md  | 5 +++++
 packages/astro/src/core/session.ts | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/young-peaches-serve.md

diff --git a/.changeset/young-peaches-serve.md b/.changeset/young-peaches-serve.md
new file mode 100644
index 000000000000..2050dba6a0dd
--- /dev/null
+++ b/.changeset/young-peaches-serve.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Improve autocomplete for session keys
diff --git a/packages/astro/src/core/session.ts b/packages/astro/src/core/session.ts
index da1d6b5a6e84..e9d21c6ce7f3 100644
--- a/packages/astro/src/core/session.ts
+++ b/packages/astro/src/core/session.ts
@@ -102,7 +102,7 @@ export class AstroSession<TDriver extends SessionDriverName = any> {
 	/**
 	 * Gets a session value. Returns `undefined` if the session or value does not exist.
 	 */
-	async get<T = void, K extends string = string>(
+	async get<T = void, K extends string = keyof App.SessionData | (string & {}) >(
 		key: K,
 	): Promise<
 		(T extends void ? (K extends keyof App.SessionData ? App.SessionData[K] : any) : T) | undefined
@@ -153,7 +153,7 @@ export class AstroSession<TDriver extends SessionDriverName = any> {
 	 * Sets a session value. The session is created if it does not exist.
 	 */
 
-	set<T = void, K extends string = string>(
+	set<T = void, K extends string = keyof App.SessionData | (string & {})>(
 		key: K,
 		value: T extends void
 			? K extends keyof App.SessionData