diff --git a/packages/addons/lucia/index.ts b/packages/addons/lucia/index.ts
index d9791328..1c07842c 100644
--- a/packages/addons/lucia/index.ts
+++ b/packages/addons/lucia/index.ts
@@ -343,33 +343,66 @@ export default defineAddon({
 			return ms.toString();
 		});
 
-		if (typescript) {
-			sv.file('src/app.d.ts', (content) => {
-				const { ast, generateCode } = parseScript(content);
+		sv.file('src/app.d.ts', (content) => {
+			const { ast, generateCode } = parseScript(content);
 
-				const locals = js.kit.addGlobalAppInterface(ast, 'Locals');
-				if (!locals) {
-					throw new Error('Failed detecting `locals` interface in `src/app.d.ts`');
-				}
+			const locals = js.kit.addGlobalAppInterface(ast, 'Locals');
+			if (!locals) {
+				throw new Error('Failed detecting `locals` interface in `src/app.d.ts`');
+			}
 
-				const user = locals.body.body.find((prop) => js.common.hasTypeProp('user', prop));
-				const session = locals.body.body.find((prop) => js.common.hasTypeProp('session', prop));
+			const user = locals.body.body.find((prop) => js.common.hasTypeProp('user', prop));
+			const session = locals.body.body.find((prop) => js.common.hasTypeProp('session', prop));
 
-				if (!user) {
-					locals.body.body.push(createLuciaType('user'));
-				}
-				if (!session) {
-					locals.body.body.push(createLuciaType('session'));
-				}
-				return generateCode();
-			});
-		}
+			if (!user) {
+				locals.body.body.push(createLuciaType('user'));
+			}
+			if (!session) {
+				locals.body.body.push(createLuciaType('session'));
+			}
+			return generateCode();
+		});
 
 		sv.file(`src/hooks.server.${ext}`, (content) => {
-			const { ast, generateCode } = parseScript(content);
-			js.imports.addNamespace(ast, '$lib/server/auth.js', 'auth');
-			js.kit.addHooksHandle(ast, typescript, 'handleAuth', getAuthHandleContent());
-			return generateCode();
+			const ms = new MagicString(content);
+			ms.prepend("import * as auth from '$lib/server/auth.js'\n");
+
+			ms.append(
+				dedent`/** @type {import('@sveltejs/kit').Handle} */
+				const handleAuth = async ({ event, resolve }) => {
+					const sessionToken = event.cookies.get(auth.sessionCookieName);
+
+					if (!sessionToken) {
+						event.locals.user = null;
+						event.locals.session = null;
+						return resolve(event);
+					}
+
+					const { session, user } = await auth.validateSessionToken(sessionToken);
+
+					if (session) {
+						auth.setSessionTokenCookie(event, sessionToken, session.expiresAt);
+					} else {
+						auth.deleteSessionTokenCookie(event);
+					}
+
+					event.locals.user = user;
+					event.locals.session = session;
+					return resolve(event);
+				};
+			`
+			);
+
+			const handleExportRegex = /^export\s+const\s+handle\s*=\s*([^;]+);?\n?/m;
+
+			const match = ms.original.match(handleExportRegex);
+			if (match) {
+				ms.prepend("import { sequence } from '@sveltejs/kit/hooks'\n");
+				const handlerName = match[1]; // e.g. 'handleParaglide'
+				ms.replace(match[0], '');
+				ms.append(`\n\nexport const handle = sequence(${handlerName}, handleAuth)`);
+			}
+			return ms.toString();
 		});
 
 		if (options.demo) {
@@ -393,6 +426,8 @@ export default defineAddon({
 					import * as auth from '$lib/server/auth';
 					import { db } from '$lib/server/db';
 					import * as table from '$lib/server/db/schema';
+
+					${!typescript ? "/**\n* @type {import('@sveltejs/kit').ServerLoad}\n*/" : ''}
 					${ts("import type { Actions, PageServerLoad } from './$types';\n")}
 					export const load${ts(': PageServerLoad')} = async (event) => {
 						if (event.locals.user) {
@@ -401,30 +436,31 @@ export default defineAddon({
 						return {};
 					};
 
+					${!typescript ? "/**\n* @type {import('@sveltejs/kit').Actions}\n*/" : ''}
 					export const actions${ts(': Actions')} = {
 						login: async (event) => {
 							const formData = await event.request.formData();
 							const username = formData.get('username');
 							const password = formData.get('password');
 
-							if (!validateUsername(username)) {
+							if (!username || !validateUsername(username)) {
 								return fail(400, { message: 'Invalid username (min 3, max 31 characters, alphanumeric only)' });
 							}
-							if (!validatePassword(password)) {
+							if (!password || !validatePassword(password)) {
 								return fail(400, { message: 'Invalid password (min 6, max 255 characters)' });
 							}
 
 							const results = await db
 								.select()
 								.from(table.user)
-								.where(eq(table.user.username, username));
+								.where(eq(table.user.username, username.toString()));
 
 							const existingUser = results.at(0);
 							if (!existingUser) {
 								return fail(400, { message: 'Incorrect username or password' });
 							}
 
-							const validPassword = await verify(existingUser.passwordHash, password, {
+							const validPassword = await verify(existingUser.passwordHash, password.toString(), {
 								memoryCost: 19456,
 								timeCost: 2,
 								outputLen: 32,
@@ -445,15 +481,15 @@ export default defineAddon({
 							const username = formData.get('username');
 							const password = formData.get('password');
 
-							if (!validateUsername(username)) {
+							if (!username || !validateUsername(username)) {
 								return fail(400, { message: 'Invalid username' });
 							}
-							if (!validatePassword(password)) {
+							if (!password || !validatePassword(password)) {
 								return fail(400, { message: 'Invalid password' });
 							}
 
 							const userId = generateUserId();
-							const passwordHash = await hash(password, {
+							const passwordHash = await hash(password.toString(), {
 								// recommended minimum parameters
 								memoryCost: 19456,
 								timeCost: 2,
@@ -462,7 +498,7 @@ export default defineAddon({
 							});
 
 							try {
-								await db.insert(table.user).values({ id: userId, username, passwordHash });
+								await db.insert(table.user).values({ id: userId, username: username.toString(), passwordHash });
 
 								const sessionToken = auth.generateSessionToken();
 								const session = await auth.createSession(sessionToken, userId);
@@ -481,6 +517,7 @@ export default defineAddon({
 						return id;
 					}
 
+					${!typescript ? '/** @param {unknown} username */' : ''}
 					function validateUsername(username${ts(': unknown')})${ts(': username is string')} {
 						return (
 							typeof username === 'string' &&
@@ -490,6 +527,7 @@ export default defineAddon({
 						);
 					}
 
+					${!typescript ? '/** @param {unknown} password */' : ''}
 					function validatePassword(password${ts(': unknown')})${ts(': password is string')} {
 						return (
 							typeof password === 'string' &&
@@ -556,18 +594,20 @@ export default defineAddon({
 					log.warn(`Existing ${colors.yellow(filePath)} file. Could not update.`);
 					return content;
 				}
-
 				const [ts] = utils.createPrinter(typescript);
 				return dedent`
 					import * as auth from '$lib/server/auth';
 					import { fail, redirect } from '@sveltejs/kit';
 					import { getRequestEvent } from '$app/server';
+
+					${!typescript ? "/**\n* @type {import('@sveltejs/kit').ServerLoad}\n*/" : ''}
 					${ts("import type { Actions, PageServerLoad } from './$types';\n")}
 					export const load${ts(': PageServerLoad')} = async () => {
 						const user = requireLogin()
 						return { user };
 					};
 
+					${!typescript ? "/**\n* @type {import('@sveltejs/kit').Actions}\n*/" : ''}
 					export const actions${ts(': Actions')} = {
 						logout: async (event) => {
 							if (!event.locals.session) {
@@ -661,30 +701,6 @@ function createLuciaType(name: string): AstTypes.TSInterfaceBody['body'][number]
 	};
 }
 
-function getAuthHandleContent() {
-	return `
-		async ({ event, resolve }) => {
-			const sessionToken = event.cookies.get(auth.sessionCookieName);
-			if (!sessionToken) {
-				event.locals.user = null;
-				event.locals.session = null;
-				return resolve(event);
-			}
-
-			const { session, user } = await auth.validateSessionToken(sessionToken);
-			if (session) {
-				auth.setSessionTokenCookie(event, sessionToken, session.expiresAt);
-			} else {
-				auth.deleteSessionTokenCookie(event);
-			}
-
-			event.locals.user = user;
-			event.locals.session = session;
-
-			return resolve(event);
-		};`;
-}
-
 function getCallExpression(ast: AstTypes.Node): AstTypes.CallExpression | undefined {
 	let callExpression;
 
diff --git a/packages/addons/paraglide/index.ts b/packages/addons/paraglide/index.ts
index 455ee24b..13b2f4d3 100644
--- a/packages/addons/paraglide/index.ts
+++ b/packages/addons/paraglide/index.ts
@@ -8,11 +8,13 @@ import {
 	object,
 	variables,
 	exports,
-	kit as kitJs
+	kit as kitJs,
+	type AstTypes
 } from '@sveltejs/cli-core/js';
 import * as html from '@sveltejs/cli-core/html';
 import { parseHtml, parseJson, parseScript, parseSvelte } from '@sveltejs/cli-core/parsers';
 import { addToDemoPage } from '../common.ts';
+import { addJsDocTypeComment } from '../../core/tooling/js/common.ts';
 
 const DEFAULT_INLANG_PROJECT = {
 	$schema: 'https://inlang.com/schema/project-settings',
@@ -139,13 +141,33 @@ export default defineAddon({
 			});
 
 			const hookHandleContent = `({ event, resolve }) => paraglideMiddleware(event.request, ({ request, locale }) => {
-		event.request = request;
-		return resolve(event, {
-			transformPageChunk: ({ html }) => html.replace('%paraglide.lang%', locale)
-		});
-	});`;
+					event.request = request;
+					return resolve(event, {
+						transformPageChunk: ({ html }) => html.replace('%paraglide.lang%', locale)
+					});
+				});`;
+
 			kitJs.addHooksHandle(ast, typescript, 'handleParaglide', hookHandleContent);
 
+			const hookDecl = findVariableDeclaration(ast, 'handleParaglide');
+
+			if (hookDecl) {
+				addJsDocTypeComment(hookDecl, "import('@sveltejs/kit').Handle");
+			}
+			function findVariableDeclaration(
+				ast: AstTypes.Program,
+				name: string
+			): AstTypes.VariableDeclaration | undefined {
+				return ast.body.find(
+					(n): n is AstTypes.VariableDeclaration =>
+						n.type === 'VariableDeclaration' &&
+						n.declarations.some(
+							(d) =>
+								d.type === 'VariableDeclarator' && d.id.type === 'Identifier' && d.id.name === name
+						)
+				);
+			}
+
 			return generateCode();
 		});
 
diff --git a/packages/core/tooling/index.ts b/packages/core/tooling/index.ts
index 27e41cbe..9d5c9be6 100644
--- a/packages/core/tooling/index.ts
+++ b/packages/core/tooling/index.ts
@@ -70,8 +70,9 @@ export function parseScript(content: string): TsEstree.Program {
 				const indentation = content.slice(a, b);
 				value = value.replace(new RegExp(`^${indentation}`, 'gm'), '');
 			}
+			const raw = content.slice(start, end);
 
-			comments.push({ type: block ? 'Block' : 'Line', value, start, end });
+			comments.push({ type: block ? 'Block' : 'Line', value: block ? raw : value, start, end });
 		}
 	}) as TsEstree.Program;