diff --git a/apps/api/src/billing/autumn.ts b/apps/api/src/billing/autumn.ts
index 58e563010..c09411ad6 100644
--- a/apps/api/src/billing/autumn.ts
+++ b/apps/api/src/billing/autumn.ts
@@ -48,69 +48,64 @@ async function stripPrivilegedBody(request: Request): Promise<Request> {
 	}
 
 	const text = await request.text();
-	if (!text) {
-		return new Request(request.url, request);
-	}
-
-	let parsed: unknown;
-	try {
-		parsed = JSON.parse(text);
-	} catch {
-		return new Request(request.url, {
-			method: request.method,
-			headers: request.headers,
-			body: text,
-		});
+	let body: string | null = text || null;
+	if (text) {
+		try {
+			body = JSON.stringify(sanitize(JSON.parse(text)));
+		} catch {
+			body = text;
+		}
 	}
 
 	return new Request(request.url, {
 		method: request.method,
 		headers: request.headers,
-		body: JSON.stringify(sanitize(parsed)),
+		body,
 	});
 }
 
+const autumn = autumnHandler({ identify: identifyAutumnCustomer });
+
 export async function handleAutumnRequest(request: Request) {
 	const sanitized = await stripPrivilegedBody(request);
-	return autumnHandler({
-		identify: identifyAutumnCustomer,
-	})(withAutumnApiPath(sanitized));
+	return autumn(withAutumnApiPath(sanitized));
 }
 
-async function identifyAutumnCustomer(request: Request) {
+async function loadSession(request: Request) {
 	try {
-		const session = await auth.api.getSession({ headers: request.headers });
-		if (!session?.user) {
-			return null;
-		}
+		return await auth.api.getSession({ headers: request.headers });
+	} catch (error) {
+		const err = error instanceof Error ? error : new Error(String(error));
+		useLogger().error(err, {
+			autumn: "identify",
+			autumn_stage: "getSession",
+		});
+		throw err;
+	}
+}
+
+async function identifyAutumnCustomer(request: Request) {
+	const session = await loadSession(request);
+	if (!session?.user) {
+		return null;
+	}
 
-		const activeOrgId = (
-			session.session as { activeOrganizationId?: string | null }
-		)?.activeOrganizationId;
+	const activeOrgId = session.session.activeOrganizationId ?? null;
 
-		if (activeOrgId) {
-			const role = await getMemberRole(session.user.id, activeOrgId);
-			if (role !== "owner" && role !== "admin") {
-				return null;
-			}
+	if (activeOrgId) {
+		const role = await getMemberRole(session.user.id, activeOrgId);
+		if (role !== "owner" && role !== "admin") {
+			return null;
 		}
+	}
 
-		const customerId = await getBillingCustomerId(session.user.id, activeOrgId);
+	const customerId = await getBillingCustomerId(session.user.id, activeOrgId);
 
-		return {
-			customerId,
-			customerData: {
-				name: session.user.name,
-				email: session.user.email,
-			},
-		};
-	} catch (error) {
-		useLogger().error(
-			error instanceof Error ? error : new Error(String(error)),
-			{
-				autumn: "identify",
-			}
-		);
-		return null;
-	}
+	return {
+		customerId,
+		customerData: {
+			name: session.user.name,
+			email: session.user.email,
+		},
+	};
 }
diff --git a/apps/api/src/routes/agent.ts b/apps/api/src/routes/agent.ts
index 5e6082305..75df5fb03 100644
--- a/apps/api/src/routes/agent.ts
+++ b/apps/api/src/routes/agent.ts
@@ -1,7 +1,5 @@
 import {
-	getAccessibleWebsiteIds,
 	getApiKeyFromHeader,
-	hasGlobalAccess,
 	hasKeyScope,
 	isApiKeyPresent,
 } from "@databuddy/api-keys/resolve";
@@ -60,7 +58,7 @@ import { Elysia, t } from "elysia";
 import { log, parseError } from "evlog";
 import { useLogger } from "evlog/elysia";
 import {
-	checkWebsiteReadPermissionCached,
+	type AgentContextSnapshotResult,
 	getAgentContextSnapshot,
 	getMemoryContextCached,
 	shouldLoadMemoryContext,
@@ -69,7 +67,7 @@ import { getAILogger } from "../lib/ai-logger";
 import { trackAgentEvent } from "../lib/databuddy";
 import { getResolvedAuth } from "../lib/auth-wide-event";
 import { captureError, mergeWideEvent } from "../lib/tracing";
-import { validateWebsite } from "../lib/website-utils";
+import { getAccessibleWebsites } from "../lib/accessible-websites";
 
 function jsonError(status: number, code: string, message: string): Response {
 	return new Response(
@@ -228,8 +226,12 @@ const UIMessageSchema = t.Object({
 	),
 });
 
+const MAX_MENTIONS = 20;
+
 const AgentRequestSchema = t.Object({
-	websiteId: t.String(),
+	organizationId: t.Optional(t.String()),
+	websiteId: t.Optional(t.String()),
+	mentions: t.Optional(t.Array(t.String(), { maxItems: MAX_MENTIONS })),
 	messages: t.Array(UIMessageSchema, { maxItems: MAX_MESSAGES }),
 	id: t.Optional(t.String()),
 	timezone: t.Optional(t.String()),
@@ -475,25 +477,31 @@ function createPlainTextStreamResponse(
 export const agent = new Elysia({ prefix: "/v1/agent" })
 	.derive(async ({ request }) => {
 		const preResolved = getResolvedAuth(request.headers);
-		let user = preResolved?.session?.user ?? null;
+		let session = preResolved?.session ?? null;
 		let apiKey = preResolved?.apiKeyResult?.key ?? null;
 
 		if (!preResolved) {
 			const hasApiKey = isApiKeyPresent(request.headers);
-			const [resolvedApiKey, session] = await Promise.all([
+			const [resolvedApiKey, freshSession] = await Promise.all([
 				hasApiKey ? getApiKeyFromHeader(request.headers) : null,
 				auth.api.getSession({ headers: request.headers }),
 			]);
-			user = session?.user ?? null;
+			session = freshSession;
 			apiKey = resolvedApiKey;
 		}
 
+		const user = session?.user ?? null;
+		const activeOrganizationId =
+			(session?.session as { activeOrganizationId?: string | null } | undefined)
+				?.activeOrganizationId ?? null;
+
 		const validApiKey =
 			apiKey && hasKeyScope(apiKey, "read:data") ? apiKey : null;
 
 		return {
 			user,
 			apiKey: validApiKey,
+			activeOrganizationId,
 			isAuthenticated: Boolean(user ?? validApiKey),
 		};
 	})
@@ -591,14 +599,13 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 	)
 	.post(
 		"/chat",
-		function agentChat({ body, user, apiKey, request }) {
+		function agentChat({ body, user, apiKey, activeOrganizationId, request }) {
 			return (async () => {
 				const chatId = body.id ?? generateId();
 				const t0 = performance.now();
 				let organizationId: string | null = null;
 
 				mergeWideEvent({
-					agent_website_id: body.websiteId,
 					agent_user_id: user?.id ?? "unknown",
 					agent_chat_id: chatId,
 				});
@@ -609,8 +616,27 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 					}
 					const userId = user?.id ?? `apikey:${apiKey?.id}`;
 
+					organizationId =
+						body.organizationId ??
+						activeOrganizationId ??
+						apiKey?.organizationId ??
+						null;
+
+					if (!organizationId) {
+						return jsonError(
+							400,
+							"WORKSPACE_REQUIRED",
+							"No active workspace. Select an organization and try again."
+						);
+					}
+
+					mergeWideEvent({
+						organization_id: organizationId,
+						...(body.websiteId ? { agent_website_id: body.websiteId } : {}),
+					});
+
 					const rl = await ratelimit(
-						`agent:chat:${userId}:${body.websiteId}`,
+						`agent:chat:${userId}:${organizationId}`,
 						30,
 						60
 					);
@@ -622,50 +648,15 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 						);
 					}
 
-					const websiteValidation = await timeAgentPhase(
-						"validate_website",
-						validateWebsite(body.websiteId)
-					);
-
-					if (!(websiteValidation.success && websiteValidation.website)) {
-						return jsonError(
-							404,
-							"WEBSITE_NOT_FOUND",
-							websiteValidation.error ?? "Website not found"
-						);
-					}
-
-					const { website } = websiteValidation;
-					organizationId = website.organizationId ?? null;
-
-					const resolvePermission = (): Promise<boolean> => {
-						if (apiKey) {
-							if (hasGlobalAccess(apiKey)) {
-								return Promise.resolve(
-									apiKey.organizationId != null &&
-										apiKey.organizationId === website.organizationId
-								);
-							}
-							return Promise.resolve(
-								getAccessibleWebsiteIds(apiKey).includes(body.websiteId)
-							);
-						}
-						if (!(user && website.organizationId)) {
-							return Promise.resolve(false);
-						}
-						return checkWebsiteReadPermissionCached(
-							user.id,
-							website.organizationId,
-							request.headers
-						);
-					};
-					const permissionCheck = timeAgentPhase(
-						"permission_check",
-						resolvePermission()
-					);
-
-					const [hasPermission, billingCustomerId] = await Promise.all([
-						permissionCheck,
+					const [accessibleWebsites, billingCustomerId] = await Promise.all([
+						timeAgentPhase(
+							"accessible_websites",
+							getAccessibleWebsites({
+								user: user ? { id: user.id } : null,
+								apiKey,
+								organizationId,
+							})
+						),
 						timeAgentPhase(
 							"resolve_billing",
 							resolveAgentBillingCustomerId({
@@ -676,30 +667,53 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 						),
 					]);
 
-					if (!hasPermission) {
+					if (accessibleWebsites.length === 0) {
 						return jsonError(
 							403,
 							"ACCESS_DENIED",
-							"Access denied to this website"
+							"No accessible websites in this workspace"
 						);
 					}
 
+					let defaultWebsiteId: string | null = null;
+					let defaultDomain: string | undefined;
+					if (body.websiteId) {
+						const match = accessibleWebsites.find(
+							(w) => w.id === body.websiteId
+						);
+						if (!match) {
+							return jsonError(
+								403,
+								"ACCESS_DENIED",
+								"Access denied to this website"
+							);
+						}
+						defaultWebsiteId = match.id;
+						defaultDomain = match.domain ?? undefined;
+					}
+
+					const mentionedWebsites = (body.mentions ?? [])
+						.map((id) => accessibleWebsites.find((w) => w.id === id))
+						.filter((w): w is (typeof accessibleWebsites)[number] =>
+							Boolean(w)
+						);
+
 					if (body.id) {
 						const existingChat = await db.query.agentChats.findFirst({
 							where: { id: chatId },
-							columns: { userId: true, websiteId: true },
+							columns: { userId: true, organizationId: true },
 						});
 						if (
 							existingChat &&
 							(existingChat.userId !== userId ||
-								existingChat.websiteId !== body.websiteId)
+								(existingChat.organizationId != null &&
+									existingChat.organizationId !== organizationId))
 						) {
 							return jsonError(403, "ACCESS_DENIED", "Access denied to chat");
 						}
 					}
 
 					const timezone = body.timezone ?? "UTC";
-					const domain = website.domain ?? "unknown";
 					const lastMessage = getLastMessagePreview(body.messages);
 
 					const agentTier: AgentTier = body.tier ?? "balanced";
@@ -714,7 +728,7 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 						action: "chat_started",
 						source: "dashboard",
 						agent_type: AGENT_TYPE,
-						website_id: body.websiteId,
+						website_id: defaultWebsiteId,
 						organization_id: organizationId,
 						user_id: userId,
 					});
@@ -722,7 +736,8 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 					useLogger().info("Creating agent", {
 						agent: {
 							type: AGENT_TYPE,
-							websiteId: body.websiteId,
+							websiteId: defaultWebsiteId,
+							accessibleWebsiteCount: accessibleWebsites.length,
 							messageCount: body.messages.length,
 							lastMessage,
 						},
@@ -735,7 +750,9 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 									captureError(err, {
 										agent_credit_check_error: true,
 										agent_chat_id: chatId,
-										agent_website_id: body.websiteId,
+										...(defaultWebsiteId
+											? { agent_website_id: defaultWebsiteId }
+											: {}),
 									});
 									return true;
 								})
@@ -759,28 +776,41 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 						"memory_enrich",
 						Promise.all([
 							creditsCheck,
-							loadMemoryContext
+							loadMemoryContext && defaultWebsiteId
 								? optionalAgentContext(
 										"memory",
-										getMemoryContextCached(lastMessage, userId, body.websiteId),
+										getMemoryContextCached(
+											lastMessage,
+											userId,
+											defaultWebsiteId
+										),
 										EMPTY_MEMORY_CONTEXT,
 										AGENT_MEMORY_CONTEXT_TIMEOUT_MS,
 										{
 											agent_chat_id: chatId,
-											agent_website_id: body.websiteId,
+											agent_website_id: defaultWebsiteId,
 										}
 									)
 								: Promise.resolve(EMPTY_MEMORY_CONTEXT),
-							optionalAgentContext(
-								"enrichment",
-								getAgentContextSnapshot(userId, body.websiteId, organizationId),
-								{ context: "", source: "error" },
-								AGENT_ENRICHMENT_CONTEXT_TIMEOUT_MS,
-								{
-									agent_chat_id: chatId,
-									agent_website_id: body.websiteId,
-								}
-							),
+							defaultWebsiteId
+								? optionalAgentContext(
+										"enrichment",
+										getAgentContextSnapshot(
+											userId,
+											defaultWebsiteId,
+											organizationId
+										),
+										{ context: "", source: "error" },
+										AGENT_ENRICHMENT_CONTEXT_TIMEOUT_MS,
+										{
+											agent_chat_id: chatId,
+											agent_website_id: defaultWebsiteId,
+										}
+									)
+								: Promise.resolve<AgentContextSnapshotResult>({
+										context: "",
+										source: "miss",
+									}),
 						])
 					);
 					mergeWideEvent({
@@ -805,8 +835,10 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 						{
 							userId,
 							organizationId: organizationId ?? undefined,
-							websiteId: body.websiteId,
-							websiteDomain: domain,
+							websiteId: defaultWebsiteId ?? undefined,
+							websiteDomain: defaultDomain,
+							defaultWebsiteId,
+							accessibleWebsites,
 							timezone,
 							chatId,
 							requestHeaders: request.headers,
@@ -817,9 +849,20 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 						modelOverride
 					);
 
+					const mentionContext =
+						mentionedWebsites.length > 0
+							? `<mentioned-websites>\nThe user referenced these websites in their message. Prioritize them when choosing which website(s) to query:\n${mentionedWebsites
+									.map(
+										(w) =>
+											`- ${w.name ?? w.domain ?? w.id} (id: ${w.id}${w.domain ? `, domain: ${w.domain}` : ""})`
+									)
+									.join("\n")}\n</mentioned-websites>`
+							: "";
+
 					const extras = [
 						memoryCtx ? formatMemoryForPrompt(memoryCtx) : "",
 						enrichment.context,
+						mentionContext,
 					]
 						.filter(Boolean)
 						.join("\n\n");
@@ -863,14 +906,18 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 					const dashboardTelemetryMetadata: Record<string, string> = {
 						source: "dashboard",
 						userId,
-						websiteId: body.websiteId,
-						websiteDomain: domain,
 						chatId,
 						agentType: AGENT_TYPE,
 						timezone,
 						"tcc.sessionId": chatId,
 						"tcc.conversational": "true",
 					};
+					if (defaultWebsiteId) {
+						dashboardTelemetryMetadata.websiteId = defaultWebsiteId;
+					}
+					if (defaultDomain) {
+						dashboardTelemetryMetadata.websiteDomain = defaultDomain;
+					}
 					if (organizationId) {
 						dashboardTelemetryMetadata.organizationId = organizationId;
 					}
@@ -881,7 +928,7 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 						metadata: dashboardTelemetryMetadata,
 					});
 
-					if (isMemoryEnabled() && lastMessage) {
+					if (isMemoryEnabled() && lastMessage && defaultWebsiteId) {
 						storeConversation(
 							[{ role: "user", content: lastMessage }],
 							userId,
@@ -890,9 +937,9 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 								metadata: {
 									source: "dashboard",
 								},
-								websiteId: body.websiteId,
+								websiteId: defaultWebsiteId,
 								conversationId: chatId,
-								domain,
+								domain: defaultDomain ?? "unknown",
 							}
 						);
 					}
@@ -941,7 +988,7 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 								modelId: modelNames[modelKey],
 								source: "dashboard",
 								agentType: AGENT_TYPE,
-								websiteId: body.websiteId,
+								websiteId: defaultWebsiteId ?? undefined,
 								organizationId,
 								userId: persistedUserId ?? null,
 								chatId,
@@ -952,14 +999,17 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 							captureError(usageError, {
 								agent_usage_telemetry_error: true,
 								agent_chat_id: chatId,
-								agent_website_id: body.websiteId,
+								...(defaultWebsiteId
+									? { agent_website_id: defaultWebsiteId }
+									: {}),
 							});
 						});
 
+					const streamScope = userId;
 					const streamId = generateId();
-					const streamKey = streamBufferKey(body.websiteId, chatId, streamId);
+					const streamKey = streamBufferKey(streamScope, chatId, streamId);
 					await timeAgentPhase("stream_setup", () =>
-						setActiveStream(body.websiteId, chatId, streamId)
+						setActiveStream(streamScope, chatId, streamId)
 					);
 
 					if (persistedUserId) {
@@ -969,7 +1019,7 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 									.insert(agentChats)
 									.values({
 										id: chatId,
-										websiteId: body.websiteId,
+										websiteId: defaultWebsiteId,
 										userId: persistedUserId,
 										organizationId: persistedOrgId,
 										title: fallbackTitle,
@@ -988,7 +1038,9 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 							captureError(persistError, {
 								agent_user_message_persist_error: true,
 								agent_chat_id: chatId,
-								agent_website_id: body.websiteId,
+								...(defaultWebsiteId
+									? { agent_website_id: defaultWebsiteId }
+									: {}),
 							});
 						}
 					}
@@ -998,7 +1050,7 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 						originalMessages: validation.data,
 						onFinish: async ({ messages }) => {
 							try {
-								await clearActiveStream(body.websiteId, chatId, streamId);
+								await clearActiveStream(streamScope, chatId, streamId);
 							} catch {}
 							if (!persistedUserId) {
 								return;
@@ -1008,7 +1060,7 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 									.insert(agentChats)
 									.values({
 										id: chatId,
-										websiteId: body.websiteId,
+										websiteId: defaultWebsiteId,
 										userId: persistedUserId,
 										organizationId: persistedOrgId,
 										title: fallbackTitle,
@@ -1036,7 +1088,9 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 								captureError(persistError, {
 									agent_persist_error: true,
 									agent_chat_id: chatId,
-									agent_website_id: body.websiteId,
+									...(defaultWebsiteId
+										? { agent_website_id: defaultWebsiteId }
+										: {}),
 								});
 							}
 						},
@@ -1069,7 +1123,9 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 							captureError(storageError, {
 								agent_stream_persist_error: true,
 								agent_chat_id: chatId,
-								agent_website_id: body.websiteId,
+								...(defaultWebsiteId
+									? { agent_website_id: defaultWebsiteId }
+									: {}),
 							});
 						});
 						return new Response(forClient, {
@@ -1088,7 +1144,7 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 								agentType: AGENT_TYPE,
 								phase: "dashboard_chat_stream",
 								userId: user?.id ?? null,
-								websiteId: body.websiteId,
+								websiteId: body.websiteId ?? null,
 							},
 							...(parsed.fix !== "" && parsed.fix != null
 								? { fix: parsed.fix }
@@ -1104,7 +1160,7 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 							error_message: err.message,
 							error_name: err.name,
 							service: "api",
-							websiteId: body.websiteId,
+							websiteId: body.websiteId ?? null,
 							...(parsed.fix !== "" && parsed.fix != null
 								? { fix: parsed.fix }
 								: {}),
@@ -1121,13 +1177,13 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 						error_type: getErrorName(error),
 						organization_id: organizationId,
 						user_id: user?.id ?? null,
-						website_id: body.websiteId,
+						website_id: body.websiteId ?? null,
 					});
 					captureError(error, {
 						agent_error: true,
 						agent_type: AGENT_TYPE,
 						agent_chat_id: chatId,
-						agent_website_id: body.websiteId,
+						...(body.websiteId ? { agent_website_id: body.websiteId } : {}),
 						agent_user_id: user?.id ?? "unknown",
 						error_type: getErrorName(error),
 					});
@@ -1143,16 +1199,16 @@ export const agent = new Elysia({ prefix: "/v1/agent" })
 		}
 		const chat = await db.query.agentChats.findFirst({
 			where: { id: params.chatId, userId: user.id },
-			columns: { id: true, websiteId: true },
+			columns: { id: true },
 		});
 		if (!chat) {
 			return new Response(null, { status: 204 });
 		}
-		const streamId = await getActiveStream(chat.websiteId, chat.id);
+		const streamId = await getActiveStream(user.id, chat.id);
 		if (!streamId) {
 			return new Response(null, { status: 204 });
 		}
-		const key = streamBufferKey(chat.websiteId, chat.id, streamId);
+		const key = streamBufferKey(user.id, chat.id, streamId);
 
 		const abortController = new AbortController();
 		request.signal?.addEventListener("abort", () => {
diff --git a/apps/api/src/routes/webhooks/autumn.ts b/apps/api/src/routes/webhooks/autumn.ts
index 96fff5c7d..c71865177 100644
--- a/apps/api/src/routes/webhooks/autumn.ts
+++ b/apps/api/src/routes/webhooks/autumn.ts
@@ -21,6 +21,8 @@ import { Elysia } from "elysia";
 import { useLogger } from "evlog/elysia";
 import { Resend } from "resend";
 import { Webhook } from "svix";
+// biome-ignore lint/performance/noNamespaceImport: vitest+bun fails to bind zod's named `z` export; namespace import is the reliable form
+import * as z from "zod";
 import { mergeWideEvent } from "../../lib/tracing";
 
 const COOLDOWN_MS = 7 * 24 * 60 * 60 * 1000;
@@ -32,43 +34,52 @@ const resend = new Resend(process.env.RESEND_API_KEY);
 const svix = SVIX_SECRET ? new Webhook(SVIX_SECRET) : null;
 const slack = SLACK_URL ? new SlackProvider({ webhookUrl: SLACK_URL }) : null;
 
-interface LimitReachedData {
-	customer_id: string;
-	feature_id: string;
-	limit_type: "included" | "max_purchase" | "spend_limit";
-}
-
-interface UsageAlertData {
-	customer_id: string;
-	feature_id: string;
-	usage_alert: {
-		name?: string;
-		threshold: number;
-		threshold_type: string;
-	};
-}
-
-type ProductScenario =
-	| "new"
-	| "upgrade"
-	| "downgrade"
-	| "renew"
-	| "cancel"
-	| "expired"
-	| "past_due"
-	| "scheduled";
-
-interface ProductsUpdatedData {
-	customer: {
-		id: string | null;
-		name: string | null;
-		email: string | null;
-		env: string;
-		products: Array<{ id: string; name: string; status: string }>;
-	};
-	scenario: ProductScenario;
-	updated_product: { id: string; name: string | null };
-}
+const limitReachedSchema = z.object({
+	customer_id: z.string(),
+	feature_id: z.string(),
+	limit_type: z.enum(["included", "max_purchase", "spend_limit"]),
+});
+
+const usageAlertSchema = z.object({
+	customer_id: z.string(),
+	feature_id: z.string(),
+	usage_alert: z.object({
+		name: z.string().optional(),
+		threshold: z.number(),
+		threshold_type: z.string(),
+	}),
+});
+
+const productScenarioSchema = z.enum([
+	"new",
+	"upgrade",
+	"downgrade",
+	"renew",
+	"cancel",
+	"expired",
+	"past_due",
+	"scheduled",
+]);
+
+type ProductScenario = z.infer<typeof productScenarioSchema>;
+
+const productsUpdatedSchema = z.object({
+	customer: z.object({
+		id: z.string().nullable(),
+		name: z.string().nullable(),
+		email: z.string().nullable(),
+		env: z.string(),
+		products: z.array(
+			z.object({ id: z.string(), name: z.string(), status: z.string() })
+		),
+	}),
+	scenario: productScenarioSchema,
+	updated_product: z.object({ id: z.string(), name: z.string().nullable() }),
+});
+
+type LimitReachedData = z.infer<typeof limitReachedSchema>;
+type UsageAlertData = z.infer<typeof usageAlertSchema>;
+type ProductsUpdatedData = z.infer<typeof productsUpdatedSchema>;
 
 interface RawAutumnEvent {
 	data: unknown;
@@ -386,11 +397,11 @@ function dispatch(
 ): Promise<WebhookResult> | WebhookResult {
 	switch (event.type) {
 		case "balances.limit_reached":
-			return handleLimitReached(event.data as LimitReachedData);
+			return handleLimitReached(limitReachedSchema.parse(event.data));
 		case "balances.usage_alert_triggered":
-			return handleUsageAlert(event.data as UsageAlertData);
+			return handleUsageAlert(usageAlertSchema.parse(event.data));
 		case "customer.products.updated":
-			return handleProductsUpdated(event.data as ProductsUpdatedData);
+			return handleProductsUpdated(productsUpdatedSchema.parse(event.data));
 		default:
 			useLogger().warn("Unknown webhook type", {
 				autumn: { type: event.type },
@@ -446,7 +457,18 @@ export const autumnWebhook = new Elysia().post(
 		});
 		log.info("Autumn webhook", { autumn: { type: event.type } });
 
-		return dispatch(event);
+		try {
+			return await dispatch(event);
+		} catch (error) {
+			if (error instanceof z.ZodError) {
+				log.error(new Error("Invalid Autumn webhook payload"), {
+					autumn: { type: event.type, issues: error.issues },
+				});
+				set.status = 400;
+				return { success: false, message: "Invalid event payload" };
+			}
+			throw error;
+		}
 	},
 	{ parse: "none" }
 );
diff --git a/apps/basket/src/lib/billing.ts b/apps/basket/src/lib/billing.ts
index 3aa51bdf8..9941f7ad1 100644
--- a/apps/basket/src/lib/billing.ts
+++ b/apps/basket/src/lib/billing.ts
@@ -39,6 +39,16 @@ export function checkAutumnUsage(
 			});
 
 			if (!response.allowed) {
+				log.warn("Event quota exceeded", {
+					customerId,
+					featureId,
+					properties,
+					billing: {
+						usage: b?.usage,
+						granted: b?.granted,
+						unlimited: b?.unlimited,
+					},
+				});
 				throw basketErrors.billingLimitExceeded();
 			}
 
diff --git a/apps/basket/src/lib/event-service.ts b/apps/basket/src/lib/event-service.ts
index 05c1246f3..8e2681bf6 100644
--- a/apps/basket/src/lib/event-service.ts
+++ b/apps/basket/src/lib/event-service.ts
@@ -117,9 +117,6 @@ export function buildTrackEvent(
 	};
 }
 
-/**
- * Insert a track event (pageview/analytics event) via Kafka
- */
 export function insertTrackEvent(
 	trackData: any,
 	clientId: string,
@@ -180,9 +177,6 @@ export function insertTrackEvent(
 	});
 }
 
-/**
- * Insert an outgoing link click event into the database
- */
 export function insertOutgoingLink(
 	linkData: any,
 	clientId: string,
@@ -246,9 +240,6 @@ export function insertTrackEventsBatch(
 	});
 }
 
-/**
- * Insert lean error spans (v2.x format)
- */
 export function insertErrorSpans(
 	errors: ErrorSpan[],
 	clientId: string
@@ -294,10 +285,6 @@ export function insertErrorSpans(
 	});
 }
 
-/**
- * Insert individual vital metrics (v2.x format) as spans
- * Each metric is stored as a separate row - no aggregation
- */
 export function insertIndividualVitals(
 	vitals: IndividualVital[],
 	clientId: string
@@ -341,13 +328,6 @@ export function insertOutgoingLinksBatch(
 	});
 }
 
-/**
- * Insert organization-scoped custom events
- * owner_id: The org or user ID that owns this data (from API key)
- * website_id: Optional website scope
- * namespace: Optional logical grouping (e.g., 'billing', 'auth', 'api')
- * source: Optional origin identifier (e.g., 'backend', 'webhook', 'cli')
- */
 export function insertCustomEvents(
 	events: Array<{
 		owner_id: string;
diff --git a/apps/basket/src/lib/evlog-basket.ts b/apps/basket/src/lib/evlog-basket.ts
index 279265eb4..dfa581f91 100644
--- a/apps/basket/src/lib/evlog-basket.ts
+++ b/apps/basket/src/lib/evlog-basket.ts
@@ -18,9 +18,6 @@ const pipeline = createDrainPipeline<DrainContext>({
 
 const axiomDrain = createAxiomDrain();
 
-/**
- * Batched Axiom drain; call {@link flushBatchedAxiomDrain} on shutdown.
- */
 const batchedAxiomDrain = pipeline(axiomDrain);
 
 const devFsLogsDir = join(
@@ -40,9 +37,6 @@ const devFsDrain = useLocalEvlogFiles
 
 const DURATION_MS_REGEX = /^([\d.]+)(ms|s)$/;
 
-/**
- * Before Axiom: fix `error` string vs object collision; downgrade 4xx to warn.
- */
 function normalizeWideEventForAxiom(event: Record<string, unknown>): void {
 	if (typeof event.error === "string") {
 		event.error_message = event.error;
@@ -78,10 +72,6 @@ function parseDurationMs(duration: unknown): number | undefined {
 		: Math.round(Number.parseFloat(match[1]));
 }
 
-/**
- * In development, writes NDJSON wide events to `apps/basket/.evlog/logs/` (analyze-logs skill)
- * and still sends to Axiom via the batched pipeline. Production: Axiom only.
- */
 export async function basketLoggerDrain(ctx: DrainContext): Promise<void> {
 	if (ctx.event.method === "OPTIONS") {
 		return;
diff --git a/apps/basket/src/lib/request-validation.ts b/apps/basket/src/lib/request-validation.ts
index 788cea889..f6fd33bf0 100644
--- a/apps/basket/src/lib/request-validation.ts
+++ b/apps/basket/src/lib/request-validation.ts
@@ -50,10 +50,6 @@ export function getWebsiteSecuritySettings(
 	};
 }
 
-/**
- * Validate incoming request for analytics events.
- * Throws basket ingest EvlogErrors on failure; returns `{ error: billing.response }` when quota is exceeded.
- */
 export function validateRequest(
 	body: unknown,
 	query: unknown,
@@ -242,12 +238,6 @@ export function validateRequest(
 	});
 }
 
-/**
- * Check if request is from a bot
- * - ALLOW: Process normally (search engines, social media)
- * - TRACK_ONLY: Log to ai_traffic_spans but don't count as pageview (AI crawlers)
- * - BLOCK: Reject and log to blocked_traffic (scrapers, malicious bots)
- */
 export function checkForBot(
 	request: Request,
 	body: unknown,
diff --git a/apps/basket/src/lib/structured-errors.ts b/apps/basket/src/lib/structured-errors.ts
index 75ba25d10..21371b8f7 100644
--- a/apps/basket/src/lib/structured-errors.ts
+++ b/apps/basket/src/lib/structured-errors.ts
@@ -1,11 +1,6 @@
 import { createError, EvlogError, parseError } from "evlog";
 import type { z } from "zod";
 
-/**
- * Structured errors for the basket API (evlog EvlogError).
- * Prefer throwing these over ad-hoc Response bodies so the global handler can
- * emit consistent JSON and wide-event context.
- */
 export const basketErrors = {
 	trackPayloadTooLarge: () =>
 		createError({
@@ -194,9 +189,6 @@ export function isIngestSchemaValidationError(
 	);
 }
 
-/**
- * Re-throw EvlogErrors; wrap anything else as a 500 and log it.
- */
 export function rethrowOrWrap(
 	error: unknown,
 	log?: { error: (err: Error) => void }
diff --git a/apps/basket/src/lib/tracing.ts b/apps/basket/src/lib/tracing.ts
index 4e5065791..bc641daae 100644
--- a/apps/basket/src/lib/tracing.ts
+++ b/apps/basket/src/lib/tracing.ts
@@ -1,11 +1,6 @@
 import { EvlogError, log } from "evlog";
 import { useLogger } from "evlog/elysia";
 
-/**
- * Merge fields into the active request wide event, falling back to a
- * global structured log line if there is no active request context
- * (background workers, startup, async callbacks, etc.).
- */
 export function mergeWideEvent(fields: Record<string, unknown>): void {
 	try {
 		useLogger().set(fields);
@@ -14,11 +9,6 @@ export function mergeWideEvent(fields: Record<string, unknown>): void {
 	}
 }
 
-/**
- * Run a named operation and attach its duration (ms) to the active wide event
- * as `timing.<name>`. Nested calls accumulate — the wide event ends up with one
- * `timing.*` field per `record()` call in the request.
- */
 export async function record<T>(
 	name: string,
 	fn: () => Promise<T> | T
@@ -34,10 +24,6 @@ export async function record<T>(
 	}
 }
 
-/**
- * Attach an error to the active request wide event when inside the evlog
- * middleware; otherwise emit a global structured log line.
- */
 export function captureError(
 	error: unknown,
 	attributes?: Record<string, string | number | boolean>
diff --git a/apps/basket/src/routes/basket.ts b/apps/basket/src/routes/basket.ts
index 31512b3fb..abf150004 100644
--- a/apps/basket/src/routes/basket.ts
+++ b/apps/basket/src/routes/basket.ts
@@ -2,6 +2,10 @@ import type {
 	AnalyticsEvent,
 	CustomOutgoingLink,
 } from "@databuddy/db/clickhouse/schema";
+import type {
+	AnalyticsEventInput,
+	OutgoingLinkInput,
+} from "@databuddy/validation";
 import {
 	analyticsEventSchema,
 	batchedCustomEventSpansSchema,
@@ -57,7 +61,7 @@ import { EvlogError } from "evlog";
 import { useLogger } from "evlog/elysia";
 
 function processTrackEventData(
-	trackData: any,
+	trackData: AnalyticsEventInput,
 	clientId: string,
 	userAgent: string,
 	ip: string,
@@ -90,7 +94,7 @@ function processTrackEventData(
 }
 
 async function processOutgoingLinkData(
-	linkData: any,
+	linkData: OutgoingLinkInput,
 	clientId: string
 ): Promise<CustomOutgoingLink> {
 	const timestamp = parseTimestamp(linkData.timestamp);
@@ -339,7 +343,8 @@ const app = new Elysia()
 				query,
 				request
 			);
-			const eventType = (body as any).type || "track";
+			const eventType =
+				(body as { type?: string } | null | undefined)?.type ?? "track";
 			log.set({ clientId, eventType });
 
 			if (eventType === "track") {
@@ -364,7 +369,7 @@ const app = new Elysia()
 					throw createIngestSchemaValidationError(parseResult.error.issues);
 				}
 
-				insertTrackEvent(body, clientId, userAgent, ip, request);
+				insertTrackEvent(parseResult.data, clientId, userAgent, ip, request);
 				return Response.json({ status: "success", type: "track" });
 			}
 
@@ -390,7 +395,7 @@ const app = new Elysia()
 					throw createIngestSchemaValidationError(parseResult.error.issues);
 				}
 
-				insertOutgoingLink(body, clientId, userAgent, ip);
+				insertOutgoingLink(parseResult.data, clientId, userAgent, ip);
 				return Response.json({ status: "success", type: "outgoing_link" });
 			}
 
@@ -474,7 +479,7 @@ const app = new Elysia()
 						}
 
 						const trackEvent = await processTrackEventData(
-							event,
+							parseResult.data,
 							clientId,
 							userAgent,
 							ip,
@@ -484,7 +489,7 @@ const app = new Elysia()
 						results.push({
 							status: "success",
 							type: "track",
-							eventId: event.eventId,
+							eventId: parseResult.data.eventId,
 						});
 					} else if (eventType === "outgoing_link") {
 						const botError = await checkForBot(
@@ -518,12 +523,15 @@ const app = new Elysia()
 							continue;
 						}
 
-						const linkEvent = await processOutgoingLinkData(event, clientId);
+						const linkEvent = await processOutgoingLinkData(
+							parseResult.data,
+							clientId
+						);
 						outgoingLinkEvents.push(linkEvent);
 						results.push({
 							status: "success",
 							type: "outgoing_link",
-							eventId: event.eventId,
+							eventId: parseResult.data.eventId,
 						});
 					} else {
 						results.push({
diff --git a/apps/basket/src/utils/parsing-helpers.ts b/apps/basket/src/utils/parsing-helpers.ts
index 4d58c2ae0..ee85af583 100644
--- a/apps/basket/src/utils/parsing-helpers.ts
+++ b/apps/basket/src/utils/parsing-helpers.ts
@@ -7,9 +7,6 @@ type ParseResult<T> =
 	| { success: true; data: T }
 	| { success: false; error: { issues: z.core.$ZodIssue[] } };
 
-/**
- * Validates event schema in production, skips validation in development
- */
 export function validateEventSchema<T>(
 	schema: z.ZodSchema<T>,
 	event: unknown,
@@ -46,7 +43,6 @@ export function validateEventSchema<T>(
 	});
 }
 
-/** Per-item batch result when schema validation fails */
 export function batchSchemaItemFailure(
 	issues: z.core.$ZodIssue[],
 	eventType: string,
@@ -61,7 +57,6 @@ export function batchSchemaItemFailure(
 	};
 }
 
-/** Per-item batch result when request is treated as bot (ignored) */
 export function batchBotIgnoredItem(eventType: string) {
 	return {
 		status: "error" as const,
@@ -71,23 +66,14 @@ export function batchBotIgnoredItem(eventType: string) {
 	};
 }
 
-/**
- * Validates timestamp, returns current time if invalid
- */
 export function parseTimestamp(timestamp: unknown): number {
 	return typeof timestamp === "number" ? timestamp : Date.now();
 }
 
-/**
- * Parses properties object to JSON string, defaults to empty object
- */
 export function parseProperties(properties: unknown): string {
 	return properties ? JSON.stringify(properties) : "{}";
 }
 
-/**
- * Parses and sanitizes event ID, generates UUID if missing
- */
 export function parseEventId(
 	eventId: unknown,
 	generateFn: () => string
diff --git a/apps/dashboard/app/(main)/agent/[chatId]/page.tsx b/apps/dashboard/app/(main)/agent/[chatId]/page.tsx
new file mode 100644
index 000000000..56af147e8
--- /dev/null
+++ b/apps/dashboard/app/(main)/agent/[chatId]/page.tsx
@@ -0,0 +1,11 @@
+import { GlobalAgentPage } from "../_components/global-agent-page";
+
+interface Props {
+	params: Promise<{ chatId: string }>;
+}
+
+export default async function AgentChatPage(props: Props) {
+	const { chatId } = await props.params;
+
+	return <GlobalAgentPage chatId={chatId} />;
+}
diff --git a/apps/dashboard/app/(main)/agent/_components/agent-gate.tsx b/apps/dashboard/app/(main)/agent/_components/agent-gate.tsx
new file mode 100644
index 000000000..f9c6ca29d
--- /dev/null
+++ b/apps/dashboard/app/(main)/agent/_components/agent-gate.tsx
@@ -0,0 +1,36 @@
+"use client";
+
+import { useGlobalAgent } from "@/components/agent/global-agent-provider";
+import { Skeleton } from "@databuddy/ui";
+import { AgentNoWebsites } from "./agent-no-websites";
+
+type AgentGate =
+	| { status: "loading" | "no-websites" }
+	| { status: "ready"; organizationId: string };
+
+export function useAgentGate(): AgentGate {
+	const { organizationId, hasWebsites, isLoading } = useGlobalAgent();
+	if (isLoading || !organizationId) {
+		return { status: "loading" };
+	}
+	if (!hasWebsites) {
+		return { status: "no-websites" };
+	}
+	return { status: "ready", organizationId };
+}
+
+export function AgentGatePlaceholder({
+	status,
+}: {
+	status: "loading" | "no-websites";
+}) {
+	if (status === "no-websites") {
+		return <AgentNoWebsites />;
+	}
+	return (
+		<div className="flex h-full flex-col gap-3 p-4">
+			<Skeleton className="h-8 w-48 rounded" />
+			<Skeleton className="h-full w-full rounded" />
+		</div>
+	);
+}
diff --git a/apps/dashboard/app/(main)/agent/_components/agent-no-websites.tsx b/apps/dashboard/app/(main)/agent/_components/agent-no-websites.tsx
new file mode 100644
index 000000000..de5c57d95
--- /dev/null
+++ b/apps/dashboard/app/(main)/agent/_components/agent-no-websites.tsx
@@ -0,0 +1,28 @@
+import Link from "next/link";
+import { Button } from "@databuddy/ui";
+import { Avatar } from "@databuddy/ui/client";
+
+export function AgentNoWebsites() {
+	return (
+		<div className="flex h-full flex-col items-center justify-center gap-4 px-6 text-center">
+			<Avatar
+				alt="Databunny avatar"
+				className="size-12 rounded"
+				fallback="DB"
+				src="/databunny.webp"
+			/>
+			<div className="space-y-1">
+				<h2 className="font-semibold text-base text-foreground">
+					Add a website to use Databunny
+				</h2>
+				<p className="max-w-sm text-muted-foreground text-sm">
+					Databunny analyzes your analytics. Connect your first website to start
+					asking questions.
+				</p>
+			</div>
+			<Button asChild>
+				<Link href="/websites">Add a website</Link>
+			</Button>
+		</div>
+	);
+}
diff --git a/apps/dashboard/app/(main)/agent/_components/global-agent-page.tsx b/apps/dashboard/app/(main)/agent/_components/global-agent-page.tsx
new file mode 100644
index 000000000..090116bde
--- /dev/null
+++ b/apps/dashboard/app/(main)/agent/_components/global-agent-page.tsx
@@ -0,0 +1,37 @@
+"use client";
+
+import { useRouter } from "next/navigation";
+import { AgentWorkspace } from "@/components/agent/agent-workspace";
+import { clearLastChatId } from "@/components/agent/hooks/use-chat-db";
+import { ChatProvider } from "@/contexts/chat-context";
+import { AgentGatePlaceholder, useAgentGate } from "./agent-gate";
+
+export function GlobalAgentPage({ chatId }: { chatId: string }) {
+	const router = useRouter();
+	const gate = useAgentGate();
+
+	if (gate.status !== "ready") {
+		return <AgentGatePlaceholder status={gate.status} />;
+	}
+
+	const { organizationId } = gate;
+
+	return (
+		<ChatProvider chatId={chatId} organizationId={organizationId}>
+			<AgentWorkspace
+				chatId={chatId}
+				onCurrentChatDeleted={(nextChatId) => {
+					if (nextChatId) {
+						router.push(`/agent/${nextChatId}`);
+					} else {
+						clearLastChatId(organizationId);
+						router.push("/agent");
+					}
+				}}
+				onNewChat={(newChatId) => router.push(`/agent/${newChatId}`)}
+				onSelectChat={(nextChatId) => router.push(`/agent/${nextChatId}`)}
+				organizationId={organizationId}
+			/>
+		</ChatProvider>
+	);
+}
diff --git a/apps/dashboard/app/(main)/agent/_components/global-agent-redirect.tsx b/apps/dashboard/app/(main)/agent/_components/global-agent-redirect.tsx
new file mode 100644
index 000000000..39fb84a9d
--- /dev/null
+++ b/apps/dashboard/app/(main)/agent/_components/global-agent-redirect.tsx
@@ -0,0 +1,21 @@
+"use client";
+
+import { useRouter } from "next/navigation";
+import { useEffect } from "react";
+import { useGlobalAgent } from "@/components/agent/global-agent-provider";
+import { AgentGatePlaceholder, useAgentGate } from "./agent-gate";
+
+export function GlobalAgentRedirect() {
+	const router = useRouter();
+	const { chatId } = useGlobalAgent();
+	const gate = useAgentGate();
+	const ready = gate.status === "ready";
+
+	useEffect(() => {
+		if (ready && chatId) {
+			router.replace(`/agent/${chatId}`);
+		}
+	}, [ready, chatId, router]);
+
+	return <AgentGatePlaceholder status={ready ? "loading" : gate.status} />;
+}
diff --git a/apps/dashboard/app/(main)/agent/layout.tsx b/apps/dashboard/app/(main)/agent/layout.tsx
new file mode 100644
index 000000000..82cd8a247
--- /dev/null
+++ b/apps/dashboard/app/(main)/agent/layout.tsx
@@ -0,0 +1,6 @@
+import type { ReactNode } from "react";
+import { GlobalAgentProvider } from "@/components/agent/global-agent-provider";
+
+export default function AgentLayout({ children }: { children: ReactNode }) {
+	return <GlobalAgentProvider>{children}</GlobalAgentProvider>;
+}
diff --git a/apps/dashboard/app/(main)/agent/page.tsx b/apps/dashboard/app/(main)/agent/page.tsx
new file mode 100644
index 000000000..8a91dbd83
--- /dev/null
+++ b/apps/dashboard/app/(main)/agent/page.tsx
@@ -0,0 +1,5 @@
+import { GlobalAgentRedirect } from "./_components/global-agent-redirect";
+
+export default function AgentIndexPage() {
+	return <GlobalAgentRedirect />;
+}
diff --git a/apps/dashboard/app/(main)/layout.tsx b/apps/dashboard/app/(main)/layout.tsx
index df1269d0e..360797178 100644
--- a/apps/dashboard/app/(main)/layout.tsx
+++ b/apps/dashboard/app/(main)/layout.tsx
@@ -1,6 +1,5 @@
 import { publicConfig } from "@databuddy/env/public";
 import { FeedbackPrompt } from "@/components/feedback-prompt";
-import { GlobalAgentProvider } from "@/components/agent/global-agent-provider";
 import { isDashboardE2E } from "@/lib/e2e-mode";
 import { Sidebar } from "@/components/layout/sidebar";
 import {
@@ -48,20 +47,18 @@ export default function MainLayout({
 					<SessionGuard>
 						<SidebarLayout>
 							<TopBarProvider>
-								<GlobalAgentProvider>
-									<div className="flex min-h-0 flex-1 flex-col overflow-hidden text-foreground">
-										<Suspense fallback={<SidebarFallback />}>
-											<Sidebar />
-										</Suspense>
-										<SidebarInset>
-											<TopBar />
-											<div className="flex min-h-0 flex-1 flex-col overflow-hidden overflow-x-hidden overscroll-y-none pt-12 md:pt-0">
-												{children}
-											</div>
-										</SidebarInset>
-										<FeedbackPrompt />
-									</div>
-								</GlobalAgentProvider>
+								<div className="flex min-h-0 flex-1 flex-col overflow-hidden text-foreground">
+									<Suspense fallback={<SidebarFallback />}>
+										<Sidebar />
+									</Suspense>
+									<SidebarInset>
+										<TopBar />
+										<div className="flex min-h-0 flex-1 flex-col overflow-hidden overflow-x-hidden overscroll-y-none pt-12 md:pt-0">
+											{children}
+										</div>
+									</SidebarInset>
+									<FeedbackPrompt />
+								</div>
 							</TopBarProvider>
 						</SidebarLayout>
 					</SessionGuard>
diff --git a/apps/dashboard/app/(main)/websites/[id]/agent/[chatId]/page.tsx b/apps/dashboard/app/(main)/websites/[id]/agent/[chatId]/page.tsx
index 81b5de6b7..371aa86ad 100644
--- a/apps/dashboard/app/(main)/websites/[id]/agent/[chatId]/page.tsx
+++ b/apps/dashboard/app/(main)/websites/[id]/agent/[chatId]/page.tsx
@@ -1,4 +1,3 @@
-import { ChatProvider } from "@/contexts/chat-context";
 import { AgentPageClient } from "../_components/agent-page-client";
 
 interface Props {
@@ -8,9 +7,5 @@ interface Props {
 export default async function AgentPage(props: Props) {
 	const { id, chatId } = await props.params;
 
-	return (
-		<ChatProvider chatId={chatId} websiteId={id}>
-			<AgentPageClient chatId={chatId} websiteId={id} />
-		</ChatProvider>
-	);
+	return <AgentPageClient chatId={chatId} websiteId={id} />;
 }
diff --git a/apps/dashboard/app/(main)/websites/[id]/agent/_components/agent-page-client.tsx b/apps/dashboard/app/(main)/websites/[id]/agent/_components/agent-page-client.tsx
index 26aba8bfc..5e1912820 100644
--- a/apps/dashboard/app/(main)/websites/[id]/agent/_components/agent-page-client.tsx
+++ b/apps/dashboard/app/(main)/websites/[id]/agent/_components/agent-page-client.tsx
@@ -1,6 +1,11 @@
 "use client";
 
-import { AgentPageContent } from "./agent-page-content";
+import { Skeleton } from "@databuddy/ui";
+import { useRouter } from "next/navigation";
+import { AgentWorkspace } from "@/components/agent/agent-workspace";
+import { clearLastChatId } from "@/components/agent/hooks/use-chat-db";
+import { useOrganizationsContext } from "@/components/providers/organizations-provider";
+import { ChatProvider } from "@/contexts/chat-context";
 
 interface AgentPageClientProps {
 	chatId: string;
@@ -8,9 +13,40 @@ interface AgentPageClientProps {
 }
 
 export function AgentPageClient({ chatId, websiteId }: AgentPageClientProps) {
+	const router = useRouter();
+	const { activeOrganizationId, isLoading } = useOrganizationsContext();
+	const basePath = `/websites/${websiteId}/agent`;
+
+	if (isLoading) {
+		return (
+			<div className="flex h-full flex-col gap-3 p-4">
+				<Skeleton className="h-8 w-48 rounded" />
+				<Skeleton className="h-full w-full rounded" />
+			</div>
+		);
+	}
+
 	return (
-		<div className="relative flex h-full flex-col">
-			<AgentPageContent chatId={chatId} websiteId={websiteId} />
-		</div>
+		<ChatProvider
+			chatId={chatId}
+			defaultWebsiteId={websiteId}
+			organizationId={activeOrganizationId}
+		>
+			<AgentWorkspace
+				chatId={chatId}
+				defaultWebsiteId={websiteId}
+				onCurrentChatDeleted={(nextChatId) => {
+					if (nextChatId) {
+						router.push(`${basePath}/${nextChatId}`);
+					} else {
+						clearLastChatId(websiteId);
+						router.push(basePath);
+					}
+				}}
+				onNewChat={(newChatId) => router.push(`${basePath}/${newChatId}`)}
+				onSelectChat={(nextChatId) => router.push(`${basePath}/${nextChatId}`)}
+				organizationId={activeOrganizationId}
+			/>
+		</ChatProvider>
 	);
 }
diff --git a/apps/dashboard/app/(main)/websites/[id]/agent/_components/agent-page-content.tsx b/apps/dashboard/app/(main)/websites/[id]/agent/_components/agent-page-content.tsx
deleted file mode 100644
index e53db476a..000000000
--- a/apps/dashboard/app/(main)/websites/[id]/agent/_components/agent-page-content.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-"use client";
-
-import { useQuery } from "@tanstack/react-query";
-import { AgentChatSurface } from "@/components/agent/agent-chat-surface";
-import { AgentCreditBalance } from "@/components/agent/agent-credit-balance";
-import { ChatHistory } from "@/components/agent/chat-history";
-import { NewChatButton } from "@/components/agent/new-chat-button";
-import { TopBar } from "@/components/layout/top-bar";
-import { orpc } from "@/lib/orpc";
-import { Tooltip } from "@databuddy/ui";
-import { Avatar } from "@databuddy/ui/client";
-
-interface AgentPageContentProps {
-	chatId: string;
-	websiteId: string;
-}
-
-export function AgentPageContent({ chatId, websiteId }: AgentPageContentProps) {
-	const { data: chatMeta, isPending: isChatMetaPending } = useQuery({
-		...orpc.agentChats.get.queryOptions({ input: { id: chatId } }),
-		refetchOnWindowFocus: false,
-		staleTime: Number.POSITIVE_INFINITY,
-	});
-
-	const chatTitle = chatMeta?.title?.trim() ?? "";
-	const showChatTitle = chatTitle.length > 0;
-	const chatTitleDisplayed =
-		chatTitle === ""
-			? chatTitle
-			: `${chatTitle.slice(0, 1).toLocaleUpperCase()}${chatTitle.slice(1)}`;
-
-	return (
-		<div className="relative flex min-h-0 flex-1 overflow-hidden">
-			<div className="flex min-h-0 flex-1 flex-col overflow-hidden">
-				<TopBar.Title>
-					<div className="flex min-w-0 items-center gap-2.5">
-						<Avatar
-							alt="Databunny avatar"
-							className="size-6 shrink-0 rounded"
-							fallback="DB"
-							src="/databunny.webp"
-						/>
-						<div className="flex min-w-0 flex-1 items-center gap-2">
-							<h1 className="shrink-0 truncate font-semibold text-foreground text-sm">
-								Databunny
-							</h1>
-							{!showChatTitle && (
-								<span className="shrink-0 rounded border border-border/60 px-1.5 py-px font-medium text-[10px] text-muted-foreground uppercase">
-									Alpha
-								</span>
-							)}
-							{isChatMetaPending ? (
-								<>
-									<span aria-hidden className="mx-1 h-4 w-px bg-border/60" />
-									<span
-										aria-hidden
-										className="h-3.5 min-w-[5rem] max-w-[min(40vw,12rem)] animate-pulse rounded bg-muted"
-									/>
-								</>
-							) : (
-								showChatTitle && (
-									<>
-										<span aria-hidden className="mx-1 h-4 w-px bg-border/60" />
-
-										<p
-											className="min-w-0 truncate font-medium text-sm"
-											title={chatTitleDisplayed}
-										>
-											{chatTitleDisplayed}
-										</p>
-									</>
-								)
-							)}
-						</div>
-					</div>
-				</TopBar.Title>
-				<TopBar.Actions>
-					<AgentCreditBalance />
-					<span aria-hidden className="mx-1 h-4 w-px bg-border/60" />
-					<Tooltip content="Chat History">
-						<div className="inline-flex max-w-full">
-							<ChatHistory websiteId={websiteId} />
-						</div>
-					</Tooltip>
-					<NewChatButton websiteId={websiteId} />
-				</TopBar.Actions>
-
-				<AgentChatSurface
-					autoSendPromptFromUrl
-					chatId={chatId}
-					websiteId={websiteId}
-				/>
-			</div>
-		</div>
-	);
-}
diff --git a/apps/dashboard/components/agent/agent-atoms.ts b/apps/dashboard/components/agent/agent-atoms.ts
index 636484dd3..8346db6bd 100644
--- a/apps/dashboard/components/agent/agent-atoms.ts
+++ b/apps/dashboard/components/agent/agent-atoms.ts
@@ -3,6 +3,14 @@ import { atomWithStorage } from "jotai/utils";
 
 export const agentInputAtom = atom("");
 
+export interface AgentMention {
+	domain?: string;
+	id: string;
+	label: string;
+}
+
+export const agentMentionsAtom = atom<AgentMention[]>([]);
+
 export type AgentThinking = "off" | "low" | "medium" | "high";
 export type AgentTier = "quick" | "balanced" | "deep";
 
diff --git a/apps/dashboard/components/agent/agent-chat-surface.tsx b/apps/dashboard/components/agent/agent-chat-surface.tsx
index bdd931d8e..86dd40dec 100644
--- a/apps/dashboard/components/agent/agent-chat-surface.tsx
+++ b/apps/dashboard/components/agent/agent-chat-surface.tsx
@@ -20,8 +20,11 @@ import {
 	LightningIcon,
 	TableIcon,
 } from "@databuddy/ui/icons";
+import { useSetAtom } from "jotai";
+import { agentMentionsAtom } from "./agent-atoms";
 import { AgentInput } from "./agent-input";
 import { AgentMessages } from "./agent-messages";
+import { AGENT_COMMANDS } from "./agent-commands";
 import { setLastChatId } from "./hooks/use-chat-db";
 import { Avatar } from "@databuddy/ui/client";
 import { Button, Skeleton } from "@databuddy/ui";
@@ -31,7 +34,8 @@ interface AgentChatSurfaceProps {
 	chatId: string;
 	className?: string;
 	contentClassName?: string;
-	websiteId: string;
+	defaultWebsiteId?: string;
+	organizationId: string | null;
 }
 
 const FALLBACK_ICONS = [
@@ -43,20 +47,40 @@ const FALLBACK_ICONS = [
 
 const LOADING_DELAY_MS = 250;
 
+const DEFAULT_PROMPTS = AGENT_COMMANDS.filter(
+	(command) => command.action !== "clear"
+)
+	.slice(0, 4)
+	.map((command) => ({
+		label: command.title,
+		prompt: command.prompt,
+		source: "default" as const,
+	}));
+
 export function AgentChatSurface({
 	autoSendPromptFromUrl = false,
 	chatId,
 	className,
 	contentClassName,
-	websiteId,
+	defaultWebsiteId,
+	organizationId,
 }: AgentChatSurfaceProps) {
+	const lastChatScope = defaultWebsiteId ?? organizationId;
+	const setMentions = useSetAtom(agentMentionsAtom);
+
 	useEffect(() => {
-		setLastChatId(websiteId, chatId);
-	}, [websiteId, chatId]);
+		if (lastChatScope) {
+			setLastChatId(lastChatScope, chatId);
+		}
+	}, [lastChatScope, chatId]);
+
+	useEffect(() => {
+		setMentions([]);
+	}, [chatId, setMentions]);
 
 	const { messages, sendMessage } = useChat();
 	const { isRestoring, isEmpty } = useChatLoading();
-	const { data: website } = useWebsite(websiteId);
+	const { data: website } = useWebsite(defaultWebsiteId ?? "");
 	const searchParams = useSearchParams();
 	const router = useRouter();
 	const pathname = usePathname();
@@ -116,7 +140,7 @@ export function AgentChatSurface({
 							<WelcomeState
 								domain={domain}
 								onPromptSelect={launchPrompt}
-								websiteId={websiteId}
+								websiteId={defaultWebsiteId}
 							/>
 						</div>
 					) : null}
@@ -164,15 +188,18 @@ function WelcomeState({
 }: {
 	domain: string | null;
 	onPromptSelect: (text: string) => void;
-	websiteId: string;
+	websiteId?: string;
 }) {
-	const { data: prompts, isLoading } = useQuery({
+	const { data: fetchedPrompts, isLoading } = useQuery({
 		...orpc.agentChats.suggestedPrompts.queryOptions({
-			input: { websiteId },
+			input: { websiteId: websiteId ?? "" },
 		}),
+		enabled: Boolean(websiteId),
 		staleTime: 5 * 60 * 1000,
 	});
 
+	const prompts = websiteId ? fetchedPrompts : DEFAULT_PROMPTS;
+
 	return (
 		<div className="w-full space-y-6">
 			<div className="flex flex-col items-center gap-3">
@@ -186,11 +213,15 @@ function WelcomeState({
 				<div className="space-y-1 text-center">
 					<h3 className="text-balance font-semibold text-lg">Meet Databunny</h3>
 					<p className="text-pretty text-muted-foreground text-sm">
-						Ask anything about{" "}
-						<span className="font-medium text-foreground">
-							{domain ?? "your"}
-						</span>
-						's analytics.
+						{domain ? (
+							<>
+								Ask anything about{" "}
+								<span className="font-medium text-foreground">{domain}</span>'s
+								analytics.
+							</>
+						) : (
+							"Ask anything about your analytics. Mention a site with @."
+						)}
 					</p>
 				</div>
 			</div>
diff --git a/apps/dashboard/components/agent/agent-input.tsx b/apps/dashboard/components/agent/agent-input.tsx
index 3d2ffee22..06eca6001 100644
--- a/apps/dashboard/components/agent/agent-input.tsx
+++ b/apps/dashboard/components/agent/agent-input.tsx
@@ -17,23 +17,33 @@ import {
 } from "@databuddy/ui/icons";
 import { useChat, usePendingQueue } from "@/contexts/chat-context";
 import { cn } from "@/lib/utils";
+import { FaviconImage } from "@/components/analytics/favicon-image";
 import {
 	useBillingContext,
 	useUsageFeature,
 } from "@/components/providers/billing-provider";
+import { type Website, useWebsitesLight } from "@/hooks/use-websites";
 import {
 	AGENT_TIERS,
 	AGENT_THINKING_LEVELS,
 	TIER_SUPPORTS_THINKING,
+	type AgentMention,
 	type AgentTier,
 	type AgentThinking,
 	agentCreditShakeNonceAtom,
 	agentInputAtom,
+	agentMentionsAtom,
 	agentTierAtom,
 	agentThinkingAtom,
 } from "./agent-atoms";
 import { AgentCommandMenu } from "./agent-command-menu";
 import { type AgentCommand, filterCommands } from "./agent-commands";
+import { AgentMentionMenu } from "./agent-mention-menu";
+import {
+	filterMentionWebsites,
+	getMentionQuery,
+	stripMentionQuery,
+} from "./agent-mentions";
 import {
 	AgentTextSwitch,
 	AGENT_INPUT_PLACEHOLDER_PHRASES,
@@ -47,6 +57,8 @@ export function AgentInput() {
 	const { messages: pendingMessages, removeAction } = usePendingQueue();
 	const isLoading = status === "streaming" || status === "submitted";
 	const [input, setInput] = useAtom(agentInputAtom);
+	const [mentions, setMentions] = useAtom(agentMentionsAtom);
+	const { websites } = useWebsitesLight();
 	const bumpCreditShake = useSetAtom(agentCreditShakeNonceAtom);
 	const { balance, unlimited } = useUsageFeature("agent_credits");
 	const { customer, isLoading: billingLoading } = useBillingContext();
@@ -56,6 +68,8 @@ export function AgentInput() {
 	const { formRef, onKeyDown } = useEnterSubmit();
 	const [selectedCommandIndex, setSelectedCommandIndex] = useState(0);
 	const [commandsDismissed, setCommandsDismissed] = useState(false);
+	const [selectedMentionIndex, setSelectedMentionIndex] = useState(0);
+	const [mentionsDismissed, setMentionsDismissed] = useState(false);
 	const [placeholderReplayKey, setPlaceholderReplayKey] = useState(0);
 	const textareaRef = useRef<HTMLTextAreaElement | null>(null);
 	const replayFrameRef = useRef<number | null>(null);
@@ -101,8 +115,28 @@ export function AgentInput() {
 		return filterCommands(query);
 	}, [input]);
 
+	const mentionQuery = useMemo(() => getMentionQuery(input), [input]);
+	const mentionedIds = useMemo(
+		() => new Set(mentions.map((m) => m.id)),
+		[mentions]
+	);
+	const mentionResults = useMemo(() => {
+		if (mentionQuery === null) {
+			return [];
+		}
+		return filterMentionWebsites(websites, mentionQuery, mentionedIds);
+	}, [mentionQuery, websites, mentionedIds]);
+
+	const showMentions =
+		!(mentionsDismissed || isLoading) && mentionResults.length > 0;
+	const safeMentionIndex =
+		mentionResults.length === 0
+			? 0
+			: Math.min(selectedMentionIndex, mentionResults.length - 1);
+
 	const showCommands =
-		!(commandsDismissed || isLoading) && filteredCommands.length > 0;
+		!(commandsDismissed || isLoading || showMentions) &&
+		filteredCommands.length > 0;
 	const safeCommandIndex =
 		filteredCommands.length === 0
 			? 0
@@ -139,9 +173,66 @@ export function AgentInput() {
 		setCommandsDismissed(true);
 	};
 
+	const selectMention = useCallback(
+		(website: Website) => {
+			setMentions((prev) =>
+				prev.some((m) => m.id === website.id)
+					? prev
+					: [
+							...prev,
+							{
+								id: website.id,
+								label: website.name ?? website.domain,
+								domain: website.domain,
+							},
+						]
+			);
+			setInput(stripMentionQuery(inputSyncRef.current));
+			setSelectedMentionIndex(0);
+			requestAnimationFrame(() => textareaRef.current?.focus());
+		},
+		[setMentions, setInput]
+	);
+
+	const removeMention = (id: string) => {
+		setMentions((prev) => prev.filter((m) => m.id !== id));
+	};
+
 	const handleMessageKeyDown = (
 		event: React.KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>
 	) => {
+		if (showMentions) {
+			if (event.key === "ArrowDown") {
+				event.preventDefault();
+				setSelectedMentionIndex((prev) => (prev + 1) % mentionResults.length);
+				return;
+			}
+			if (event.key === "ArrowUp") {
+				event.preventDefault();
+				setSelectedMentionIndex(
+					(prev) => (prev - 1 + mentionResults.length) % mentionResults.length
+				);
+				return;
+			}
+			if (event.key === "Escape") {
+				event.preventDefault();
+				setMentionsDismissed(true);
+				return;
+			}
+			if (
+				(event.key === "Enter" &&
+					!event.shiftKey &&
+					!event.nativeEvent.isComposing) ||
+				event.key === "Tab"
+			) {
+				event.preventDefault();
+				const target = mentionResults[safeMentionIndex];
+				if (target) {
+					selectMention(target);
+				}
+				return;
+			}
+		}
 		if (showCommands) {
 			if (event.key === "ArrowDown") {
 				event.preventDefault();
@@ -191,8 +282,54 @@ export function AgentInput() {
 			setCommandsDismissed(false);
 		}
 		setSelectedCommandIndex(0);
+		setMentionsDismissed(false);
+		setSelectedMentionIndex(0);
 	};
 
+	const inputSurface = (
+		<div
+			className={cn(
+				"space-y-1.5 rounded-lg border border-border/60 bg-muted p-1 shadow-sm transition-colors",
+				"focus-within:border-ring focus-within:ring-[3px] focus-within:ring-ring/50"
+			)}
+		>
+			<section className="relative">
+				<div className="pointer-events-none absolute inset-x-3 top-3 max-w-full">
+					<AgentTextSwitch
+						active={input.length === 0 && !isLoading}
+						className="text-muted-foreground/80 text-sm"
+						key={placeholderReplayKey}
+						nostagger
+						phrases={AGENT_INPUT_PLACEHOLDER_PHRASES}
+					/>
+				</div>
+				<Textarea
+					aria-label="Ask Databunny about your analytics, or type slash for commands"
+					className={cn(
+						"relative min-h-0! resize-none border-0 bg-transparent text-sm shadow-none",
+						"focus-visible:border-0 focus-visible:bg-transparent focus-visible:shadow-none focus-visible:ring-0",
+						"px-3 pt-3 pb-2"
+					)}
+					maxRows={8}
+					minRows={1}
+					onBlur={() => schedulePlaceholderReplayIfIdle(false)}
+					onChange={(e) => handleInputChange(e.target.value)}
+					onKeyDown={handleMessageKeyDown}
+					ref={textareaRef}
+					rows={1}
+					showFocusIndicator={false}
+					value={input}
+				/>
+			</section>
+
+			<InputToolbar
+				canSend={Boolean(input.trim())}
+				isLoading={isLoading}
+				onStop={stop}
+			/>
+		</div>
+	);
+
 	return (
 		<form className="z-10 mt-auto" onSubmit={handleSubmit} ref={formRef}>
 			{pendingMessages.length > 0 ? (
@@ -203,88 +340,20 @@ export function AgentInput() {
 				/>
 			) : null}
 
+			{mentions.length > 0 ? (
+				<MentionPills mentions={mentions} onRemove={removeMention} />
+			) : null}
+
 			<AgentCommandMenu
 				anchor={
-					<div
-						className={cn(
-							"space-y-1.5 rounded-lg border border-border/60 bg-muted p-1 shadow-sm transition-colors",
-							"focus-within:border-ring focus-within:ring-[3px] focus-within:ring-ring/50"
-						)}
-					>
-						<section className="relative">
-							<div className="pointer-events-none absolute inset-x-3 top-3 max-w-full">
-								<AgentTextSwitch
-									active={input.length === 0 && !isLoading}
-									className="text-muted-foreground/80 text-sm"
-									key={placeholderReplayKey}
-									nostagger
-									phrases={AGENT_INPUT_PLACEHOLDER_PHRASES}
-								/>
-							</div>
-							<Textarea
-								aria-label="Ask Databunny about your analytics, or type slash for commands"
-								className={cn(
-									"relative min-h-0! resize-none border-0 bg-transparent text-sm shadow-none",
-									"focus-visible:border-0 focus-visible:bg-transparent focus-visible:shadow-none focus-visible:ring-0",
-									"px-3 pt-3 pb-2"
-								)}
-								maxRows={8}
-								minRows={1}
-								onBlur={() => schedulePlaceholderReplayIfIdle(false)}
-								onChange={(e) => handleInputChange(e.target.value)}
-								onKeyDown={handleMessageKeyDown}
-								ref={textareaRef}
-								rows={1}
-								showFocusIndicator={false}
-								value={input}
-							/>
-						</section>
-
-						<div className="flex items-center justify-between gap-3 rounded border-border/60 bg-background px-1.5 py-1.5">
-							<div className="flex gap-1">
-								<Tooltip content="Attach file (coming soon)" side="top">
-									<Button
-										aria-label="Attach file"
-										className="size-7"
-										disabled
-										size="icon"
-										type="button"
-										variant="secondary"
-									>
-										<PaperclipIcon className="size-3.5" />
-									</Button>
-								</Tooltip>
-								<TierControl />
-								<ThinkingControl />
-							</div>
-
-							<div className="ml-auto flex shrink-0 items-center gap-3">
-								<KeyboardHints isLoading={isLoading} />
-								{isLoading ? (
-									<Button
-										aria-label="Stop generation"
-										className="size-7"
-										onClick={stop}
-										size="icon"
-										type="button"
-										variant="default"
-									>
-										<MediaStopIcon className="size-3.5" />
-									</Button>
-								) : (
-									<Button
-										aria-label="Send message"
-										className="size-7"
-										disabled={!input.trim()}
-										size="icon"
-										type="submit"
-									>
-										<PaperPlaneIcon className="size-3.5" />
-									</Button>
-								)}
-							</div>
-						</div>
-					</div>
+					<AgentMentionMenu
+						anchor={inputSurface}
+						onHover={setSelectedMentionIndex}
+						onSelect={selectMention}
+						open={showMentions}
+						selectedIndex={safeMentionIndex}
+						websites={mentionResults}
+					/>
 				}
 				commands={filteredCommands}
 				onHover={setSelectedCommandIndex}
@@ -296,6 +365,63 @@ export function AgentInput() {
 	);
 }
 
+const InputToolbar = memo(function InputToolbar({
+	canSend,
+	isLoading,
+	onStop,
+}: {
+	canSend: boolean;
+	isLoading: boolean;
+	onStop: () => void;
+}) {
+	return (
+		<div className="flex items-center justify-between gap-3 rounded border-border/60 bg-background px-1.5 py-1.5">
+			<div className="flex gap-1">
+				<Tooltip content="Attach file (coming soon)" side="top">
+					<Button
+						aria-label="Attach file"
+						className="size-7"
+						disabled
+						size="icon"
+						type="button"
+						variant="secondary"
+					>
+						<PaperclipIcon className="size-3.5" />
+					</Button>
+				</Tooltip>
+				<TierControl />
+				<ThinkingControl />
+			</div>
+
+			<div className="ml-auto flex shrink-0 items-center gap-3">
+				<KeyboardHints isLoading={isLoading} />
+				{isLoading ? (
+					<Button
+						aria-label="Stop generation"
+						className="size-7"
+						onClick={onStop}
+						size="icon"
+						type="button"
+						variant="default"
+					>
+						<MediaStopIcon className="size-3.5" />
+					</Button>
+				) : (
+					<Button
+						aria-label="Send message"
+						className="size-7"
+						disabled={!canSend}
+						size="icon"
+						type="submit"
+					>
+						<PaperPlaneIcon className="size-3.5" />
+					</Button>
+				)}
+			</div>
+		</div>
+	);
+});
+
 const THINKING_LABELS: Record<AgentThinking, string> = {
 	off: "Off",
 	low: "Low",
@@ -531,6 +657,41 @@ const KeyboardHints = memo(function KeyboardHints({
 	);
 });
 
+function MentionPills({
+	mentions,
+	onRemove,
+}: {
+	mentions: AgentMention[];
+	onRemove: (id: string) => void;
+}) {
+	return (
+		<div className="mb-2 flex flex-wrap items-center gap-1.5">
+			{mentions.map((mention) => (
+				<span
+					className="inline-flex items-center gap-1.5 rounded border border-border/60 bg-muted/40 py-1 pr-1 pl-2 text-xs"
+					key={mention.id}
+				>
+					{mention.domain ? (
+						<FaviconImage domain={mention.domain} size={14} />
+					) : null}
+					<span className="max-w-[12rem] truncate font-medium text-foreground/80">
+						{mention.label}
+					</span>
+					<Button
+						aria-label={`Remove ${mention.label}`}
+						className="size-5 shrink-0"
+						onClick={() => onRemove(mention.id)}
+						size="icon-sm"
+						variant="ghost"
+					>
+						<XMarkIcon className="size-3" />
+					</Button>
+				</span>
+			))}
+		</div>
+	);
+}
+
 function PendingPill({
 	messages,
 	onRemove,
diff --git a/apps/dashboard/components/agent/agent-mention-menu.tsx b/apps/dashboard/components/agent/agent-mention-menu.tsx
new file mode 100644
index 000000000..7492dd649
--- /dev/null
+++ b/apps/dashboard/components/agent/agent-mention-menu.tsx
@@ -0,0 +1,106 @@
+"use client";
+
+import { FaviconImage } from "@/components/analytics/favicon-image";
+import type { Website } from "@/hooks/use-websites";
+import { cn } from "@/lib/utils";
+import { Button } from "@databuddy/ui";
+import { memo, useEffect, useRef } from "react";
+
+interface AgentMentionMenuProps {
+	anchor: React.ReactNode;
+	onHover: (index: number) => void;
+	onSelect: (website: Website) => void;
+	open: boolean;
+	selectedIndex: number;
+	websites: Website[];
+}
+
+const MentionRow = memo(function MentionRow({
+	index,
+	isSelected,
+	onHover,
+	onSelect,
+	website,
+}: {
+	index: number;
+	isSelected: boolean;
+	onHover: (index: number) => void;
+	onSelect: (website: Website) => void;
+	website: Website;
+}) {
+	const ref = useRef<HTMLLIElement | null>(null);
+
+	useEffect(() => {
+		if (isSelected) {
+			ref.current?.scrollIntoView({ block: "nearest" });
+		}
+	}, [isSelected]);
+
+	const domain = website.domain ?? "";
+
+	return (
+		<li ref={ref}>
+			<Button
+				className={cn(
+					"h-auto w-full justify-start whitespace-normal rounded-none px-2 py-1.5 text-left",
+					isSelected ? "bg-accent text-accent-foreground" : "hover:bg-accent/50"
+				)}
+				onClick={() => onSelect(website)}
+				onMouseDown={(e) => e.preventDefault()}
+				onMouseMove={() => onHover(index)}
+				variant="ghost"
+			>
+				<span className="flex size-8 shrink-0 items-center justify-center rounded border bg-background">
+					<FaviconImage domain={domain} size={16} />
+				</span>
+				<span className="min-w-0 flex-1">
+					<span className="block truncate font-medium text-sm leading-tight">
+						{website.name ?? domain}
+					</span>
+					<span className="block truncate text-foreground/50 text-xs leading-snug">
+						{domain}
+					</span>
+				</span>
+			</Button>
+		</li>
+	);
+});
+
+export function AgentMentionMenu({
+	anchor,
+	onHover,
+	onSelect,
+	open,
+	selectedIndex,
+	websites,
+}: AgentMentionMenuProps) {
+	return (
+		<div className="relative">
+			{anchor}
+			{open ? (
+				<div
+					className={cn(
+						"absolute right-0 bottom-full left-0 z-30 mb-2 overflow-hidden rounded border border-border/60 bg-popover shadow-lg",
+						"fade-in slide-in-from-bottom-1 animate-in duration-150"
+					)}
+				>
+					<div className="border-border/60 border-b bg-muted/40 px-3 py-1.5 font-medium text-[10px] text-muted-foreground uppercase">
+						Mention a website
+					</div>
+					<ul className="max-h-72 overflow-y-auto py-1">
+						{websites.map((website, idx) => (
+							<MentionRow
+								index={idx}
+								isSelected={idx === selectedIndex}
+								key={website.id}
+								onHover={onHover}
+								onSelect={onSelect}
+								website={website}
+							/>
+						))}
+					</ul>
+				</div>
+			) : null}
+		</div>
+	);
+}
diff --git a/apps/dashboard/components/agent/agent-mentions.ts b/apps/dashboard/components/agent/agent-mentions.ts
new file mode 100644
index 000000000..69e64aabf
--- /dev/null
+++ b/apps/dashboard/components/agent/agent-mentions.ts
@@ -0,0 +1,33 @@
+import type { Website } from "@/hooks/use-websites";
+
+const MENTION_RE = /(^|\s)@([^\s@]*)$/;
+const MAX_MENTION_RESULTS = 8;
+
+export function getMentionQuery(text: string): string | null {
+	const match = text.match(MENTION_RE);
+	return match ? (match[2] ?? "") : null;
+}
+
+export function stripMentionQuery(text: string): string {
+	return text.replace(MENTION_RE, (_full, lead) => lead);
+}
+
+export function filterMentionWebsites(
+	websites: Website[],
+	query: string,
+	excludeIds: ReadonlySet<string>
+): Website[] {
+	const normalized = query.toLowerCase().trim();
+	return websites
+		.filter((website) => !excludeIds.has(website.id))
+		.filter((website) => {
+			if (!normalized) {
+				return true;
+			}
+			return (
+				(website.name ?? "").toLowerCase().includes(normalized) ||
+				(website.domain ?? "").toLowerCase().includes(normalized)
+			);
+		})
+		.slice(0, MAX_MENTION_RESULTS);
+}
diff --git a/apps/dashboard/components/agent/agent-workspace.tsx b/apps/dashboard/components/agent/agent-workspace.tsx
new file mode 100644
index 000000000..cf1c9c6ab
--- /dev/null
+++ b/apps/dashboard/components/agent/agent-workspace.tsx
@@ -0,0 +1,120 @@
+"use client";
+
+import { useQuery } from "@tanstack/react-query";
+import type { ReactNode } from "react";
+import { TopBar } from "@/components/layout/top-bar";
+import { orpc } from "@/lib/orpc";
+import { Tooltip } from "@databuddy/ui";
+import { Avatar } from "@databuddy/ui/client";
+import { AgentChatSurface } from "./agent-chat-surface";
+import { AgentCreditBalance } from "./agent-credit-balance";
+import { ChatHistory } from "./chat-history";
+import { NewChatButton } from "./new-chat-button";
+
+interface AgentWorkspaceProps {
+	chatId: string;
+	defaultWebsiteId?: string;
+	onCurrentChatDeleted: (nextChatId: string | null) => void;
+	onNewChat: (chatId: string) => void;
+	onSelectChat: (chatId: string) => void;
+	organizationId: string | null;
+	titleSlot?: ReactNode;
+}
+
+export function AgentWorkspace({
+	chatId,
+	organizationId,
+	defaultWebsiteId,
+	titleSlot,
+	onSelectChat,
+	onNewChat,
+	onCurrentChatDeleted,
+}: AgentWorkspaceProps) {
+	const { data: chatMeta, isPending: isChatMetaPending } = useQuery({
+		...orpc.agentChats.get.queryOptions({ input: { id: chatId } }),
+		refetchOnWindowFocus: false,
+		staleTime: Number.POSITIVE_INFINITY,
+	});
+
+	const chatTitle = chatMeta?.title?.trim() ?? "";
+	const showChatTitle = chatTitle.length > 0;
+	const chatTitleDisplayed =
+		chatTitle === ""
+			? chatTitle
+			: `${chatTitle.slice(0, 1).toLocaleUpperCase()}${chatTitle.slice(1)}`;
+
+	return (
+		<div className="relative flex h-full flex-col">
+			<div className="relative flex min-h-0 flex-1 overflow-hidden">
+				<div className="flex min-h-0 flex-1 flex-col overflow-hidden">
+					<TopBar.Title>
+						<div className="flex min-w-0 items-center gap-2.5">
+							<Avatar
+								alt="Databunny avatar"
+								className="size-6 shrink-0 rounded"
+								fallback="DB"
+								src="/databunny.webp"
+							/>
+							<div className="flex min-w-0 flex-1 items-center gap-2">
+								<h1 className="shrink-0 truncate font-semibold text-foreground text-sm">
+									Databunny
+								</h1>
+								{titleSlot}
+								{!showChatTitle && (
+									<span className="shrink-0 rounded border border-border/60 px-1.5 py-px font-medium text-[10px] text-muted-foreground uppercase">
+										Alpha
+									</span>
+								)}
+								{isChatMetaPending ? (
+									<>
+										<span aria-hidden className="mx-1 h-4 w-px bg-border/60" />
+										<span
+											aria-hidden
+											className="h-3.5 min-w-[5rem] max-w-[min(40vw,12rem)] animate-pulse rounded bg-muted"
+										/>
+									</>
+								) : (
+									showChatTitle && (
+										<>
+											<span
+												aria-hidden
+												className="mx-1 h-4 w-px bg-border/60"
+											/>
+											<p
+												className="min-w-0 truncate font-medium text-sm"
+												title={chatTitleDisplayed}
+											>
+												{chatTitleDisplayed}
+											</p>
+										</>
+									)
+								)}
+							</div>
+						</div>
+					</TopBar.Title>
+					<TopBar.Actions>
+						<AgentCreditBalance />
+						<span aria-hidden className="mx-1 h-4 w-px bg-border/60" />
+						<Tooltip content="Chat History">
+							<div className="inline-flex max-w-full">
+								<ChatHistory
+									onCurrentChatDeleted={onCurrentChatDeleted}
+									onSelectChat={onSelectChat}
+									organizationId={organizationId}
+								/>
+							</div>
+						</Tooltip>
+						<NewChatButton onNewChat={onNewChat} />
+					</TopBar.Actions>
+
+					<AgentChatSurface
+						autoSendPromptFromUrl
+						chatId={chatId}
+						defaultWebsiteId={defaultWebsiteId}
+						organizationId={organizationId}
+					/>
+				</div>
+			</div>
+		</div>
+	);
+}
diff --git a/apps/dashboard/components/agent/chat-history.tsx b/apps/dashboard/components/agent/chat-history.tsx
index fa3d6ece6..733250db1 100644
--- a/apps/dashboard/components/agent/chat-history.tsx
+++ b/apps/dashboard/components/agent/chat-history.tsx
@@ -1,10 +1,9 @@
 "use client";
 
-import { useParams, useRouter } from "next/navigation";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { useChatSafe } from "@/contexts/chat-context";
 import { cn } from "@/lib/utils";
-import { clearLastChatId, useChatList } from "./hooks/use-chat-db";
+import { useChatList } from "./hooks/use-chat-db";
 import {
 	ChatTextIcon,
 	CheckIcon,
@@ -20,16 +19,16 @@ import { Button, Input, dayjs } from "@databuddy/ui";
 type Chat = ReturnType<typeof useChatList>["chats"][number];
 
 interface ChatHistoryProps {
-	onCurrentChatDeleted?: (nextChatId: string | null) => void;
-	onSelectChat?: (chatId: string) => void;
-	websiteId?: string | null;
+	onCurrentChatDeleted: (nextChatId: string | null) => void;
+	onSelectChat: (chatId: string) => void;
+	organizationId?: string | null;
 }
 
 export function ChatHistory({
 	onCurrentChatDeleted,
 	onSelectChat,
-	websiteId,
-}: ChatHistoryProps = {}) {
+	organizationId,
+}: ChatHistoryProps) {
 	const [open, setOpen] = useState(false);
 	const [query, setQuery] = useState("");
 	const [editingId, setEditingId] = useState<string | null>(null);
@@ -37,13 +36,9 @@ export function ChatHistory({
 		id: string;
 		title: string;
 	} | null>(null);
-	const params = useParams();
-	const router = useRouter();
-	const routeWebsiteId = typeof params.id === "string" ? params.id : null;
-	const resolvedWebsiteId = websiteId ?? routeWebsiteId;
 	const currentChatId = useChatSafe()?.id ?? null;
 	const { chats, isLoading, removeChat, renameChat } =
-		useChatList(resolvedWebsiteId);
+		useChatList(organizationId);
 
 	const filtered = useMemo(() => {
 		const q = query.trim().toLowerCase();
@@ -62,45 +57,23 @@ export function ChatHistory({
 
 	const handleSelectChat = (chatId: string) => {
 		setOpen(false);
-		if (onSelectChat) {
-			onSelectChat(chatId);
-			return;
-		}
-		if (resolvedWebsiteId) {
-			router.push(`/websites/${resolvedWebsiteId}/agent/${chatId}`);
-		}
+		onSelectChat(chatId);
 	};
 
 	const handleConfirmDelete = () => {
 		if (!pendingDelete) {
 			return;
 		}
-		if (!resolvedWebsiteId) {
-			setPendingDelete(null);
-			return;
-		}
 		const chatId = pendingDelete.id;
 		removeChat(chatId);
 		setPendingDelete(null);
 
-		if (chatId === currentChatId) {
-			const nextChat = chats.find((c) => c.id !== chatId);
-			const nextChatId = nextChat?.id ?? null;
-			if (nextChatId) {
-				if (onCurrentChatDeleted) {
-					onCurrentChatDeleted(nextChatId);
-				} else {
-					router.push(`/websites/${resolvedWebsiteId}/agent/${nextChatId}`);
-				}
-			} else {
-				clearLastChatId(resolvedWebsiteId);
-				if (onCurrentChatDeleted) {
-					onCurrentChatDeleted(null);
-				} else {
-					router.push(`/websites/${resolvedWebsiteId}/agent`);
-				}
-			}
+		if (chatId !== currentChatId) {
+			return;
 		}
+
+		const nextChat = chats.find((c) => c.id !== chatId);
+		onCurrentChatDeleted(nextChat?.id ?? null);
 	};
 
 	const handleRename = (id: string, title: string) => {
@@ -141,10 +114,10 @@ export function ChatHistory({
 					</div>
 					<div className="max-h-72 overflow-y-auto">
 						{(() => {
-							if (!resolvedWebsiteId) {
+							if (!organizationId) {
 								return (
 									<div className="p-4 text-center text-muted-foreground text-xs">
-										Open a website to view chats
+										No active workspace
 									</div>
 								);
 							}
diff --git a/apps/dashboard/components/agent/global-agent-provider.tsx b/apps/dashboard/components/agent/global-agent-provider.tsx
index 4465be4f3..51981a65e 100644
--- a/apps/dashboard/components/agent/global-agent-provider.tsx
+++ b/apps/dashboard/components/agent/global-agent-provider.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { generateId } from "ai";
-import { usePathname } from "next/navigation";
 import {
 	createContext,
 	type ReactNode,
@@ -11,164 +10,71 @@ import {
 	useMemo,
 	useState,
 } from "react";
+import { useOrganizationsContext } from "@/components/providers/organizations-provider";
 import { type Website, useWebsitesLight } from "@/hooks/use-websites";
 import { getLastChatId, setLastChatId } from "./hooks/use-chat-db";
 
-const GLOBAL_AGENT_WEBSITE_KEY = "databuddy-global-agent-website";
-const WEBSITE_PATH_REGEX = /^\/websites\/([^/]+)/;
-const AGENT_PATH_REGEX = /^\/websites\/[^/]+\/agent(?:\/|$)/;
-
 interface GlobalAgentContextValue {
 	chatId: string | null;
-	isAgentRoute: boolean;
-	isAvailable: boolean;
-	isLoadingWebsites: boolean;
+	hasWebsites: boolean;
+	isLoading: boolean;
 	loadChat: (chatId: string) => void;
 	newChat: () => void;
-	selectWebsite: (websiteId: string) => void;
-	websiteId: string | null;
+	organizationId: string | null;
 	websites: Website[];
 }
 
 const GlobalAgentContext = createContext<GlobalAgentContextValue | null>(null);
 
-function getWebsiteIdFromPathname(pathname: string): string | null {
-	const match = pathname.match(WEBSITE_PATH_REGEX);
-	if (!match?.[1]) {
-		return null;
-	}
-
-	try {
-		return decodeURIComponent(match[1]);
-	} catch {
-		return match[1];
-	}
-}
-
-function getStoredWebsiteId(): string | null {
-	try {
-		return window.localStorage.getItem(GLOBAL_AGENT_WEBSITE_KEY);
-	} catch {
-		return null;
-	}
-}
-
-function storeWebsiteId(websiteId: string) {
-	try {
-		window.localStorage.setItem(GLOBAL_AGENT_WEBSITE_KEY, websiteId);
-	} catch {}
-}
-
 export function GlobalAgentProvider({ children }: { children: ReactNode }) {
-	const pathname = usePathname();
-	const routeWebsiteId = getWebsiteIdFromPathname(pathname);
-	const isAgentRoute = AGENT_PATH_REGEX.test(pathname);
-	const isAvailable = !isAgentRoute;
-	const { websites, isLoading: isLoadingWebsites } = useWebsitesLight({
-		enabled: isAvailable,
-	});
+	const { activeOrganizationId, isLoading: isLoadingOrg } =
+		useOrganizationsContext();
+	const { websites, isLoading: isLoadingWebsites } = useWebsitesLight();
 	const [chatId, setChatId] = useState<string | null>(null);
-	const [storedWebsiteId, setStoredWebsiteId] = useState<string | null>(null);
-
-	const storedWebsiteIsValid = storedWebsiteId
-		? websites.length === 0 ||
-			websites.some((site) => site.id === storedWebsiteId)
-		: false;
-	const websiteId =
-		routeWebsiteId ??
-		(storedWebsiteIsValid ? storedWebsiteId : null) ??
-		websites[0]?.id ??
-		null;
-
-	useEffect(() => {
-		setStoredWebsiteId(getStoredWebsiteId());
-	}, []);
-
-	useEffect(() => {
-		if (routeWebsiteId) {
-			setStoredWebsiteId(routeWebsiteId);
-			storeWebsiteId(routeWebsiteId);
-		}
-	}, [routeWebsiteId]);
 
 	useEffect(() => {
-		if (routeWebsiteId || isLoadingWebsites || websites.length === 0) {
-			return;
-		}
-		if (
-			storedWebsiteId &&
-			websites.some((site) => site.id === storedWebsiteId)
-		) {
-			return;
-		}
-		const fallbackWebsiteId = websites[0]?.id;
-		if (!fallbackWebsiteId) {
-			return;
-		}
-		setStoredWebsiteId(fallbackWebsiteId);
-		storeWebsiteId(fallbackWebsiteId);
-	}, [isLoadingWebsites, routeWebsiteId, storedWebsiteId, websites]);
-
-	useEffect(() => {
-		if (!websiteId) {
+		if (!activeOrganizationId) {
 			setChatId(null);
 			return;
 		}
-
-		const nextChatId = getLastChatId(websiteId) ?? generateId();
-		setLastChatId(websiteId, nextChatId);
+		const nextChatId = getLastChatId(activeOrganizationId) ?? generateId();
+		setLastChatId(activeOrganizationId, nextChatId);
 		setChatId(nextChatId);
-	}, [websiteId]);
-
-	const selectWebsite = useCallback((nextWebsiteId: string) => {
-		setStoredWebsiteId(nextWebsiteId);
-		storeWebsiteId(nextWebsiteId);
-
-		const nextChatId = getLastChatId(nextWebsiteId) ?? generateId();
-		setLastChatId(nextWebsiteId, nextChatId);
-		setChatId(nextChatId);
-	}, []);
+	}, [activeOrganizationId]);
 
 	const loadChat = useCallback(
 		(nextChatId: string) => {
-			if (!websiteId) {
+			if (!activeOrganizationId) {
 				return;
 			}
-			setLastChatId(websiteId, nextChatId);
+			setLastChatId(activeOrganizationId, nextChatId);
 			setChatId(nextChatId);
 		},
-		[websiteId]
+		[activeOrganizationId]
 	);
 
 	const newChat = useCallback(() => {
-		if (!websiteId) {
-			return;
-		}
 		loadChat(generateId());
-	}, [loadChat, websiteId]);
+	}, [loadChat]);
 
 	const value = useMemo(
 		(): GlobalAgentContextValue => ({
 			chatId,
-			isAgentRoute,
-			isAvailable,
-			isLoadingWebsites,
+			hasWebsites: websites.length > 0,
+			isLoading: isLoadingOrg || isLoadingWebsites,
 			loadChat,
 			newChat,
-			selectWebsite,
-			websiteId,
+			organizationId: activeOrganizationId,
 			websites,
 		}),
 		[
 			chatId,
-			isAgentRoute,
-			isAvailable,
+			websites,
+			isLoadingOrg,
 			isLoadingWebsites,
 			loadChat,
 			newChat,
-			selectWebsite,
-			websiteId,
-			websites,
+			activeOrganizationId,
 		]
 	);
 
diff --git a/apps/dashboard/components/agent/hooks/use-agent-chat.ts b/apps/dashboard/components/agent/hooks/use-agent-chat.ts
index f89259445..8439d4ea5 100644
--- a/apps/dashboard/components/agent/hooks/use-agent-chat.ts
+++ b/apps/dashboard/components/agent/hooks/use-agent-chat.ts
@@ -6,17 +6,28 @@ import { DefaultChatTransport, type UIMessage } from "ai";
 import { useAtomValue } from "jotai";
 import { useMemo, useRef } from "react";
 import { normalizeAIComponentMessages } from "@/lib/ai-components/message-parts";
-import { agentThinkingAtom, agentTierAtom } from "../agent-atoms";
+import {
+	agentMentionsAtom,
+	agentThinkingAtom,
+	agentTierAtom,
+} from "../agent-atoms";
 
 const API_URL = publicConfig.urls.api;
 
-export function useAgentChatTransport(chatId: string, websiteId: string) {
+export function useAgentChatTransport(
+	chatId: string,
+	organizationId: string | null,
+	defaultWebsiteId?: string
+) {
 	const thinking = useAtomValue(agentThinkingAtom);
 	const tier = useAtomValue(agentTierAtom);
+	const mentions = useAtomValue(agentMentionsAtom);
 	const thinkingRef = useRef(thinking);
 	const tierRef = useRef(tier);
+	const mentionsRef = useRef(mentions);
 	thinkingRef.current = thinking;
 	tierRef.current = tier;
+	mentionsRef.current = mentions;
 
 	return useMemo(
 		() =>
@@ -30,7 +41,9 @@ export function useAgentChatTransport(chatId: string, websiteId: string) {
 					return {
 						body: {
 							id: chatId,
-							websiteId,
+							organizationId,
+							websiteId: defaultWebsiteId,
+							mentions: mentionsRef.current.map((m) => m.id),
 							messages: normalizedMessages,
 							timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
 							thinking: thinkingRef.current,
@@ -45,6 +58,6 @@ export function useAgentChatTransport(chatId: string, websiteId: string) {
 					};
 				},
 			}),
-		[chatId, websiteId]
+		[chatId, organizationId, defaultWebsiteId]
 	);
 }
diff --git a/apps/dashboard/components/agent/hooks/use-chat-db.ts b/apps/dashboard/components/agent/hooks/use-chat-db.ts
index 8deaeb102..895520dc3 100644
--- a/apps/dashboard/components/agent/hooks/use-chat-db.ts
+++ b/apps/dashboard/components/agent/hooks/use-chat-db.ts
@@ -4,8 +4,8 @@ import { orpc } from "@/lib/orpc";
 
 const LAST_CHAT_PREFIX = "databunny-last-chat";
 
-function lastChatKey(websiteId: string): string {
-	return `${LAST_CHAT_PREFIX}:${websiteId}`;
+function lastChatKey(scopeKey: string): string {
+	return `${LAST_CHAT_PREFIX}:${scopeKey}`;
 }
 
 function safeGetItem(key: string): string | null {
@@ -34,40 +34,39 @@ function safeRemoveItem(key: string): void {
 	} catch {}
 }
 
-export function getLastChatId(websiteId: string): string | null {
-	return safeGetItem(lastChatKey(websiteId));
+export function getLastChatId(scopeKey: string): string | null {
+	return safeGetItem(lastChatKey(scopeKey));
 }
 
-export function setLastChatId(websiteId: string, chatId: string): void {
+export function setLastChatId(scopeKey: string, chatId: string): void {
 	if (!chatId || typeof chatId !== "string" || chatId.trim() === "") {
 		return;
 	}
-	safeSetItem(lastChatKey(websiteId), chatId);
+	safeSetItem(lastChatKey(scopeKey), chatId);
 }
 
-export function clearLastChatId(websiteId: string): void {
-	safeRemoveItem(lastChatKey(websiteId));
+export function clearLastChatId(scopeKey: string): void {
+	safeRemoveItem(lastChatKey(scopeKey));
 }
 
-export function useChatList(websiteId: string | null | undefined) {
+export function useChatList(organizationId: string | null | undefined) {
 	const queryClient = useQueryClient();
-	const queryWebsiteId = websiteId ?? "";
 
 	const { data, isLoading } = useQuery({
 		...orpc.agentChats.list.queryOptions({
-			input: { websiteId: queryWebsiteId },
+			input: { organizationId },
 		}),
-		enabled: Boolean(websiteId),
+		enabled: Boolean(organizationId),
 	});
 
 	const invalidate = useCallback(() => {
-		if (!websiteId) {
+		if (!organizationId) {
 			return;
 		}
 		queryClient.invalidateQueries({
-			queryKey: orpc.agentChats.list.key({ input: { websiteId } }),
+			queryKey: orpc.agentChats.list.key({ input: { organizationId } }),
 		});
-	}, [queryClient, websiteId]);
+	}, [queryClient, organizationId]);
 
 	const deleteMutation = useMutation({
 		...orpc.agentChats.delete.mutationOptions(),
diff --git a/apps/dashboard/components/agent/new-chat-button.tsx b/apps/dashboard/components/agent/new-chat-button.tsx
index 322357c2f..8a2368a49 100644
--- a/apps/dashboard/components/agent/new-chat-button.tsx
+++ b/apps/dashboard/components/agent/new-chat-button.tsx
@@ -1,37 +1,18 @@
 "use client";
 
 import { generateId } from "ai";
-import { useParams, useRouter } from "next/navigation";
 import { cn } from "@/lib/utils";
 import { PlusIcon } from "@databuddy/ui/icons";
 import { Button } from "@databuddy/ui";
 
 interface NewChatButtonProps {
 	className?: string;
-	onNewChat?: (chatId: string) => void;
-	websiteId?: string | null;
+	onNewChat: (chatId: string) => void;
 }
 
-export function NewChatButton({
-	className,
-	onNewChat,
-	websiteId,
-}: NewChatButtonProps) {
-	const router = useRouter();
-	const { id } = useParams();
-	const resolvedWebsiteId = websiteId ?? (typeof id === "string" ? id : null);
-
-	if (!resolvedWebsiteId) {
-		return null;
-	}
-
+export function NewChatButton({ className, onNewChat }: NewChatButtonProps) {
 	const handleNewChat = () => {
-		const newChatId = generateId();
-		if (onNewChat) {
-			onNewChat(newChatId);
-			return;
-		}
-		router.push(`/websites/${resolvedWebsiteId}/agent/${newChatId}`);
+		onNewChat(generateId());
 	};
 
 	return (
diff --git a/apps/dashboard/components/layout/navigation/navigation-config.tsx b/apps/dashboard/components/layout/navigation/navigation-config.tsx
index 9198e2b35..2001378a6 100644
--- a/apps/dashboard/components/layout/navigation/navigation-config.tsx
+++ b/apps/dashboard/components/layout/navigation/navigation-config.tsx
@@ -59,6 +59,10 @@ export const mainNavigation: NavigationGroup[] = [
 			createNavItem("Home", HouseIcon, "/home"),
 			createNavItem("Websites", GlobeIcon, "/websites"),
 			createNavItem("Insights", LightbulbIcon, "/insights"),
+			createNavItem("Databunny", RobotIcon, "/agent", {
+				activeMatch: "prefix",
+				alpha: true,
+			}),
 		],
 	},
 	{
diff --git a/apps/dashboard/contexts/chat-context.tsx b/apps/dashboard/contexts/chat-context.tsx
index 19aca35ce..e5f89ddde 100644
--- a/apps/dashboard/contexts/chat-context.tsx
+++ b/apps/dashboard/contexts/chat-context.tsx
@@ -66,14 +66,20 @@ const isBusy = (c: ChatApi) =>
 
 export function ChatProvider({
 	chatId,
-	websiteId,
+	organizationId,
+	defaultWebsiteId,
 	children,
 }: {
 	chatId: string;
-	websiteId: string;
+	organizationId: string | null;
+	defaultWebsiteId?: string;
 	children: React.ReactNode;
 }) {
-	const transport = useAgentChatTransport(chatId, websiteId);
+	const transport = useAgentChatTransport(
+		chatId,
+		organizationId,
+		defaultWebsiteId
+	);
 	const queryClient = useQueryClient();
 	const chatRef = useRef<ChatApi>(null as unknown as ChatApi);
 
@@ -183,7 +189,7 @@ export function ChatProvider({
 		}
 
 		queryClient.invalidateQueries({
-			queryKey: orpc.agentChats.list.key({ input: { websiteId } }),
+			queryKey: orpc.agentChats.list.key({ input: { organizationId } }),
 		});
 		queryClient.invalidateQueries({
 			queryKey: orpc.agentChats.get.key({ input: { id: chatId } }),
@@ -196,7 +202,7 @@ export function ChatProvider({
 		pendingRef.current = rest;
 		syncQueue();
 		chat.sendMessage({ text: next }).catch(() => undefined);
-	}, [chat.status, chat, syncQueue, queryClient, websiteId]);
+	}, [chat.status, chat, syncQueue, queryClient, organizationId]);
 
 	const chatValue = useMemo(
 		(): ChatApi => ({ ...chat, sendMessage, stop }),
diff --git a/apps/dashboard/lib/formatters.ts b/apps/dashboard/lib/formatters.ts
index 1ee5c7161..bb88c00c0 100644
--- a/apps/dashboard/lib/formatters.ts
+++ b/apps/dashboard/lib/formatters.ts
@@ -4,7 +4,7 @@ export const formatNumber = (value: number | null | undefined): string => {
 	if (value == null || Number.isNaN(value)) {
 		return "0";
 	}
-	return Intl.NumberFormat(undefined, {
+	return Intl.NumberFormat("en-US", {
 		notation: "compact",
 		maximumFractionDigits: 1,
 	}).format(value);
diff --git a/apps/dashboard/next.config.ts b/apps/dashboard/next.config.ts
index b63c04bbe..515fae959 100644
--- a/apps/dashboard/next.config.ts
+++ b/apps/dashboard/next.config.ts
@@ -94,6 +94,7 @@ const nextConfig: NextConfig = {
 			"'self'",
 			"'unsafe-inline'",
 			isDev && "'unsafe-eval'",
+			"'wasm-unsafe-eval'",
 			"https://cdn.databuddy.cc"
 		);
 
diff --git a/apps/docs/app/(home)/pricing/_pricing/gated-feature-rows.tsx b/apps/docs/app/(home)/pricing/_pricing/gated-feature-rows.tsx
index dc362bbf9..61e31b156 100644
--- a/apps/docs/app/(home)/pricing/_pricing/gated-feature-rows.tsx
+++ b/apps/docs/app/(home)/pricing/_pricing/gated-feature-rows.tsx
@@ -108,16 +108,30 @@ const GATED_FEATURE_LINKS: Partial<Record<GatedFeatureId, string>> = {
 };
 
 interface PlatformFeature {
-	name: string;
 	description: string;
 	href?: string;
+	name: string;
 }
 
 const PLATFORM_FEATURES: PlatformFeature[] = [
-	{ name: "Uptime Monitoring", description: "Endpoint checks, alerts, and status pages", href: "/uptime" },
-	{ name: "Short Links", description: "Branded links with click analytics and deep linking", href: "/links" },
-	{ name: "Revenue Tracking", description: "Stripe and Paddle revenue attribution" },
-	{ name: "Alerts & Notifications", description: "Traffic, error, and anomaly alerts" },
+	{
+		name: "Uptime Monitoring",
+		description: "Endpoint checks, alerts, and status pages",
+		href: "/uptime",
+	},
+	{
+		name: "Short Links",
+		description: "Branded links with click analytics and deep linking",
+		href: "/links",
+	},
+	{
+		name: "Revenue Tracking",
+		description: "Stripe and Paddle revenue attribution",
+	},
+	{
+		name: "Alerts & Notifications",
+		description: "Traffic, error, and anomaly alerts",
+	},
 	{ name: "Team Members", description: "Unlimited seats on all plans" },
 	{ name: "Websites", description: "Unlimited websites on all plans" },
 	{ name: "API Access", description: "REST API with scoped API keys" },
@@ -167,7 +181,7 @@ function AllPlansCheckRow({
 				className="px-4 py-3 text-left font-normal text-muted-foreground text-sm sm:px-5 lg:px-6"
 				scope="row"
 			>
-				<FeatureLabel name={name} description={description} href={href} />
+				<FeatureLabel description={description} href={href} name={name} />
 			</th>
 			{plans.map((p) => (
 				<td className={planTdClassName(p.id)} key={`${name}-${p.id}`}>
@@ -210,7 +224,11 @@ export function GatedFeaturePricingRows({
 									className="px-4 py-3 text-left font-normal text-muted-foreground text-sm sm:px-5 lg:px-6"
 									scope="row"
 								>
-									<FeatureLabel name={meta.name} description={meta.description} href={href} />
+									<FeatureLabel
+										description={meta.description}
+										href={href}
+										name={meta.name}
+									/>
 								</th>
 								{plans.map((p) => (
 									<td
@@ -228,10 +246,10 @@ export function GatedFeaturePricingRows({
 						const href = GATED_FEATURE_LINKS[featureId];
 						return (
 							<AllPlansCheckRow
-								key={featureId}
-								name={meta.name}
 								description={meta.description}
 								href={href}
+								key={featureId}
+								name={meta.name}
 								plans={plans}
 								planTdClassName={planTdClassName}
 							/>
@@ -249,10 +267,10 @@ export function GatedFeaturePricingRows({
 			</tr>
 			{PLATFORM_FEATURES.map((feat) => (
 				<AllPlansCheckRow
-					key={feat.name}
-					name={feat.name}
 					description={feat.description}
 					href={feat.href}
+					key={feat.name}
+					name={feat.name}
 					plans={plans}
 					planTdClassName={planTdClassName}
 				/>
diff --git a/apps/docs/app/(home)/pricing/_pricing/table.tsx b/apps/docs/app/(home)/pricing/_pricing/table.tsx
index 295e82617..b32919c4e 100644
--- a/apps/docs/app/(home)/pricing/_pricing/table.tsx
+++ b/apps/docs/app/(home)/pricing/_pricing/table.tsx
@@ -300,9 +300,9 @@ export function PlansComparisonTable({ plans }: Props) {
 					questions, and surfaces insights automatically.
 				</p>
 				<p>
-					<span className="text-foreground">Unlimited seats & sites.</span>{" "}
-					Team members, websites, and API access are unlimited on every plan.
-					Overage is tiered with lower rates as volume increases.
+					<span className="text-foreground">Unlimited seats & sites.</span> Team
+					members, websites, and API access are unlimited on every plan. Overage
+					is tiered with lower rates as volume increases.
 				</p>
 			</div>
 		</section>
diff --git a/apps/insights/src/billing.test.ts b/apps/insights/src/billing.test.ts
new file mode 100644
index 000000000..f688c1396
--- /dev/null
+++ b/apps/insights/src/billing.test.ts
@@ -0,0 +1,91 @@
+import { describe, expect, it } from "bun:test";
+import {
+	type InsightsBillingDeps,
+	resolveInsightsBilling,
+} from "./billing";
+
+function makeDeps(
+	overrides: Partial<InsightsBillingDeps> & {
+		customerId?: string | null;
+		allowed?: boolean;
+	} = {}
+): {
+	deps: InsightsBillingDeps;
+	calls: {
+		resolveArgs: Parameters<InsightsBillingDeps["resolveBillingCustomerId"]>[0][];
+		ensureArgs: (string | null)[];
+	};
+} {
+	const calls = {
+		resolveArgs: [] as Parameters<
+			InsightsBillingDeps["resolveBillingCustomerId"]
+		>[0][],
+		ensureArgs: [] as (string | null)[],
+	};
+	const deps: InsightsBillingDeps = {
+		resolveBillingCustomerId:
+			overrides.resolveBillingCustomerId ??
+			((principal) => {
+				calls.resolveArgs.push(principal);
+				return Promise.resolve(overrides.customerId ?? null);
+			}),
+		ensureCreditsAvailable:
+			overrides.ensureCreditsAvailable ??
+			((id) => {
+				calls.ensureArgs.push(id);
+				return Promise.resolve(overrides.allowed ?? true);
+			}),
+	};
+	return { deps, calls };
+}
+
+describe("resolveInsightsBilling", () => {
+	it("allows and checks against null when there is no billing customer", async () => {
+		const { deps, calls } = makeDeps({ customerId: null, allowed: true });
+
+		const decision = await resolveInsightsBilling(
+			{ organizationId: "org_1", userId: "user_1" },
+			deps
+		);
+
+		expect(decision).toEqual({ allowed: true, billingCustomerId: null });
+		expect(calls.ensureArgs).toEqual([null]);
+	});
+
+	it("denies when the resolved customer is out of credits", async () => {
+		const { deps, calls } = makeDeps({ customerId: "cust_9", allowed: false });
+
+		const decision = await resolveInsightsBilling(
+			{ organizationId: "org_1", userId: "user_1" },
+			deps
+		);
+
+		expect(decision).toEqual({ allowed: false, billingCustomerId: "cust_9" });
+		expect(calls.ensureArgs).toEqual(["cust_9"]);
+	});
+
+	it("checks credits against the resolved customer id", async () => {
+		const { deps, calls } = makeDeps({ customerId: "cust_42", allowed: true });
+
+		const decision = await resolveInsightsBilling(
+			{ organizationId: "org_1", userId: "user_1" },
+			deps
+		);
+
+		expect(decision.billingCustomerId).toBe("cust_42");
+		expect(calls.ensureArgs).toEqual(["cust_42"]);
+	});
+
+	it("passes the principal through to customer resolution", async () => {
+		const { deps, calls } = makeDeps({ customerId: "cust_1" });
+
+		await resolveInsightsBilling(
+			{ organizationId: "org_7", userId: null },
+			deps
+		);
+
+		expect(calls.resolveArgs).toEqual([
+			{ organizationId: "org_7", userId: null },
+		]);
+	});
+});
diff --git a/apps/insights/src/billing.ts b/apps/insights/src/billing.ts
new file mode 100644
index 000000000..d1a56e365
--- /dev/null
+++ b/apps/insights/src/billing.ts
@@ -0,0 +1,36 @@
+import {
+	ensureAgentCreditsAvailable,
+	resolveAgentBillingCustomerId,
+} from "@databuddy/ai/agents/execution";
+
+export interface InsightsBillingDeps {
+	ensureCreditsAvailable: (
+		billingCustomerId: string | null
+	) => Promise<boolean>;
+	resolveBillingCustomerId: (principal: {
+		organizationId?: string | null;
+		userId?: string | null;
+	}) => Promise<string | null>;
+}
+
+export interface InsightsBillingDecision {
+	allowed: boolean;
+	billingCustomerId: string | null;
+}
+
+const defaultBillingDeps: InsightsBillingDeps = {
+	ensureCreditsAvailable: ensureAgentCreditsAvailable,
+	resolveBillingCustomerId: resolveAgentBillingCustomerId,
+};
+
+export async function resolveInsightsBilling(
+	principal: { organizationId: string; userId: string | null },
+	deps: InsightsBillingDeps = defaultBillingDeps
+): Promise<InsightsBillingDecision> {
+	const billingCustomerId = await deps.resolveBillingCustomerId({
+		organizationId: principal.organizationId,
+		userId: principal.userId,
+	});
+	const allowed = await deps.ensureCreditsAvailable(billingCustomerId);
+	return { allowed, billingCustomerId };
+}
diff --git a/apps/insights/src/detection.ts b/apps/insights/src/detection.ts
index e0b0039fd..980e5e968 100644
--- a/apps/insights/src/detection.ts
+++ b/apps/insights/src/detection.ts
@@ -104,6 +104,29 @@ const VITALS_METRICS: Record<string, string> = {
 	INP: "Interaction speed (INP)",
 };
 
+export interface WowWindow {
+	currentFrom: string;
+	currentTo: string;
+	previousFrom: string;
+	previousTo: string;
+}
+
+export function wowWindow(today: dayjs.Dayjs, lookbackDays: number): WowWindow {
+	const windowDays = Math.max(3, lookbackDays);
+	return {
+		currentFrom: today.subtract(windowDays - 1, "day").format("YYYY-MM-DD"),
+		currentTo: today.format("YYYY-MM-DD"),
+		previousFrom: today
+			.subtract(windowDays * 2 - 1, "day")
+			.format("YYYY-MM-DD"),
+		previousTo: today.subtract(windowDays, "day").format("YYYY-MM-DD"),
+	};
+}
+
+function round2(value: number): number {
+	return Number(value.toFixed(2));
+}
+
 type SignalFilter = (signal: DetectedSignal) => boolean;
 
 const METRIC_FILTERS: Record<string, SignalFilter> = {
@@ -124,12 +147,13 @@ const DEFAULT_TRAFFIC_FILTER: SignalFilter = (s) =>
 	Math.max(s.current, s.baseline) >= FILTER_TRAFFIC_MIN_PEAK &&
 	Math.abs(s.current - s.baseline) >= FILTER_TRAFFIC_MIN_DELTA;
 
-function makeWowSignal(
+export function makeWowSignal(
 	metric: string,
 	label: string,
 	current: number,
 	baseline: number,
-	detectedAt: string
+	detectedAt: string,
+	round = false
 ): DetectedSignal {
 	const pct = baseline === 0 ? 100 : safeDeltaPercent(current, baseline);
 	return {
@@ -137,9 +161,9 @@ function makeWowSignal(
 		label,
 		method: "wow",
 		direction: current > baseline ? "up" : "down",
-		current,
-		baseline,
-		deltaPercent: Number(pct.toFixed(2)),
+		current: round ? round2(current) : current,
+		baseline: round ? round2(baseline) : baseline,
+		deltaPercent: round2(pct),
 		severity: assignSeverity(undefined, pct),
 		detectedAt,
 	};
@@ -371,16 +395,10 @@ async function detectWow(
 	queryFn: QueryFn
 ): Promise<DetectedSignal[]> {
 	const { websiteId, lookbackDays, timezone } = params;
-	const windowDays = Math.max(3, lookbackDays);
-
-	const currentFrom = today
-		.subtract(windowDays - 1, "day")
-		.format("YYYY-MM-DD");
-	const currentTo = today.format("YYYY-MM-DD");
-	const previousFrom = today
-		.subtract(windowDays * 2 - 1, "day")
-		.format("YYYY-MM-DD");
-	const previousTo = today.subtract(windowDays, "day").format("YYYY-MM-DD");
+	const { currentFrom, currentTo, previousFrom, previousTo } = wowWindow(
+		today,
+		lookbackDays
+	);
 
 	function query(type: string, from: string, to: string) {
 		return queryFn(
diff --git a/apps/insights/src/enrichment.ts b/apps/insights/src/enrichment.ts
index 602da8b6e..5880fe46d 100644
--- a/apps/insights/src/enrichment.ts
+++ b/apps/insights/src/enrichment.ts
@@ -6,6 +6,7 @@ import {
 	safeDeltaPercent,
 	type DetectedSignal,
 	type QueryFn,
+	wowWindow,
 } from "./detection";
 
 export interface SegmentMover {
@@ -125,17 +126,7 @@ function computeWindow(
 		};
 	}
 
-	const windowDays = Math.max(3, lookbackDays);
-	return {
-		currentFrom: detectedDay
-			.subtract(windowDays - 1, "day")
-			.format("YYYY-MM-DD"),
-		currentTo: detectedDay.format("YYYY-MM-DD"),
-		previousFrom: detectedDay
-			.subtract(windowDays * 2 - 1, "day")
-			.format("YYYY-MM-DD"),
-		previousTo: detectedDay.subtract(windowDays, "day").format("YYYY-MM-DD"),
-	};
+	return wowWindow(detectedDay, lookbackDays);
 }
 
 function queryPeriodPair(
diff --git a/apps/insights/src/funnel-detection.test.ts b/apps/insights/src/funnel-detection.test.ts
new file mode 100644
index 000000000..5e21020ef
--- /dev/null
+++ b/apps/insights/src/funnel-detection.test.ts
@@ -0,0 +1,178 @@
+import { describe, expect, it } from "bun:test";
+import dayjs from "dayjs";
+import type { DetectSignalsParams } from "./detection";
+import {
+	detectFunnelGoalSignals,
+	type FunnelDef,
+	type FunnelGoalDeps,
+	type GoalDef,
+} from "./funnel-detection";
+
+const TODAY = dayjs("2026-05-29");
+
+const PARAMS: DetectSignalsParams = {
+	websiteId: "test-site",
+	lookbackDays: 7,
+	timezone: "UTC",
+};
+
+const FUNNEL: FunnelDef = {
+	id: "f1",
+	name: "Checkout",
+	steps: [
+		{ name: "View", target: "/cart", type: "PAGE_VIEW" },
+		{ name: "Buy", target: "purchase", type: "EVENT" },
+	],
+	filters: null,
+};
+
+const GOAL: GoalDef = {
+	id: "g1",
+	name: "Signup",
+	type: "EVENT",
+	target: "sign_up",
+	filters: null,
+};
+
+function makeDeps(overrides: Partial<FunnelGoalDeps>): FunnelGoalDeps {
+	return {
+		fetchFunnels: async () => [],
+		fetchGoals: async () => [],
+		funnelConversion: async () => ({ rate: 0, entrants: 0 }),
+		goalConversion: async () => ({ rate: 0, completions: 0 }),
+		...overrides,
+	};
+}
+
+describe("detectFunnelGoalSignals", () => {
+	it("returns empty when nothing is configured", async () => {
+		const signals = await detectFunnelGoalSignals(PARAMS, TODAY, makeDeps({}));
+		expect(signals).toEqual([]);
+	});
+
+	it("flags a funnel conversion drop above threshold", async () => {
+		let call = 0;
+		const deps = makeDeps({
+			fetchFunnels: async () => [FUNNEL],
+			funnelConversion: async () => {
+				call += 1;
+				return call === 1
+					? { rate: 10, entrants: 100 }
+					: { rate: 20, entrants: 120 };
+			},
+		});
+
+		const signals = await detectFunnelGoalSignals(PARAMS, TODAY, deps);
+
+		expect(signals.length).toBe(1);
+		const signal = signals[0];
+		expect(signal.metric).toBe("funnel:f1");
+		expect(signal.direction).toBe("down");
+		expect(signal.deltaPercent).toBe(-50);
+		expect(signal.method).toBe("wow");
+		expect(signal.detectedAt).toBe("2026-05-29");
+	});
+
+	it("flags a funnel conversion rise above threshold", async () => {
+		let call = 0;
+		const deps = makeDeps({
+			fetchFunnels: async () => [FUNNEL],
+			funnelConversion: async () => {
+				call += 1;
+				return call === 1
+					? { rate: 20, entrants: 120 }
+					: { rate: 10, entrants: 100 };
+			},
+		});
+
+		const signals = await detectFunnelGoalSignals(PARAMS, TODAY, deps);
+
+		expect(signals.length).toBe(1);
+		expect(signals[0].direction).toBe("up");
+		expect(signals[0].deltaPercent).toBe(100);
+	});
+
+	it("ignores funnel changes below threshold", async () => {
+		let call = 0;
+		const deps = makeDeps({
+			fetchFunnels: async () => [FUNNEL],
+			funnelConversion: async () => {
+				call += 1;
+				return call === 1
+					? { rate: 18, entrants: 100 }
+					: { rate: 20, entrants: 100 };
+			},
+		});
+
+		const signals = await detectFunnelGoalSignals(PARAMS, TODAY, deps);
+		expect(signals.length).toBe(0);
+	});
+
+	it("ignores funnels with too few entrants", async () => {
+		let call = 0;
+		const deps = makeDeps({
+			fetchFunnels: async () => [FUNNEL],
+			funnelConversion: async () => {
+				call += 1;
+				return call === 1
+					? { rate: 10, entrants: 10 }
+					: { rate: 40, entrants: 8 };
+			},
+		});
+
+		const signals = await detectFunnelGoalSignals(PARAMS, TODAY, deps);
+		expect(signals.length).toBe(0);
+	});
+
+	it("flags a goal completion-rate drop above threshold", async () => {
+		let call = 0;
+		const deps = makeDeps({
+			fetchGoals: async () => [GOAL],
+			goalConversion: async () => {
+				call += 1;
+				return call === 1
+					? { rate: 2.5, completions: 50 }
+					: { rate: 5, completions: 100 };
+			},
+		});
+
+		const signals = await detectFunnelGoalSignals(PARAMS, TODAY, deps);
+
+		expect(signals.length).toBe(1);
+		expect(signals[0].metric).toBe("goal:g1");
+		expect(signals[0].direction).toBe("down");
+		expect(signals[0].deltaPercent).toBe(-50);
+	});
+
+	it("ignores goals with too few completions", async () => {
+		let call = 0;
+		const deps = makeDeps({
+			fetchGoals: async () => [GOAL],
+			goalConversion: async () => {
+				call += 1;
+				return call === 1
+					? { rate: 1, completions: 3 }
+					: { rate: 4, completions: 2 };
+			},
+		});
+
+		const signals = await detectFunnelGoalSignals(PARAMS, TODAY, deps);
+		expect(signals.length).toBe(0);
+	});
+
+	it("passes the correct week-over-week windows to the analytics deps", async () => {
+		const ranges: Array<{ from: string; to: string }> = [];
+		const deps = makeDeps({
+			fetchFunnels: async () => [FUNNEL],
+			funnelConversion: async (_funnel, range) => {
+				ranges.push(range);
+				return { rate: 10, entrants: 100 };
+			},
+		});
+
+		await detectFunnelGoalSignals(PARAMS, TODAY, deps);
+
+		expect(ranges).toContainEqual({ from: "2026-05-23", to: "2026-05-29" });
+		expect(ranges).toContainEqual({ from: "2026-05-16", to: "2026-05-22" });
+	});
+});
diff --git a/apps/insights/src/funnel-detection.ts b/apps/insights/src/funnel-detection.ts
new file mode 100644
index 000000000..d58558d7b
--- /dev/null
+++ b/apps/insights/src/funnel-detection.ts
@@ -0,0 +1,258 @@
+import { and, db, eq, isNull, sql } from "@databuddy/db";
+import {
+	type DataFilter,
+	funnelDefinitions,
+	type FunnelStep,
+	goals,
+} from "@databuddy/db/schema";
+import {
+	type AnalyticsStep,
+	getTotalWebsiteUsers,
+	processFunnelAnalytics,
+	processGoalAnalytics,
+} from "@databuddy/rpc/analytics-utils";
+import dayjs from "dayjs";
+import {
+	type DetectedSignal,
+	type DetectSignalsParams,
+	makeWowSignal,
+	safeDeltaPercent,
+	wowWindow,
+} from "./detection";
+
+const FUNNEL_CONVERSION_WOW_THRESHOLD = 20;
+const FUNNEL_MIN_ENTRANTS = 30;
+const GOAL_CONVERSION_WOW_THRESHOLD = 20;
+const GOAL_MIN_COMPLETIONS = 10;
+const MAX_DEFINITIONS = 10;
+
+export interface FunnelDef {
+	filters: DataFilter[] | null;
+	id: string;
+	name: string;
+	steps: FunnelStep[];
+}
+
+export interface GoalDef {
+	filters: DataFilter[] | null;
+	id: string;
+	name: string;
+	target: string;
+	type: "PAGE_VIEW" | "EVENT" | "CUSTOM";
+}
+
+export interface PeriodRange {
+	from: string;
+	to: string;
+}
+
+export interface FunnelConversion {
+	entrants: number;
+	rate: number;
+}
+
+export interface GoalConversion {
+	completions: number;
+	rate: number;
+}
+
+export interface FunnelGoalDeps {
+	fetchFunnels: () => Promise<FunnelDef[]>;
+	fetchGoals: () => Promise<GoalDef[]>;
+	funnelConversion: (
+		funnel: FunnelDef,
+		range: PeriodRange
+	) => Promise<FunnelConversion>;
+	goalConversion: (
+		goal: GoalDef,
+		range: PeriodRange
+	) => Promise<GoalConversion>;
+}
+
+function toAnalyticsSteps(steps: FunnelStep[]): AnalyticsStep[] {
+	return steps.map((step, index) => ({
+		step_number: index + 1,
+		type: step.type === "PAGE_VIEW" ? "PAGE_VIEW" : "EVENT",
+		target: step.target,
+		name: step.name,
+	}));
+}
+
+export function defaultFunnelGoalDeps(websiteId: string): FunnelGoalDeps {
+	return {
+		fetchFunnels: () =>
+			db
+				.select({
+					id: funnelDefinitions.id,
+					name: funnelDefinitions.name,
+					steps: funnelDefinitions.steps,
+					filters: funnelDefinitions.filters,
+				})
+				.from(funnelDefinitions)
+				.where(
+					and(
+						eq(funnelDefinitions.websiteId, websiteId),
+						eq(funnelDefinitions.isActive, true),
+						isNull(funnelDefinitions.deletedAt),
+						sql`jsonb_array_length(${funnelDefinitions.steps}) > 1`
+					)
+				)
+				.orderBy(funnelDefinitions.createdAt)
+				.limit(MAX_DEFINITIONS),
+		fetchGoals: () =>
+			db
+				.select({
+					id: goals.id,
+					name: goals.name,
+					type: goals.type,
+					target: goals.target,
+					filters: goals.filters,
+				})
+				.from(goals)
+				.where(
+					and(
+						eq(goals.websiteId, websiteId),
+						eq(goals.isActive, true),
+						isNull(goals.deletedAt)
+					)
+				)
+				.orderBy(goals.createdAt)
+				.limit(MAX_DEFINITIONS),
+		funnelConversion: async (funnel, range) => {
+			const analytics = await processFunnelAnalytics(
+				toAnalyticsSteps(funnel.steps),
+				funnel.filters ?? [],
+				{
+					websiteId,
+					startDate: range.from,
+					endDate: `${range.to} 23:59:59`,
+				}
+			);
+			return {
+				rate: analytics.overall_conversion_rate,
+				entrants: analytics.total_users_entered,
+			};
+		},
+		goalConversion: async (goal, range) => {
+			const steps: AnalyticsStep[] = [
+				{
+					step_number: 1,
+					type: goal.type === "PAGE_VIEW" ? "PAGE_VIEW" : "EVENT",
+					target: goal.target,
+					name: goal.name,
+				},
+			];
+			const totalWebsiteUsers = await getTotalWebsiteUsers(
+				websiteId,
+				range.from,
+				range.to
+			);
+			const analytics = await processGoalAnalytics(
+				steps,
+				goal.filters ?? [],
+				{
+					websiteId,
+					startDate: range.from,
+					endDate: `${range.to} 23:59:59`,
+				},
+				totalWebsiteUsers
+			);
+			return {
+				rate: analytics.overall_conversion_rate,
+				completions: analytics.total_users_completed,
+			};
+		},
+	};
+}
+
+export async function detectFunnelGoalSignals(
+	params: DetectSignalsParams,
+	today: dayjs.Dayjs = dayjs(),
+	deps: FunnelGoalDeps = defaultFunnelGoalDeps(params.websiteId)
+): Promise<DetectedSignal[]> {
+	const window = wowWindow(today, params.lookbackDays);
+	const current: PeriodRange = {
+		from: window.currentFrom,
+		to: window.currentTo,
+	};
+	const previous: PeriodRange = {
+		from: window.previousFrom,
+		to: window.previousTo,
+	};
+
+	const [funnels, goalDefs] = await Promise.all([
+		deps.fetchFunnels(),
+		deps.fetchGoals(),
+	]);
+
+	const funnelSignals = await Promise.all(
+		funnels.map(async (funnel) => {
+			try {
+				const [cur, prev] = await Promise.all([
+					deps.funnelConversion(funnel, current),
+					deps.funnelConversion(funnel, previous),
+				]);
+				if (
+					cur.entrants < FUNNEL_MIN_ENTRANTS ||
+					prev.entrants < FUNNEL_MIN_ENTRANTS ||
+					prev.rate <= 0
+				) {
+					return null;
+				}
+				if (
+					Math.abs(safeDeltaPercent(cur.rate, prev.rate)) <
+					FUNNEL_CONVERSION_WOW_THRESHOLD
+				) {
+					return null;
+				}
+				return makeWowSignal(
+					`funnel:${funnel.id}`,
+					`Funnel "${funnel.name}" conversion`,
+					cur.rate,
+					prev.rate,
+					current.to,
+					true
+				);
+			} catch {
+				return null;
+			}
+		})
+	);
+
+	const goalSignals = await Promise.all(
+		goalDefs.map(async (goal) => {
+			try {
+				const [cur, prev] = await Promise.all([
+					deps.goalConversion(goal, current),
+					deps.goalConversion(goal, previous),
+				]);
+				if (
+					Math.max(cur.completions, prev.completions) < GOAL_MIN_COMPLETIONS ||
+					prev.rate <= 0
+				) {
+					return null;
+				}
+				if (
+					Math.abs(safeDeltaPercent(cur.rate, prev.rate)) <
+					GOAL_CONVERSION_WOW_THRESHOLD
+				) {
+					return null;
+				}
+				return makeWowSignal(
+					`goal:${goal.id}`,
+					`Goal "${goal.name}" completion rate`,
+					cur.rate,
+					prev.rate,
+					current.to,
+					true
+				);
+			} catch {
+				return null;
+			}
+		})
+	);
+
+	return [...funnelSignals, ...goalSignals].filter(
+		(signal): signal is DetectedSignal => signal !== null
+	);
+}
diff --git a/apps/insights/src/generation.ts b/apps/insights/src/generation.ts
index b02742417..5a0d13d30 100644
--- a/apps/insights/src/generation.ts
+++ b/apps/insights/src/generation.ts
@@ -3,12 +3,9 @@ import {
 	ANTHROPIC_CACHE_1H,
 	createModelFromId,
 } from "@databuddy/ai/config/models";
-import { insightDedupeKey } from "@databuddy/ai/insights/dedupe";
+import { trackAgentUsageAndBill } from "@databuddy/ai/agents/execution";
 import { hasWebInsightData } from "@databuddy/ai/insights/fetch-context";
-import type {
-	InsightMetricRow,
-	WeekOverWeekPeriod,
-} from "@databuddy/ai/insights/types";
+import type { WeekOverWeekPeriod } from "@databuddy/ai/insights/types";
 import { validateInsights } from "@databuddy/ai/insights/validate";
 import { getAILogger } from "@databuddy/ai/lib/ai-logger";
 import { storeAnalyticsSummary } from "@databuddy/ai/lib/supermemory";
@@ -16,34 +13,26 @@ import type { ParsedInsight } from "@databuddy/ai/schemas/smart-insights-output"
 import { insightSchema } from "@databuddy/ai/schemas/smart-insights-output";
 import { createToolkit } from "@databuddy/ai/tools/toolkit";
 import { createInsightsAgentTools } from "@databuddy/ai/tools/insights-agent-tools";
+import { and, db, eq, isNull } from "@databuddy/db";
 import {
-	and,
-	db,
-	desc,
-	eq,
-	gte,
-	inArray,
-	isNotNull,
-	isNull,
-	sql,
-} from "@databuddy/db";
-import {
-	analyticsInsights,
 	type InsightGenerationConfigSnapshot,
 	type InsightGenerationTool,
 	websites,
 } from "@databuddy/db/schema";
-import {
-	invalidateAgentContextSnapshotsForWebsite,
-	invalidateInsightsCachesForOrganization,
-} from "@databuddy/redis";
 import { getCachedSiteContext } from "@databuddy/ai/tools/scrape-page";
 import { getOAuthToken } from "@databuddy/ai/tools/utils/oauth-token";
 import { stepCountIs, tool, ToolLoopAgent } from "ai";
 import { randomUUIDv7 } from "bun";
 import dayjs from "dayjs";
-import { detectSignals } from "./detection";
+import { resolveInsightsBilling } from "./billing";
+import { detectSignals, wowWindow } from "./detection";
+import { detectFunnelGoalSignals } from "./funnel-detection";
 import { enrichSignals, type EnrichedSignal } from "./enrichment";
+import {
+	type GeneratedWebsiteInsight,
+	maxInsights,
+	persistWebsiteInsights,
+} from "./persistence";
 import {
 	buildInvestigationPrompt,
 	buildSystemPrompt,
@@ -60,7 +49,6 @@ import {
 	setInsightsLog,
 } from "./lib/evlog-insights";
 
-const DEFAULT_MAX_INSIGHTS = 2;
 const TOOL_NAMES = [
 	"web_metrics",
 	"product_metrics",
@@ -78,13 +66,6 @@ const ALWAYS_ON_TOOLS = new Set([
 	"create_goal",
 ]);
 
-interface GeneratedWebsiteInsight extends ParsedInsight {
-	id: string;
-	websiteDomain: string;
-	websiteId: string;
-	websiteName: string | null;
-}
-
 export interface GenerateWebsiteInsightsInput {
 	config: InsightGenerationConfigSnapshot;
 	organizationId: string;
@@ -101,48 +82,42 @@ export interface GenerateWebsiteInsightsResult {
 	status: "skipped" | "succeeded";
 }
 
-function maxInsights(config: InsightGenerationConfigSnapshot): number {
-	return Math.max(
-		1,
-		Math.min(10, config.maxInsightsPerWebsite || DEFAULT_MAX_INSIGHTS)
-	);
-}
-
 function getComparisonPeriod(lookbackDays: number): WeekOverWeekPeriod {
-	const days = Math.max(1, Math.min(90, lookbackDays));
-	const now = dayjs();
+	const window = wowWindow(dayjs(), lookbackDays);
 	return {
-		current: {
-			from: now.subtract(days, "day").format("YYYY-MM-DD"),
-			to: now.format("YYYY-MM-DD"),
-		},
-		previous: {
-			from: now.subtract(days * 2, "day").format("YYYY-MM-DD"),
-			to: now.subtract(days, "day").format("YYYY-MM-DD"),
-		},
+		current: { from: window.currentFrom, to: window.currentTo },
+		previous: { from: window.previousFrom, to: window.previousTo },
 	};
 }
 
+const INSIGHTS_MODEL_IDS = {
+	fast: "openai/gpt-5.4-mini",
+	balanced: "anthropic/claude-sonnet-4.6",
+	deep: "anthropic/claude-opus-4.7",
+} as const;
+
 const INSIGHTS_MODELS = {
-	quick: createModelFromId("openai/gpt-5.4-mini"),
-	balanced: createModelFromId("anthropic/claude-sonnet-4.6"),
-	deep: createModelFromId("anthropic/claude-opus-4.7"),
+	fast: createModelFromId(INSIGHTS_MODEL_IDS.fast),
+	balanced: createModelFromId(INSIGHTS_MODEL_IDS.balanced),
+	deep: createModelFromId(INSIGHTS_MODEL_IDS.deep),
 };
 
-function modelForTier(
+type InsightsModelKey = keyof typeof INSIGHTS_MODELS;
+
+function modelKeyForTier(
 	tier: InsightGenerationConfigSnapshot["modelTier"],
 	hasCriticalSignals?: boolean
-) {
+): InsightsModelKey {
 	if (tier === "fast") {
-		return INSIGHTS_MODELS.quick;
+		return "fast";
 	}
 	if (tier === "deep") {
-		return INSIGHTS_MODELS.deep;
+		return "deep";
 	}
 	if (tier === "balanced" && hasCriticalSignals) {
-		return INSIGHTS_MODELS.deep;
+		return "deep";
 	}
-	return INSIGHTS_MODELS.balanced;
+	return "balanced";
 }
 
 function normalizeAllowedTools(
@@ -157,57 +132,6 @@ function normalizeAllowedTools(
 	return TOOL_NAMES.filter((t) => allowed.has(t));
 }
 
-function dedupeKeyFor(insight: GeneratedWebsiteInsight): string {
-	return insightDedupeKey({
-		...insight,
-		changePercent: insight.changePercent ?? null,
-	});
-}
-
-async function fetchInsightDedupeKeyToIdMap(
-	organizationId: string,
-	cooldownHours: number
-): Promise<Map<string, string>> {
-	const cutoff = dayjs().subtract(Math.max(1, cooldownHours), "hour").toDate();
-	const rows = await db
-		.select({
-			id: analyticsInsights.id,
-			websiteId: analyticsInsights.websiteId,
-			type: analyticsInsights.type,
-			sentiment: analyticsInsights.sentiment,
-			changePercent: analyticsInsights.changePercent,
-			dedupeKey: analyticsInsights.dedupeKey,
-			subjectKey: analyticsInsights.subjectKey,
-			title: analyticsInsights.title,
-		})
-		.from(analyticsInsights)
-		.where(
-			and(
-				eq(analyticsInsights.organizationId, organizationId),
-				gte(analyticsInsights.createdAt, cutoff)
-			)
-		)
-		.orderBy(desc(analyticsInsights.createdAt));
-
-	const map = new Map<string, string>();
-	for (const row of rows) {
-		const key =
-			row.dedupeKey ??
-			insightDedupeKey({
-				websiteId: row.websiteId,
-				type: row.type as ParsedInsight["type"],
-				sentiment: row.sentiment as ParsedInsight["sentiment"],
-				changePercent: row.changePercent,
-				subjectKey: row.subjectKey,
-				title: row.title,
-			});
-		if (!map.has(key)) {
-			map.set(key, row.id);
-		}
-	}
-	return map;
-}
-
 function validateCollectedInsights(
 	insights: ParsedInsight[],
 	context: {
@@ -231,6 +155,7 @@ function validateCollectedInsights(
 }
 
 async function analyzeWebsite(params: {
+	billingCustomerId: string | null;
 	config: InsightGenerationConfigSnapshot;
 	domain: string;
 	githubRepo?: { owner: string; repo: string };
@@ -270,11 +195,18 @@ async function analyzeWebsite(params: {
 
 	let enrichedSignals: EnrichedSignal[] = [];
 	try {
-		const signals = await detectSignals({
+		const detectParams = {
 			websiteId: params.websiteId,
 			lookbackDays: params.config.lookbackDays,
 			timezone: params.config.timezone,
-		});
+		};
+		const [metricSignals, funnelGoalSignals] = await Promise.all([
+			detectSignals(detectParams),
+			detectFunnelGoalSignals(detectParams),
+		]);
+		const signals = [...metricSignals, ...funnelGoalSignals].sort(
+			(a, b) => Math.abs(b.deltaPercent) - Math.abs(a.deltaPercent)
+		);
 		if (signals.length > 0) {
 			const githubToken = params.githubRepo
 				? await getOAuthToken("github", params.organizationId, params.userId)
@@ -392,13 +324,12 @@ ${orgContext}${annotationContext}${historyBlock}${dismissedBlock}`;
 			...availableTools,
 			emit_insight: emitInsightTool,
 		};
+		const modelKey = modelKeyForTier(
+			params.config.modelTier,
+			enrichedSignals.some((s) => s.severity === "critical")
+		);
 		const agent = new ToolLoopAgent({
-			model: ai.wrap(
-				modelForTier(
-					params.config.modelTier,
-					enrichedSignals.some((s) => s.severity === "critical")
-				)
-			),
+			model: ai.wrap(INSIGHTS_MODELS[modelKey]),
 			instructions: {
 				role: "system",
 				content: buildSystemPrompt(params.config, { investigationMode }),
@@ -451,10 +382,21 @@ ${orgContext}${annotationContext}${historyBlock}${dismissedBlock}`;
 			},
 		});
 
-		await agent.generate({
+		const result = await agent.generate({
 			messages: [{ role: "user", content: userPrompt }],
 		});
 
+		await trackAgentUsageAndBill({
+			usage: result.totalUsage,
+			modelId: INSIGHTS_MODEL_IDS[modelKey],
+			source: "insights",
+			organizationId: params.organizationId,
+			userId: params.userId ?? null,
+			chatId: appContext.chatId,
+			billingCustomerId: params.billingCustomerId,
+			websiteId: params.websiteId,
+		});
+
 		if (collected.length > 0) {
 			const validated = validateCollectedInsights(collected, {
 				config: params.config,
@@ -495,190 +437,6 @@ ${orgContext}${annotationContext}${historyBlock}${dismissedBlock}`;
 	}
 }
 
-async function persistWebsiteInsights(params: {
-	config: InsightGenerationConfigSnapshot;
-	insights: GeneratedWebsiteInsight[];
-	organizationId: string;
-	period: WeekOverWeekPeriod;
-	runId: string;
-}): Promise<GeneratedWebsiteInsight[]> {
-	const startedAt = performance.now();
-	const dedupeKeyToId = await fetchInsightDedupeKeyToIdMap(
-		params.organizationId,
-		params.config.cooldownHours
-	);
-	const seenInBatch = new Set<string>();
-	const finalInsights: GeneratedWebsiteInsight[] = [];
-	let duplicateCandidates = 0;
-
-	for (const insight of [...params.insights].sort(
-		(a, b) => b.priority - a.priority
-	)) {
-		const key = dedupeKeyFor(insight);
-		if (seenInBatch.has(key)) {
-			duplicateCandidates += 1;
-			continue;
-		}
-		seenInBatch.add(key);
-		const existingId = dedupeKeyToId.get(key);
-		finalInsights.push(existingId ? { ...insight, id: existingId } : insight);
-		if (finalInsights.length >= maxInsights(params.config)) {
-			break;
-		}
-	}
-
-	if (finalInsights.length === 0) {
-		emitInsightsEvent("info", "generation.persistence.skipped_empty", {
-			organization_id: params.organizationId,
-			run_id: params.runId,
-			candidate_count: params.insights.length,
-			duplicate_candidate_count: duplicateCandidates,
-			dedupe_window_count: dedupeKeyToId.size,
-		});
-		return [];
-	}
-
-	function insightRow(insight: GeneratedWebsiteInsight, key: string) {
-		return {
-			id: insight.id,
-			organizationId: params.organizationId,
-			websiteId: insight.websiteId,
-			runId: params.runId,
-			title: insight.title,
-			description: insight.description,
-			suggestion: insight.suggestion,
-			severity: insight.severity,
-			sentiment: insight.sentiment,
-			type: insight.type,
-			priority: insight.priority,
-			changePercent: insight.changePercent ?? null,
-			dedupeKey: key,
-			subjectKey: insight.subjectKey,
-			sources: insight.sources,
-			confidence: insight.confidence,
-			impactSummary: insight.impactSummary ?? null,
-			rootCause: insight.rootCause ?? null,
-			evidence: insight.evidence ?? null,
-			investigationDepth: insight.investigationDepth ?? null,
-			actions: insight.actions ?? null,
-			metrics:
-				insight.metrics.length > 0
-					? (insight.metrics as InsightMetricRow[])
-					: null,
-			timezone: params.config.timezone,
-			currentPeriodFrom: params.period.current.from,
-			currentPeriodTo: params.period.current.to,
-			previousPeriodFrom: params.period.previous.from,
-			previousPeriodTo: params.period.previous.to,
-		};
-	}
-
-	const insightsWithKeys = finalInsights.map((insight) => {
-		const key = dedupeKeyFor(insight);
-		const existingId = dedupeKeyToId.get(key);
-		const isRefresh = existingId !== undefined && insight.id === existingId;
-		return { insight, key, isRefresh };
-	});
-
-	const toInsert = insightsWithKeys
-		.filter((i) => !i.isRefresh)
-		.map(({ insight, key }) => insightRow(insight, key));
-
-	const toRefresh = insightsWithKeys
-		.filter((i) => i.isRefresh)
-		.map(({ insight, key }) => ({
-			id: insight.id,
-			row: insightRow(insight, key),
-		}));
-
-	if (toInsert.length > 0) {
-		await db
-			.insert(analyticsInsights)
-			.values(toInsert)
-			.onConflictDoUpdate({
-				target: [analyticsInsights.organizationId, analyticsInsights.dedupeKey],
-				targetWhere: isNotNull(analyticsInsights.dedupeKey),
-				set: {
-					runId: params.runId,
-					timezone: params.config.timezone,
-					currentPeriodFrom: params.period.current.from,
-					currentPeriodTo: params.period.current.to,
-					previousPeriodFrom: params.period.previous.from,
-					previousPeriodTo: params.period.previous.to,
-					createdAt: new Date(),
-					title: sql.raw("excluded.title"),
-					description: sql.raw("excluded.description"),
-					suggestion: sql.raw("excluded.suggestion"),
-					severity: sql.raw("excluded.severity"),
-					sentiment: sql.raw("excluded.sentiment"),
-					type: sql.raw("excluded.type"),
-					priority: sql.raw("excluded.priority"),
-					changePercent: sql.raw("excluded.change_percent"),
-					subjectKey: sql.raw("excluded.subject_key"),
-					sources: sql.raw("excluded.sources"),
-					confidence: sql.raw("excluded.confidence"),
-					impactSummary: sql.raw("excluded.impact_summary"),
-					rootCause: sql.raw("excluded.root_cause"),
-					evidence: sql.raw("excluded.evidence"),
-					investigationDepth: sql.raw("excluded.investigation_depth"),
-					actions: sql.raw("excluded.actions"),
-					metrics: sql.raw("excluded.metrics"),
-				},
-			});
-	}
-	await Promise.all(
-		toRefresh.map(({ id, row }) =>
-			db.update(analyticsInsights).set(row).where(eq(analyticsInsights.id, id))
-		)
-	);
-
-	const persistedRows = await db
-		.select({
-			dedupeKey: analyticsInsights.dedupeKey,
-			id: analyticsInsights.id,
-		})
-		.from(analyticsInsights)
-		.where(
-			and(
-				eq(analyticsInsights.organizationId, params.organizationId),
-				inArray(
-					analyticsInsights.dedupeKey,
-					finalInsights.map((insight) => dedupeKeyFor(insight))
-				)
-			)
-		);
-	const persistedIdByDedupeKey = new Map(
-		persistedRows.flatMap((row) =>
-			row.dedupeKey ? [[row.dedupeKey, row.id] as const] : []
-		)
-	);
-	const persistedInsights = finalInsights.map((insight) => {
-		const persistedId = persistedIdByDedupeKey.get(dedupeKeyFor(insight));
-		return persistedId ? { ...insight, id: persistedId } : insight;
-	});
-
-	const websiteInvalidations = [
-		...new Set(persistedInsights.map((insight) => insight.websiteId)),
-	].map((websiteId) => invalidateAgentContextSnapshotsForWebsite(websiteId));
-
-	await Promise.all([
-		invalidateInsightsCachesForOrganization(params.organizationId),
-		...websiteInvalidations,
-	]);
-
-	emitInsightsEvent("info", "generation.persistence.completed", {
-		organization_id: params.organizationId,
-		run_id: params.runId,
-		duration_ms: Math.round(performance.now() - startedAt),
-		result_count: persistedInsights.length,
-		insert_count: toInsert.length,
-		refresh_count: toRefresh.length,
-		invalidated_website_count: websiteInvalidations.length,
-	});
-
-	return persistedInsights;
-}
-
 function storeWebsiteSummary(
 	site: OrgWebsiteRow,
 	insights: GeneratedWebsiteInsight[]
@@ -762,6 +520,26 @@ export async function generateWebsiteInsights(
 		organization_site_count: orgSites.length,
 	});
 
+	const { allowed, billingCustomerId } = await resolveInsightsBilling({
+		organizationId: input.organizationId,
+		userId: input.requestedByUserId,
+	});
+	if (!allowed) {
+		emitInsightsEvent("info", "generation.website.skipped_no_credits", {
+			organization_id: input.organizationId,
+			website_id: input.websiteId,
+			run_id: input.runId,
+			billing_customer_id: billingCustomerId,
+			duration_ms: Math.round(performance.now() - startedAt),
+		});
+		return {
+			status: "skipped",
+			resultCount: 0,
+			insightIds: [],
+			message: "Insufficient agent credits",
+		};
+	}
+
 	const period = getComparisonPeriod(input.config.lookbackDays);
 	const userId = input.requestedByUserId ?? undefined;
 	const ghIntegration = site.integrations?.github as
@@ -769,6 +547,7 @@ export async function generateWebsiteInsights(
 		| undefined;
 
 	const insights = await analyzeWebsite({
+		billingCustomerId,
 		config: input.config,
 		domain: site.domain,
 		githubRepo: ghIntegration,
diff --git a/apps/insights/src/persistence.ts b/apps/insights/src/persistence.ts
new file mode 100644
index 000000000..1a4303052
--- /dev/null
+++ b/apps/insights/src/persistence.ts
@@ -0,0 +1,295 @@
+import { insightDedupeKey } from "@databuddy/ai/insights/dedupe";
+import type {
+	InsightMetricRow,
+	WeekOverWeekPeriod,
+} from "@databuddy/ai/insights/types";
+import type { ParsedInsight } from "@databuddy/ai/schemas/smart-insights-output";
+import {
+	and,
+	db,
+	desc,
+	eq,
+	getTableColumns,
+	gte,
+	inArray,
+	isNotNull,
+	sql,
+} from "@databuddy/db";
+import {
+	analyticsInsights,
+	type InsightGenerationConfigSnapshot,
+} from "@databuddy/db/schema";
+import {
+	invalidateAgentContextSnapshotsForWebsite,
+	invalidateInsightsCachesForOrganization,
+} from "@databuddy/redis";
+import dayjs from "dayjs";
+import { emitInsightsEvent } from "./lib/evlog-insights";
+
+const DEFAULT_MAX_INSIGHTS = 2;
+
+const REFRESHED_INSIGHT_COLUMNS = [
+	"title",
+	"description",
+	"suggestion",
+	"severity",
+	"sentiment",
+	"type",
+	"priority",
+	"changePercent",
+	"subjectKey",
+	"sources",
+	"confidence",
+	"impactSummary",
+	"rootCause",
+	"evidence",
+	"investigationDepth",
+	"actions",
+	"metrics",
+] as const satisfies readonly (keyof typeof analyticsInsights.$inferInsert)[];
+
+export interface GeneratedWebsiteInsight extends ParsedInsight {
+	id: string;
+	websiteDomain: string;
+	websiteId: string;
+	websiteName: string | null;
+}
+
+export function maxInsights(config: InsightGenerationConfigSnapshot): number {
+	return Math.max(
+		1,
+		Math.min(10, config.maxInsightsPerWebsite || DEFAULT_MAX_INSIGHTS)
+	);
+}
+
+function excludedRefreshSet() {
+	const columns = getTableColumns(analyticsInsights);
+	return Object.fromEntries(
+		REFRESHED_INSIGHT_COLUMNS.map((key) => [
+			key,
+			sql.raw(`excluded.${columns[key].name}`),
+		])
+	);
+}
+
+function dedupeKeyFor(insight: GeneratedWebsiteInsight): string {
+	return insightDedupeKey({
+		...insight,
+		changePercent: insight.changePercent ?? null,
+	});
+}
+
+async function fetchInsightDedupeKeyToIdMap(
+	organizationId: string,
+	cooldownHours: number
+): Promise<Map<string, string>> {
+	const cutoff = dayjs().subtract(Math.max(1, cooldownHours), "hour").toDate();
+	const rows = await db
+		.select({
+			id: analyticsInsights.id,
+			websiteId: analyticsInsights.websiteId,
+			type: analyticsInsights.type,
+			sentiment: analyticsInsights.sentiment,
+			changePercent: analyticsInsights.changePercent,
+			dedupeKey: analyticsInsights.dedupeKey,
+			subjectKey: analyticsInsights.subjectKey,
+			title: analyticsInsights.title,
+		})
+		.from(analyticsInsights)
+		.where(
+			and(
+				eq(analyticsInsights.organizationId, organizationId),
+				gte(analyticsInsights.createdAt, cutoff)
+			)
+		)
+		.orderBy(desc(analyticsInsights.createdAt));
+
+	const map = new Map<string, string>();
+	for (const row of rows) {
+		const key =
+			row.dedupeKey ??
+			insightDedupeKey({
+				websiteId: row.websiteId,
+				type: row.type as ParsedInsight["type"],
+				sentiment: row.sentiment as ParsedInsight["sentiment"],
+				changePercent: row.changePercent,
+				subjectKey: row.subjectKey,
+				title: row.title,
+			});
+		if (!map.has(key)) {
+			map.set(key, row.id);
+		}
+	}
+	return map;
+}
+
+export async function persistWebsiteInsights(params: {
+	config: InsightGenerationConfigSnapshot;
+	insights: GeneratedWebsiteInsight[];
+	organizationId: string;
+	period: WeekOverWeekPeriod;
+	runId: string;
+}): Promise<GeneratedWebsiteInsight[]> {
+	const startedAt = performance.now();
+	const dedupeKeyToId = await fetchInsightDedupeKeyToIdMap(
+		params.organizationId,
+		params.config.cooldownHours
+	);
+	const seenInBatch = new Set<string>();
+	const finalInsights: GeneratedWebsiteInsight[] = [];
+	let duplicateCandidates = 0;
+
+	for (const insight of [...params.insights].sort(
+		(a, b) => b.priority - a.priority
+	)) {
+		const key = dedupeKeyFor(insight);
+		if (seenInBatch.has(key)) {
+			duplicateCandidates += 1;
+			continue;
+		}
+		seenInBatch.add(key);
+		const existingId = dedupeKeyToId.get(key);
+		finalInsights.push(existingId ? { ...insight, id: existingId } : insight);
+		if (finalInsights.length >= maxInsights(params.config)) {
+			break;
+		}
+	}
+
+	if (finalInsights.length === 0) {
+		emitInsightsEvent("info", "generation.persistence.skipped_empty", {
+			organization_id: params.organizationId,
+			run_id: params.runId,
+			candidate_count: params.insights.length,
+			duplicate_candidate_count: duplicateCandidates,
+			dedupe_window_count: dedupeKeyToId.size,
+		});
+		return [];
+	}
+
+	function insightRow(insight: GeneratedWebsiteInsight, key: string) {
+		return {
+			id: insight.id,
+			organizationId: params.organizationId,
+			websiteId: insight.websiteId,
+			runId: params.runId,
+			title: insight.title,
+			description: insight.description,
+			suggestion: insight.suggestion,
+			severity: insight.severity,
+			sentiment: insight.sentiment,
+			type: insight.type,
+			priority: insight.priority,
+			changePercent: insight.changePercent ?? null,
+			dedupeKey: key,
+			subjectKey: insight.subjectKey,
+			sources: insight.sources,
+			confidence: insight.confidence,
+			impactSummary: insight.impactSummary ?? null,
+			rootCause: insight.rootCause ?? null,
+			evidence: insight.evidence ?? null,
+			investigationDepth: insight.investigationDepth ?? null,
+			actions: insight.actions ?? null,
+			metrics:
+				insight.metrics.length > 0
+					? (insight.metrics as InsightMetricRow[])
+					: null,
+			timezone: params.config.timezone,
+			currentPeriodFrom: params.period.current.from,
+			currentPeriodTo: params.period.current.to,
+			previousPeriodFrom: params.period.previous.from,
+			previousPeriodTo: params.period.previous.to,
+		};
+	}
+
+	const insightsWithKeys = finalInsights.map((insight) => {
+		const key = dedupeKeyFor(insight);
+		const existingId = dedupeKeyToId.get(key);
+		const isRefresh = existingId !== undefined && insight.id === existingId;
+		return { insight, key, isRefresh };
+	});
+
+	const toInsert = insightsWithKeys
+		.filter((i) => !i.isRefresh)
+		.map(({ insight, key }) => insightRow(insight, key));
+
+	const toRefresh = insightsWithKeys
+		.filter((i) => i.isRefresh)
+		.map(({ insight, key }) => ({
+			id: insight.id,
+			row: insightRow(insight, key),
+		}));
+
+	if (toInsert.length > 0) {
+		await db
+			.insert(analyticsInsights)
+			.values(toInsert)
+			.onConflictDoUpdate({
+				target: [analyticsInsights.organizationId, analyticsInsights.dedupeKey],
+				targetWhere: isNotNull(analyticsInsights.dedupeKey),
+				set: {
+					runId: params.runId,
+					timezone: params.config.timezone,
+					currentPeriodFrom: params.period.current.from,
+					currentPeriodTo: params.period.current.to,
+					previousPeriodFrom: params.period.previous.from,
+					previousPeriodTo: params.period.previous.to,
+					createdAt: new Date(),
+					...excludedRefreshSet(),
+				},
+			});
+	}
+	await Promise.all(
+		toRefresh.map(({ id, row }) =>
+			db
+				.update(analyticsInsights)
+				.set({ ...row, createdAt: new Date() })
+				.where(eq(analyticsInsights.id, id))
+		)
+	);
+
+	const persistedRows = await db
+		.select({
+			dedupeKey: analyticsInsights.dedupeKey,
+			id: analyticsInsights.id,
+		})
+		.from(analyticsInsights)
+		.where(
+			and(
+				eq(analyticsInsights.organizationId, params.organizationId),
+				inArray(
+					analyticsInsights.dedupeKey,
+					finalInsights.map((insight) => dedupeKeyFor(insight))
+				)
+			)
+		);
+	const persistedIdByDedupeKey = new Map(
+		persistedRows.flatMap((row) =>
+			row.dedupeKey ? [[row.dedupeKey, row.id] as const] : []
+		)
+	);
+	const persistedInsights = finalInsights.map((insight) => {
+		const persistedId = persistedIdByDedupeKey.get(dedupeKeyFor(insight));
+		return persistedId ? { ...insight, id: persistedId } : insight;
+	});
+
+	const websiteInvalidations = [
+		...new Set(persistedInsights.map((insight) => insight.websiteId)),
+	].map((websiteId) => invalidateAgentContextSnapshotsForWebsite(websiteId));
+
+	await Promise.all([
+		invalidateInsightsCachesForOrganization(params.organizationId),
+		...websiteInvalidations,
+	]);
+
+	emitInsightsEvent("info", "generation.persistence.completed", {
+		organization_id: params.organizationId,
+		run_id: params.runId,
+		duration_ms: Math.round(performance.now() - startedAt),
+		result_count: persistedInsights.length,
+		insert_count: toInsert.length,
+		refresh_count: toRefresh.length,
+		invalidated_website_count: websiteInvalidations.length,
+	});
+
+	return persistedInsights;
+}
diff --git a/packages/ai/src/ai/agents/analytics.ts b/packages/ai/src/ai/agents/analytics.ts
index b2f8010d8..a9ecb44cf 100644
--- a/packages/ai/src/ai/agents/analytics.ts
+++ b/packages/ai/src/ai/agents/analytics.ts
@@ -41,6 +41,9 @@ export function createConfig(
 		userId: context.userId,
 		websiteId: context.websiteId,
 		websiteDomain: context.websiteDomain,
+		defaultWebsiteId: context.defaultWebsiteId ?? context.websiteId,
+		accessibleWebsites: context.accessibleWebsites,
+		organizationId: context.organizationId,
 		timezone: context.timezone,
 		currentDateTime: new Date().toISOString(),
 		chatId: context.chatId,
diff --git a/packages/ai/src/ai/agents/execution.ts b/packages/ai/src/ai/agents/execution.ts
index 924460e17..79aa07f53 100644
--- a/packages/ai/src/ai/agents/execution.ts
+++ b/packages/ai/src/ai/agents/execution.ts
@@ -19,7 +19,7 @@ interface AgentUsageTrackingInput {
 	chatId?: string;
 	modelId: string;
 	organizationId?: string | null;
-	source: "dashboard" | "mcp" | "slack";
+	source: "dashboard" | "mcp" | "slack" | "insights";
 	usage: LanguageModelUsage;
 	userId?: string | null;
 	websiteId?: string;
diff --git a/packages/ai/src/ai/agents/types.ts b/packages/ai/src/ai/agents/types.ts
index 93f6f930c..1d0ca4ed8 100644
--- a/packages/ai/src/ai/agents/types.ts
+++ b/packages/ai/src/ai/agents/types.ts
@@ -5,6 +5,7 @@ import type {
 	ToolLoopAgent,
 	ToolSet,
 } from "ai";
+import type { WebsiteSummary } from "../../lib/accessible-websites";
 
 type ProviderOptions = NonNullable<
 	ConstructorParameters<typeof ToolLoopAgent>[0]["providerOptions"]
@@ -28,15 +29,17 @@ export const AGENT_TIERS: readonly AgentTier[] = [
 ] as const;
 
 export interface AgentContext {
+	accessibleWebsites?: WebsiteSummary[];
 	billingCustomerId?: string | null;
 	chatId: string;
+	defaultWebsiteId?: string | null;
 	organizationId?: string;
 	requestHeaders?: Headers;
 	thinking?: AgentThinking;
 	timezone: string;
 	userId: string;
-	websiteDomain: string;
-	websiteId: string;
+	websiteDomain?: string;
+	websiteId?: string;
 }
 
 export interface AgentConfig {
diff --git a/packages/ai/src/ai/config/context.ts b/packages/ai/src/ai/config/context.ts
index 8a956d41e..297878015 100644
--- a/packages/ai/src/ai/config/context.ts
+++ b/packages/ai/src/ai/config/context.ts
@@ -1,3 +1,5 @@
+import type { WebsiteSummary } from "../../lib/accessible-websites";
+
 export type AppMutationMode = "allow" | "dry-run";
 
 export interface ServiceAuth {
@@ -6,25 +8,65 @@ export interface ServiceAuth {
 }
 
 export interface AppContext {
+	accessibleWebsites?: WebsiteSummary[];
 	billingCustomerId?: string | null;
 	chatId: string;
 	currentDateTime: string;
+	defaultWebsiteId?: string | null;
 	mutationMode?: AppMutationMode;
 	organizationId?: string | null;
 	requestHeaders?: Headers;
 	serviceAuth?: ServiceAuth;
 	timezone: string;
 	userId: string;
-	websiteDomain: string;
-	websiteId: string;
+	websiteDomain?: string;
+	websiteId?: string;
 	[key: string]: unknown;
 }
 
+export function requireWebsiteId(context: AppContext): string {
+	const websiteId = context.defaultWebsiteId ?? context.websiteId;
+	if (!websiteId) {
+		throw new Error("This operation requires a website in context.");
+	}
+	return websiteId;
+}
+
+function escapeAttr(value: string): string {
+	return value
+		.replace(/&/g, "&amp;")
+		.replace(/</g, "&lt;")
+		.replace(/>/g, "&gt;")
+		.replace(/"/g, "&quot;");
+}
+
 export function formatContextForLLM(context: AppContext): string {
-	return `<website_info>
-<current_date>${context.currentDateTime}</current_date>
-<timezone>${context.timezone}</timezone>
-<website_id>${context.websiteId}</website_id>
-<website_domain>${context.websiteDomain}</website_domain>
-</website_info>`;
+	const lines = [
+		`<current_date>${context.currentDateTime}</current_date>`,
+		`<timezone>${context.timezone}</timezone>`,
+	];
+
+	const websites = context.accessibleWebsites ?? [];
+	if (websites.length > 0) {
+		const rows = websites
+			.map((w) => {
+				const domain = w.domain ? ` domain="${escapeAttr(w.domain)}"` : "";
+				const name = w.name ? ` name="${escapeAttr(w.name)}"` : "";
+				return `  <website id="${escapeAttr(w.id)}"${domain}${name} />`;
+			})
+			.join("\n");
+		lines.push(`<accessible_websites>\n${rows}\n</accessible_websites>`);
+	}
+
+	const defaultId = context.defaultWebsiteId ?? context.websiteId;
+	if (defaultId) {
+		lines.push(`<default_website_id>${defaultId}</default_website_id>`);
+		if (context.websiteDomain) {
+			lines.push(
+				`<default_website_domain>${context.websiteDomain}</default_website_domain>`
+			);
+		}
+	}
+
+	return `<website_info>\n${lines.join("\n")}\n</website_info>`;
 }
diff --git a/packages/ai/src/ai/insights/business-context.ts b/packages/ai/src/ai/insights/business-context.ts
index fe6eb6ae7..f1007c09d 100644
--- a/packages/ai/src/ai/insights/business-context.ts
+++ b/packages/ai/src/ai/insights/business-context.ts
@@ -1,4 +1,4 @@
-import type { AppContext } from "../config/context";
+import { type AppContext, requireWebsiteId } from "../config/context";
 import { callRPCProcedure } from "../tools/utils";
 import { executeQuery } from "../../query";
 import type { QueryRequest } from "../../query/types";
@@ -28,7 +28,7 @@ function runQuery(
 ) {
 	return executeQuery(
 		{
-			projectId: appContext.websiteId,
+			projectId: requireWebsiteId(appContext),
 			type,
 			from: range.from,
 			to: range.to,
diff --git a/packages/ai/src/ai/insights/flag-context.ts b/packages/ai/src/ai/insights/flag-context.ts
index 0767a8ecb..2e30efd93 100644
--- a/packages/ai/src/ai/insights/flag-context.ts
+++ b/packages/ai/src/ai/insights/flag-context.ts
@@ -1,6 +1,6 @@
 import { and, db, desc, eq, gte, isNull, lte, or } from "@databuddy/db";
 import { flagChangeEvents } from "@databuddy/db/schema";
-import type { AppContext } from "../config/context";
+import { type AppContext, requireWebsiteId } from "../config/context";
 import dayjs from "dayjs";
 import timezonePlugin from "dayjs/plugin/timezone";
 import utcPlugin from "dayjs/plugin/utc";
@@ -24,16 +24,17 @@ export async function fetchFlagChangeContext(
 	limit: number
 ) {
 	const { start, end } = getRangeBounds(range, appContext.timezone);
+	const websiteId = requireWebsiteId(appContext);
 
 	const scopeCondition = appContext.organizationId
 		? or(
-				eq(flagChangeEvents.websiteId, appContext.websiteId),
+				eq(flagChangeEvents.websiteId, websiteId),
 				and(
 					eq(flagChangeEvents.organizationId, appContext.organizationId),
 					isNull(flagChangeEvents.websiteId)
 				)
 			)
-		: eq(flagChangeEvents.websiteId, appContext.websiteId);
+		: eq(flagChangeEvents.websiteId, websiteId);
 
 	const rows = await db
 		.select({
diff --git a/packages/ai/src/ai/insights/ops-context.ts b/packages/ai/src/ai/insights/ops-context.ts
index fa7cbe1d2..c1a01ee95 100644
--- a/packages/ai/src/ai/insights/ops-context.ts
+++ b/packages/ai/src/ai/insights/ops-context.ts
@@ -1,4 +1,4 @@
-import type { AppContext } from "../config/context";
+import { type AppContext, requireWebsiteId } from "../config/context";
 import { callRPCProcedure } from "../tools/utils";
 import { executeQuery } from "../../query";
 import type { QueryRequest } from "../../query/types";
@@ -30,7 +30,7 @@ function runQuery(
 ) {
 	return executeQuery(
 		{
-			projectId: appContext.websiteId,
+			projectId: requireWebsiteId(appContext),
 			type,
 			from: range.from,
 			to: range.to,
diff --git a/packages/ai/src/ai/insights/product-context.ts b/packages/ai/src/ai/insights/product-context.ts
index 8a2f5bbd2..67c60f3d1 100644
--- a/packages/ai/src/ai/insights/product-context.ts
+++ b/packages/ai/src/ai/insights/product-context.ts
@@ -1,4 +1,4 @@
-import type { AppContext } from "../config/context";
+import { type AppContext, requireWebsiteId } from "../config/context";
 import { callRPCProcedure } from "../tools/utils";
 import { executeQuery } from "../../query";
 import type { QueryRequest } from "../../query/types";
@@ -146,7 +146,7 @@ function runQuery(
 ) {
 	return executeQuery(
 		{
-			projectId: appContext.websiteId,
+			projectId: requireWebsiteId(appContext),
 			type,
 			from: range.from,
 			to: range.to,
diff --git a/packages/ai/src/ai/prompts/analytics.ts b/packages/ai/src/ai/prompts/analytics.ts
index a44ae6779..a4702dc2c 100644
--- a/packages/ai/src/ai/prompts/analytics.ts
+++ b/packages/ai/src/ai/prompts/analytics.ts
@@ -181,13 +181,42 @@ Slack rules:
 Examples: "which first?" with thread metrics => read thread and pick one. "nah that's wrong" => ask for correction.
 </slack-output>`;
 
+function buildWebsiteScopeGuidance(ctx: AppContext): string {
+	const websites = ctx.accessibleWebsites ?? [];
+	const defaultId = ctx.defaultWebsiteId ?? ctx.websiteId;
+
+	if (defaultId) {
+		const defaultDomain = ctx.websiteDomain ? ` (${ctx.websiteDomain})` : "";
+		return `A default website is selected for this chat: websiteId "${defaultId}"${defaultDomain}. Omit websiteId on tools to use it. The user can mention other websites; when they name or @-mention a different site, pass that website's id explicitly. Use list_websites if you need to look up an id.`;
+	}
+
+	const only = websites[0];
+	if (websites.length === 1 && only) {
+		return `This workspace has one website: websiteId "${only.id}"${only.domain ? ` (${only.domain})` : ""}. Use it for analytics tools; you do not need to call list_websites.`;
+	}
+
+	if (websites.length > 1) {
+		return "No single website is selected. The accessible websites are listed in <background-data>. For analytics tools, pass the websiteId that matches the user's request; if the request is ambiguous about which site, ask which one. Use list_websites if you need the full list. To compare sites, query each with its own websiteId.";
+	}
+
+	return "No website is selected yet. Call list_websites first to discover available websites, then pass the chosen websiteId to analytics tools.";
+}
+
 export function buildAnalyticsInstructions(ctx: AppContext): string {
-	return `You are Databunny, an analytics assistant for ${ctx.websiteDomain}.
+	const intro = ctx.websiteDomain
+		? `You are Databunny, an analytics assistant for ${ctx.websiteDomain}.`
+		: "You are Databunny, an analytics assistant for this workspace.";
+
+	return `${intro}
 
 <background-data>
 ${formatContextForLLM(ctx)}
 </background-data>
 
+<website-scope>
+${buildWebsiteScopeGuidance(ctx)}
+</website-scope>
+
 ${COMMON_AGENT_RULES}
 
 ${ANALYTICS_BODY}
diff --git a/packages/ai/src/ai/prompts/shared.ts b/packages/ai/src/ai/prompts/shared.ts
index 95a0c8e5a..47109c9b0 100644
--- a/packages/ai/src/ai/prompts/shared.ts
+++ b/packages/ai/src/ai/prompts/shared.ts
@@ -5,4 +5,5 @@ export const COMMON_AGENT_RULES = `<behavior_rules>
 - Data integrity: never fabricate numbers. Analytics numbers must come from tool output or simple arithmetic on tool output. Label proxies, missing data, and unsupported asks.
 - SQL, when available, is SELECT/WITH only with typed placeholders such as {websiteId:String}.
 - Response: lead with the answer, be concise, use markdown cleanly, and never indent prose with 4+ spaces or use ASCII-art tables.
+- Never use emojis in any response, heading, label, chart title, or card. Use plain text only.
 </behavior_rules>`;
diff --git a/packages/ai/src/ai/tools/dashboard-actions.ts b/packages/ai/src/ai/tools/dashboard-actions.ts
index 85b78a9d5..5c099fa14 100644
--- a/packages/ai/src/ai/tools/dashboard-actions.ts
+++ b/packages/ai/src/ai/tools/dashboard-actions.ts
@@ -84,7 +84,8 @@ export const dashboardActionsTool = tool({
 	}),
 	execute: ({ actions, title, websiteId }, options) => {
 		const context = getAppContext(options);
-		const resolvedWebsiteId = websiteId ?? context.websiteId;
+		const resolvedWebsiteId =
+			websiteId ?? context.defaultWebsiteId ?? context.websiteId;
 
 		return {
 			type: "dashboard-actions",
diff --git a/packages/ai/src/ai/tools/execute-sql-query.ts b/packages/ai/src/ai/tools/execute-sql-query.ts
index 6e54ac9b7..aa514f154 100644
--- a/packages/ai/src/ai/tools/execute-sql-query.ts
+++ b/packages/ai/src/ai/tools/execute-sql-query.ts
@@ -6,7 +6,12 @@ import {
 } from "@databuddy/db/clickhouse";
 import { tool } from "ai";
 import { z } from "zod";
-import { executeTimedQuery, getAppContext, type QueryResult } from "./utils";
+import {
+	executeTimedQuery,
+	getAppContext,
+	type QueryResult,
+	resolveToolWebsite,
+} from "./utils";
 
 const MAX_MODEL_ROWS = 50;
 
@@ -90,6 +95,12 @@ Gotchas: timestamp column is "time" in events, "timestamp" elsewhere. Pageviews
 			.describe(
 				"Read-only ClickHouse SELECT/WITH query for an explicit analytics request. Must include client_id = {websiteId:String} AND-ed at the top level of every SELECT's WHERE."
 			),
+		websiteId: z
+			.string()
+			.optional()
+			.describe(
+				"Target website id. Omit to use the workspace default. Get ids from list_websites. The {websiteId:String} placeholder is bound to this site server-side."
+			),
 		params: z
 			.record(z.string(), z.unknown())
 			.optional()
@@ -97,11 +108,12 @@ Gotchas: timestamp column is "time" in events, "timestamp" elsewhere. Pageviews
 				"Optional typed placeholder values. websiteId and websiteDomain are bound by the server and cannot be overridden."
 			),
 	}),
-	execute: ({ sql, params }, options): Promise<QueryResult> => {
+	execute: ({ sql, websiteId, params }, options): Promise<QueryResult> => {
 		const ctx = getAppContext(options);
+		const resolved = resolveToolWebsite(ctx, websiteId);
 		return executeAgentSqlForWebsite({
-			websiteId: ctx.websiteId,
-			websiteDomain: ctx.websiteDomain,
+			websiteId: resolved.websiteId,
+			websiteDomain: resolved.domain,
 			sql,
 			params,
 		});
diff --git a/packages/ai/src/ai/tools/get-data.ts b/packages/ai/src/ai/tools/get-data.ts
index b63c7179b..49b84a2d4 100644
--- a/packages/ai/src/ai/tools/get-data.ts
+++ b/packages/ai/src/ai/tools/get-data.ts
@@ -3,10 +3,16 @@ import { z } from "zod";
 import { getWebsiteDomain } from "../../lib/website-utils";
 import { executeQuery, QueryBuilders } from "../../query";
 import type { QueryRequest } from "../../query/types";
-import { getAppContext } from "./utils";
+import { getAppContext, resolveToolWebsite } from "./utils";
 
 const queryItemSchema = z.object({
 	type: z.string(),
+	websiteId: z
+		.string()
+		.optional()
+		.describe(
+			"Target website id. Omit to use the workspace default. Required when comparing or querying a specific site in a multi-website workspace; get ids from list_websites."
+		),
 	from: z.string().optional(),
 	to: z.string().optional(),
 	preset: z
@@ -50,6 +56,7 @@ interface QueryItemResult {
 	executionTime: number;
 	rowCount: number;
 	type: string;
+	websiteId?: string;
 }
 
 const MAX_MODEL_ROWS = 50;
@@ -108,7 +115,7 @@ const BUILDER_CATEGORIES = `Builder types by category:
 - Revenue: revenue_overview, revenue_time_series, revenue_by_provider, revenue_by_product, revenue_attribution_overview, revenue_by_country, revenue_by_region, revenue_by_city, revenue_by_browser, revenue_by_device, revenue_by_os, revenue_by_referrer, revenue_by_utm_source, revenue_by_utm_medium, revenue_by_utm_campaign, revenue_by_entry_page, recent_transactions`;
 
 export const getDataTool = tool({
-	description: `Run analytics query builders only when the latest user message explicitly asks for website analytics data, metrics, reports, comparisons, breakdowns, trends, revenue, sessions, pages, events, errors, vitals, uptime, LLM usage, links, profiles, or similar quantitative analysis. Do not use for greetings, thanks, acknowledgments, short reactions, clarification-only replies, frustration, or meta-conversation about the assistant/chat. Batch 1-10 queries in parallel. Use preset (last_7d/last_30d/...) or from+to dates. The current website is bound server-side from the authorized chat session.\n\n${BUILDER_CATEGORIES}`,
+	description: `Run analytics query builders only when the latest user message explicitly asks for website analytics data, metrics, reports, comparisons, breakdowns, trends, revenue, sessions, pages, events, errors, vitals, uptime, LLM usage, links, profiles, or similar quantitative analysis. Do not use for greetings, thanks, acknowledgments, short reactions, clarification-only replies, frustration, or meta-conversation about the assistant/chat. Batch 1-10 queries in parallel. Use preset (last_7d/last_30d/...) or from+to dates. Each query may target a specific website via its websiteId; omit it to use the workspace default. To compare websites, send one query per website with different websiteId values.\n\n${BUILDER_CATEGORIES}`,
 	inputSchema: z.object({
 		queries: z
 			.array(queryItemSchema)
@@ -120,9 +127,7 @@ export const getDataTool = tool({
 	}),
 	execute: async ({ queries }, options) => {
 		const ctx = getAppContext(options);
-		const websiteId = ctx.websiteId;
 		const batchStart = Date.now();
-		const domain = ctx.websiteDomain || (await getWebsiteDomain(websiteId));
 
 		const results = await Promise.all(
 			queries.map(async (item): Promise<QueryItemResult> => {
@@ -138,6 +143,25 @@ export const getDataTool = tool({
 					};
 				}
 
+				let websiteId: string;
+				let resolvedDomain: string | undefined;
+				try {
+					const resolved = resolveToolWebsite(ctx, item.websiteId);
+					websiteId = resolved.websiteId;
+					resolvedDomain = resolved.domain;
+				} catch (error) {
+					return {
+						type: item.type,
+						websiteId: item.websiteId,
+						data: [],
+						rowCount: 0,
+						executionTime: 0,
+						error:
+							error instanceof Error ? error.message : "Website not resolved",
+					};
+				}
+
+				const domain = resolvedDomain || (await getWebsiteDomain(websiteId));
 				const { from, to } = resolveDates(item);
 				const req: QueryRequest = {
 					projectId: websiteId,
@@ -155,6 +179,7 @@ export const getDataTool = tool({
 				const data = await executeQuery(req, domain, req.timezone);
 				return {
 					type: item.type,
+					websiteId,
 					data: data.slice(0, MAX_MODEL_ROWS),
 					rowCount: data.length,
 					executionTime: Date.now() - queryStart,
@@ -164,7 +189,13 @@ export const getDataTool = tool({
 
 		const resultMap: Record<string, QueryItemResult> = {};
 		for (const r of results) {
-			resultMap[r.type] = r;
+			const base = r.websiteId ? `${r.type}@${r.websiteId}` : r.type;
+			let key = resultMap[r.type] ? base : r.type;
+			let n = 2;
+			while (resultMap[key]) {
+				key = `${base}#${n++}`;
+			}
+			resultMap[key] = r;
 		}
 
 		return {
diff --git a/packages/ai/src/ai/tools/investigation-tools.ts b/packages/ai/src/ai/tools/investigation-tools.ts
index dbe74b727..e116729aa 100644
--- a/packages/ai/src/ai/tools/investigation-tools.ts
+++ b/packages/ai/src/ai/tools/investigation-tools.ts
@@ -4,7 +4,7 @@ import { createScrapeTools } from "./scrape-page";
 import { createSearchConsoleTools } from "./search-console";
 
 export interface InvestigationToolsParams {
-	domain: string;
+	domain?: string;
 	organizationId: string;
 	userId?: string;
 }
@@ -13,7 +13,7 @@ export function createInvestigationTools(
 	params: InvestigationToolsParams
 ): ToolSet {
 	return {
-		...createScrapeTools(params.domain),
+		...createScrapeTools(),
 		...createSearchConsoleTools({
 			domain: params.domain,
 			organizationId: params.organizationId,
diff --git a/packages/ai/src/ai/tools/links.ts b/packages/ai/src/ai/tools/links.ts
index 9238b6868..2bdc4ccd8 100644
--- a/packages/ai/src/ai/tools/links.ts
+++ b/packages/ai/src/ai/tools/links.ts
@@ -385,7 +385,7 @@ export function createLinksTools() {
 					return {
 						preview: true,
 						message:
-							"⚠️ Are you sure you want to delete this link? This cannot be undone.",
+							"Are you sure you want to delete this link? This cannot be undone.",
 						link: {
 							name: link.name,
 							slug: link.slug,
diff --git a/packages/ai/src/ai/tools/list-websites.ts b/packages/ai/src/ai/tools/list-websites.ts
new file mode 100644
index 000000000..6bd43388f
--- /dev/null
+++ b/packages/ai/src/ai/tools/list-websites.ts
@@ -0,0 +1,22 @@
+import { tool } from "ai";
+import { z } from "zod";
+import { getAppContext } from "./utils";
+
+export const listWebsitesTool = tool({
+	description:
+		"List the websites in this workspace that you can query. Returns each website's id, name, and domain. Use a returned id as the websiteId for analytics tools when the workspace has more than one website or when the user names a specific site.",
+	inputSchema: z.object({}),
+	execute: (_args, options) => {
+		const ctx = getAppContext(options);
+		const websites = ctx.accessibleWebsites ?? [];
+		return {
+			websites: websites.map((w) => ({
+				id: w.id,
+				name: w.name,
+				domain: w.domain,
+			})),
+			defaultWebsiteId: ctx.defaultWebsiteId ?? ctx.websiteId ?? null,
+			count: websites.length,
+		};
+	},
+});
diff --git a/packages/ai/src/ai/tools/profiles.ts b/packages/ai/src/ai/tools/profiles.ts
index 5faa578a2..2d0447fc4 100644
--- a/packages/ai/src/ai/tools/profiles.ts
+++ b/packages/ai/src/ai/tools/profiles.ts
@@ -3,9 +3,16 @@ import { z } from "zod";
 import { getWebsiteDomain } from "../../lib/website-utils";
 import { executeQuery } from "../../query";
 import type { QueryRequest } from "../../query/types";
-import { getAppContext } from "./utils";
+import { getAppContext, resolveToolWebsite } from "./utils";
 import { createToolLogger } from "./utils/logger";
 
+const websiteIdInput = z
+	.string()
+	.optional()
+	.describe(
+		"Target website id. Omit to use the workspace default. Get ids from list_websites."
+	);
+
 const logger = createToolLogger("Profiles");
 
 function daysAgo(d: number): string {
@@ -21,8 +28,9 @@ function today(): string {
 export function createProfileTools() {
 	const listProfilesTool = tool({
 		description:
-			"List recent visitor profiles (sessions, pageviews, device, geo, browser, referrer). Use for visitors/users/audience questions. The current website is bound server-side from the authorized chat session.",
+			"List recent visitor profiles (sessions, pageviews, device, geo, browser, referrer). Use for visitors/users/audience questions. Pass websiteId to target a specific site; omit to use the workspace default.",
 		inputSchema: z.object({
+			websiteId: websiteIdInput,
 			days: z.number().min(1).max(90).default(7),
 			limit: z.number().min(1).max(50).default(10),
 			filters: z
@@ -43,11 +51,15 @@ export function createProfileTools() {
 				)
 				.optional(),
 		}),
-		execute: async ({ days, limit, filters }, options) => {
+		execute: async (
+			{ websiteId: inputWebsiteId, days, limit, filters },
+			options
+		) => {
 			const ctx = getAppContext(options);
-			const websiteId = ctx.websiteId;
+			const resolved = resolveToolWebsite(ctx, inputWebsiteId);
+			const websiteId = resolved.websiteId;
 			try {
-				const domain = ctx.websiteDomain || (await getWebsiteDomain(websiteId));
+				const domain = resolved.domain || (await getWebsiteDomain(websiteId));
 				const from = daysAgo(days);
 				const to = today();
 
@@ -88,16 +100,21 @@ export function createProfileTools() {
 
 	const getProfileTool = tool({
 		description:
-			"Visitor detail by anonymous_id: first/last activity, sessions across analytics/custom/error/vital/link events, pageviews, duration, device, browser, OS, location. The current website is bound server-side.",
+			"Visitor detail by anonymous_id: first/last activity, sessions across analytics/custom/error/vital/link events, pageviews, duration, device, browser, OS, location. Pass websiteId to target a specific site; omit to use the workspace default.",
 		inputSchema: z.object({
+			websiteId: websiteIdInput,
 			visitorId: z.string(),
 			days: z.number().min(1).max(365).default(30),
 		}),
-		execute: async ({ visitorId, days }, options) => {
+		execute: async (
+			{ websiteId: inputWebsiteId, visitorId, days },
+			options
+		) => {
 			const ctx = getAppContext(options);
-			const websiteId = ctx.websiteId;
+			const resolved = resolveToolWebsite(ctx, inputWebsiteId);
+			const websiteId = resolved.websiteId;
 			try {
-				const domain = ctx.websiteDomain || (await getWebsiteDomain(websiteId));
+				const domain = resolved.domain || (await getWebsiteDomain(websiteId));
 				const from = daysAgo(days);
 				const to = today();
 
@@ -140,17 +157,22 @@ export function createProfileTools() {
 
 	const getProfileSessionsTool = tool({
 		description:
-			"Session history for a visitor, including analytics events, custom events, errors, outgoing links, and separate web vitals context. Use after list_profiles/get_profile. The current website is bound server-side.",
+			"Session history for a visitor, including analytics events, custom events, errors, outgoing links, and separate web vitals context. Use after list_profiles/get_profile. Pass websiteId to target a specific site; omit to use the workspace default.",
 		inputSchema: z.object({
+			websiteId: websiteIdInput,
 			visitorId: z.string(),
 			days: z.number().min(1).max(365).default(30),
 			limit: z.number().min(1).max(100).default(20),
 		}),
-		execute: async ({ visitorId, days, limit }, options) => {
+		execute: async (
+			{ websiteId: inputWebsiteId, visitorId, days, limit },
+			options
+		) => {
 			const ctx = getAppContext(options);
-			const websiteId = ctx.websiteId;
+			const resolved = resolveToolWebsite(ctx, inputWebsiteId);
+			const websiteId = resolved.websiteId;
 			try {
-				const domain = ctx.websiteDomain || (await getWebsiteDomain(websiteId));
+				const domain = resolved.domain || (await getWebsiteDomain(websiteId));
 				const from = daysAgo(days);
 				const to = today();
 
diff --git a/packages/ai/src/ai/tools/scrape-page.ts b/packages/ai/src/ai/tools/scrape-page.ts
index 29f916241..0fb4d6902 100644
--- a/packages/ai/src/ai/tools/scrape-page.ts
+++ b/packages/ai/src/ai/tools/scrape-page.ts
@@ -1,5 +1,7 @@
 import { tool } from "ai";
 import { z } from "zod";
+import { getWebsiteDomain } from "../../lib/website-utils";
+import { getAppContext, resolveToolWebsite } from "./utils";
 
 const FIRECRAWL_API = "https://api.firecrawl.dev/v1";
 const MAX_CONTENT_CHARS = 12_000;
@@ -202,17 +204,33 @@ export async function getCachedSiteContext(
 	}
 }
 
-export function createScrapeTools(domain: string) {
+export function createScrapeTools() {
 	const scrapeTool = tool({
-		description: `Scrape a page from ${domain} and return its content as markdown plus internal links. Use to understand the product: what the site does, key pages, pricing, CTAs. Also use when investigating page-level anomalies. Scrape "/" first for product context, then specific pages as needed. Results are cached for 24h.`,
+		description:
+			'Scrape a page from one of the workspace websites and return its content as markdown plus internal links. Use to understand the product: what the site does, key pages, pricing, CTAs. Also use when investigating page-level anomalies. Scrape "/" first for product context, then specific pages as needed. Pass websiteId to target a specific site; omit to use the workspace default. Results are cached for 24h.',
 		inputSchema: z.object({
+			websiteId: z
+				.string()
+				.optional()
+				.describe(
+					"Target website id. Omit to use the workspace default. Get ids from list_websites."
+				),
 			path: z
 				.string()
 				.describe(
-					"Page path to scrape (e.g. '/', '/pricing', '/docs'). Must be a path on the current website."
+					"Page path to scrape (e.g. '/', '/pricing', '/docs'). Must be a path on the target website."
 				),
 		}),
-		execute: ({ path }) => scrapePage(domain, path),
+		execute: async ({ websiteId, path }, options) => {
+			const ctx = getAppContext(options);
+			const resolved = resolveToolWebsite(ctx, websiteId);
+			const domain =
+				resolved.domain || (await getWebsiteDomain(resolved.websiteId));
+			if (!domain) {
+				return { error: "Could not resolve a domain for the target website" };
+			}
+			return scrapePage(domain, path);
+		},
 	});
 
 	return { scrape_page: scrapeTool };
diff --git a/packages/ai/src/ai/tools/search-console.ts b/packages/ai/src/ai/tools/search-console.ts
index 9398e9c0e..4e3ea8467 100644
--- a/packages/ai/src/ai/tools/search-console.ts
+++ b/packages/ai/src/ai/tools/search-console.ts
@@ -1,5 +1,7 @@
 import { tool } from "ai";
 import { z } from "zod";
+import { getWebsiteDomain } from "../../lib/website-utils";
+import { getAppContext, resolveToolWebsite } from "./utils";
 import { createCachedTokenFn } from "./utils/oauth-token";
 
 const GSC_API = "https://www.googleapis.com/webmasters/v3";
@@ -8,6 +10,12 @@ const MAX_ROWS = 25;
 const dimensionEnum = z.enum(["query", "page", "country", "device", "date"]);
 
 const searchAnalyticsInput = z.object({
+	websiteId: z
+		.string()
+		.optional()
+		.describe(
+			"Target website id. Omit to use the workspace default. Get ids from list_websites."
+		),
 	startDate: z.string().describe("Start date YYYY-MM-DD"),
 	endDate: z.string().describe("End date YYYY-MM-DD"),
 	dimensions: dimensionEnum
@@ -86,7 +94,7 @@ export async function querySearchAnalytics(
 }
 
 export function createSearchConsoleTools(params: {
-	domain: string;
+	domain?: string;
 	organizationId: string;
 	userId?: string;
 }) {
@@ -95,13 +103,29 @@ export function createSearchConsoleTools(params: {
 		params.organizationId,
 		params.userId
 	);
-	const siteUrl = `sc-domain:${params.domain}`;
 
 	return {
 		search_console: tool({
-			description: `Query Google Search Console for ${params.domain}. Returns search queries, pages, countries, or devices with clicks, impressions, CTR, and average position. Use to find which keywords lost rankings, which pages dropped in impressions, or where traffic is coming from in Google search.`,
+			description:
+				"Query Google Search Console for a workspace website. Returns search queries, pages, countries, or devices with clicks, impressions, CTR, and average position. Use to find which keywords lost rankings, which pages dropped in impressions, or where traffic is coming from in Google search. Pass websiteId to target a specific site; omit to use the workspace default.",
 			inputSchema: searchAnalyticsInput,
-			execute: async (input) => {
+			execute: async (input, options) => {
+				const ctx = getAppContext(options);
+				let domain = params.domain;
+				if (input.websiteId || !domain) {
+					const resolved = resolveToolWebsite(ctx, input.websiteId);
+					domain =
+						resolved.domain ||
+						(await getWebsiteDomain(resolved.websiteId)) ||
+						undefined;
+				}
+				if (!domain) {
+					return {
+						error: "Could not resolve a domain for the target website",
+					};
+				}
+				const siteUrl = `sc-domain:${domain}`;
+
 				const token = await getToken();
 				if (!token) {
 					return {
diff --git a/packages/ai/src/ai/tools/toolkit.ts b/packages/ai/src/ai/tools/toolkit.ts
index bf9854a42..5c3bfa1c4 100644
--- a/packages/ai/src/ai/tools/toolkit.ts
+++ b/packages/ai/src/ai/tools/toolkit.ts
@@ -7,6 +7,7 @@ import { getDataTool } from "./get-data";
 import { createGoalTools } from "./goals";
 import { createInvestigationTools } from "./investigation-tools";
 import { createLinksTools } from "./links";
+import { listWebsitesTool } from "./list-websites";
 import { createMemoryTools } from "./memory";
 import { createProfileTools } from "./profiles";
 import { dashboardActionsTool } from "./dashboard-actions";
@@ -26,6 +27,7 @@ export interface ToolkitParams {
 }
 
 const ANALYTICS_TOOLS: ToolSet = {
+	list_websites: listWebsitesTool,
 	get_data: getDataTool,
 	execute_sql_query: executeSqlQueryTool,
 };
@@ -55,7 +57,7 @@ export function createToolkit(params: ToolkitParams): ToolSet {
 		Object.assign(tools, ANALYTICS_TOOLS);
 	}
 
-	if (caps.has("investigation") && params.domain && params.organizationId) {
+	if (caps.has("investigation") && params.organizationId) {
 		Object.assign(
 			tools,
 			createInvestigationTools({
diff --git a/packages/ai/src/ai/tools/utils/context.test.ts b/packages/ai/src/ai/tools/utils/context.test.ts
new file mode 100644
index 000000000..92096cdea
--- /dev/null
+++ b/packages/ai/src/ai/tools/utils/context.test.ts
@@ -0,0 +1,89 @@
+import { describe, expect, it } from "bun:test";
+import type { AppContext } from "../../config/context";
+import { resolveToolWebsite } from "./context";
+
+function makeCtx(overrides: Partial<AppContext> = {}): AppContext {
+	return {
+		chatId: "chat_1",
+		currentDateTime: "2026-05-30T00:00:00.000Z",
+		timezone: "UTC",
+		userId: "user_1",
+		...overrides,
+	};
+}
+
+describe("resolveToolWebsite", () => {
+	it("rejects a websiteId that is not accessible and not the context website", () => {
+		const ctx = makeCtx({
+			accessibleWebsites: [
+				{ id: "web_a", domain: "a.com", name: null, isPublic: null, createdAt: null },
+			],
+			websiteId: "web_ctx",
+		});
+
+		expect(() => resolveToolWebsite(ctx, "web_other")).toThrow(
+			/not in this workspace/
+		);
+	});
+
+	it("rejects any websiteId when the workspace has no accessible websites", () => {
+		const ctx = makeCtx({ accessibleWebsites: [] });
+
+		expect(() => resolveToolWebsite(ctx, "web_other")).toThrow(
+			/not in this workspace/
+		);
+	});
+
+	it("accepts a websiteId that is in the accessible set", () => {
+		const ctx = makeCtx({
+			accessibleWebsites: [
+				{ id: "web_a", domain: "a.com", name: null, isPublic: null, createdAt: null },
+			],
+		});
+
+		expect(resolveToolWebsite(ctx, "web_a")).toEqual({
+			websiteId: "web_a",
+			domain: "a.com",
+		});
+	});
+
+	it("accepts a websiteId matching the single-site context website", () => {
+		const ctx = makeCtx({ websiteId: "web_ctx", websiteDomain: "ctx.com" });
+
+		expect(resolveToolWebsite(ctx, "web_ctx")).toEqual({
+			websiteId: "web_ctx",
+			domain: "ctx.com",
+		});
+	});
+
+	it("falls back to the default website when no websiteId is given", () => {
+		const ctx = makeCtx({
+			defaultWebsiteId: "web_default",
+			accessibleWebsites: [
+				{
+					id: "web_default",
+					domain: "default.com",
+					name: null,
+					isPublic: null,
+					createdAt: null,
+				},
+			],
+		});
+
+		expect(resolveToolWebsite(ctx)).toEqual({
+			websiteId: "web_default",
+			domain: "default.com",
+		});
+	});
+
+	it("throws when multiple websites are accessible and none is specified", () => {
+		const ctx = makeCtx({
+			accessibleWebsites: [
+				{ id: "web_a", domain: "a.com", name: null, isPublic: null, createdAt: null },
+				{ id: "web_b", domain: "b.com", name: null, isPublic: null, createdAt: null },
+			],
+		});
+
+		expect(() => resolveToolWebsite(ctx)).toThrow(/multiple websites/);
+	});
+});
diff --git a/packages/ai/src/ai/tools/utils/context.ts b/packages/ai/src/ai/tools/utils/context.ts
index 37e629cb7..48b155ecb 100644
--- a/packages/ai/src/ai/tools/utils/context.ts
+++ b/packages/ai/src/ai/tools/utils/context.ts
@@ -11,3 +11,44 @@ export function getAppContext(options: {
 	}
 	return ctx as AppContext;
 }
+
+export interface ResolvedWebsite {
+	domain?: string;
+	websiteId: string;
+}
+
+export function resolveToolWebsite(
+	ctx: AppContext,
+	inputWebsiteId?: string | null
+): ResolvedWebsite {
+	const accessible = ctx.accessibleWebsites ?? [];
+	const domainFor = (id: string): string | undefined =>
+		accessible.find((w) => w.id === id)?.domain ??
+		(id === ctx.websiteId ? ctx.websiteDomain : undefined);
+
+	if (inputWebsiteId) {
+		const isAccessible =
+			accessible.some((w) => w.id === inputWebsiteId) ||
+			inputWebsiteId === ctx.websiteId;
+		if (!isAccessible) {
+			throw new Error(
+				`Website "${inputWebsiteId}" is not in this workspace. Call list_websites to see available websites.`
+			);
+		}
+		return { websiteId: inputWebsiteId, domain: domainFor(inputWebsiteId) };
+	}
+
+	const fallbackId = ctx.defaultWebsiteId ?? ctx.websiteId;
+	if (fallbackId) {
+		return { websiteId: fallbackId, domain: domainFor(fallbackId) };
+	}
+
+	const [only] = accessible;
+	if (accessible.length === 1 && only) {
+		return { websiteId: only.id, domain: only.domain ?? undefined };
+	}
+
+	throw new Error(
+		"No website specified. This workspace has multiple websites — pass a websiteId for this query. Call list_websites to see the options."
+	);
+}
diff --git a/packages/ai/src/ai/tools/utils/index.ts b/packages/ai/src/ai/tools/utils/index.ts
index d278ca9d4..990b70a17 100644
--- a/packages/ai/src/ai/tools/utils/index.ts
+++ b/packages/ai/src/ai/tools/utils/index.ts
@@ -1,5 +1,9 @@
 /** biome-ignore-all lint/performance/noBarrelFile: no barrel file */
-export { getAppContext } from "./context";
+export {
+	getAppContext,
+	resolveToolWebsite,
+	type ResolvedWebsite,
+} from "./context";
 export { createToolLogger } from "./logger";
 export { getOAuthToken, createCachedTokenFn } from "./oauth-token";
 export { executeTimedQuery, type QueryResult } from "./query";
diff --git a/packages/auth/src/auth.ts b/packages/auth/src/auth.ts
index ffd3eed84..9fdc8e1a5 100644
--- a/packages/auth/src/auth.ts
+++ b/packages/auth/src/auth.ts
@@ -1,12 +1,13 @@
 import { randomUUID } from "node:crypto";
 import { redisStorage } from "@better-auth/redis-storage";
 import { sso } from "@better-auth/sso";
-import { db } from "@databuddy/db";
+import { and, db, eq, like } from "@databuddy/db";
 // biome-ignore lint/performance/noNamespaceImport: Better Auth's Drizzle adapter expects a schema object map.
 import * as schema from "@databuddy/db/schema";
 import {
 	member as memberTable,
 	organization as organizationTable,
+	verification as verificationTable,
 } from "@databuddy/db/schema";
 import {
 	DeleteAccountEmail,
@@ -155,6 +156,26 @@ function notifySignUpSlackAction(input: {
 	});
 }
 
+async function purgeOutstandingResetTokens(userId: string): Promise<void> {
+	try {
+		await db
+			.delete(verificationTable)
+			.where(
+				and(
+					like(verificationTable.identifier, "reset-password:%"),
+					eq(verificationTable.value, userId)
+				)
+			);
+	} catch (error) {
+		log.error({
+			service: "auth",
+			auth_hook: "purge_reset_tokens",
+			auth_user_id: userId,
+			error: error instanceof Error ? error.message : String(error),
+		});
+	}
+}
+
 async function invalidateMemberCaches(member: {
 	organizationId: string;
 	userId: string;
@@ -172,7 +193,34 @@ async function invalidateMemberCaches(member: {
 	}
 }
 
+type AuthLogLevel = "info" | "warn" | "error" | "debug";
+
+function forwardAuthLog(
+	level: AuthLogLevel,
+	message: string,
+	...args: unknown[]
+): void {
+	const cause = args.find((arg): arg is Error => arg instanceof Error);
+	const fields = {
+		service: "auth",
+		auth_logger: message,
+		...(cause && { error: cause.message, error_stack: cause.stack }),
+	};
+	if (level === "error") {
+		log.error(fields);
+		return;
+	}
+	if (level === "warn") {
+		log.warn(fields);
+		return;
+	}
+	log.info(fields);
+}
+
 export const auth = betterAuth({
+	logger: {
+		log: forwardAuthLog,
+	},
 	database: drizzleAdapter(db, {
 		provider: "pg",
 		schema,
@@ -184,8 +232,7 @@ export const auth = betterAuth({
 	session: {
 		storeSessionInDatabase: true,
 		cookieCache: {
-			enabled: true,
-			maxAge: 5 * 60,
+			enabled: false,
 		},
 	},
 	rateLimit: {
@@ -213,9 +260,20 @@ export const auth = betterAuth({
 			enabled: true,
 			trustedProviders: ["google", "github"],
 			allowDifferentEmails: true,
+			requireLocalEmailVerified: true,
 		},
 	},
 	databaseHooks: {
+		account: {
+			update: {
+				after: async (account) => {
+					if (account.providerId !== "credential" || !account.userId) {
+						return;
+					}
+					await purgeOutstandingResetTokens(account.userId);
+				},
+			},
+		},
 		user: {
 			create: {
 				after: async (createdUser) => {
@@ -364,9 +422,13 @@ export const auth = betterAuth({
 	emailAndPassword: {
 		enabled: true,
 		minPasswordLength: 8,
-		maxPasswordLength: 32,
+		maxPasswordLength: 128,
 		autoSignIn: false,
 		requireEmailVerification: shouldRequireEmailVerification(),
+		revokeSessionsOnPasswordReset: true,
+		onPasswordReset: async ({ user }: { user: { id: string } }) => {
+			await purgeOutstandingResetTokens(user.id);
+		},
 		sendResetPassword: async ({ user, url }: { user: any; url: string }) => {
 			const { success } = await ratelimit(`reset:${user.email}`, 3, 3600);
 			if (!success) {
diff --git a/packages/db/src/drizzle/schema/agent.ts b/packages/db/src/drizzle/schema/agent.ts
index 284c2fb02..413182c85 100644
--- a/packages/db/src/drizzle/schema/agent.ts
+++ b/packages/db/src/drizzle/schema/agent.ts
@@ -58,7 +58,7 @@ export const agentChats = pgTable(
 	"agent_chats",
 	{
 		id: text().primaryKey(),
-		websiteId: text("website_id").notNull(),
+		websiteId: text("website_id"),
 		userId: text("user_id").notNull(),
 		organizationId: text("organization_id"),
 		title: text().notNull().default(""),
@@ -72,8 +72,8 @@ export const agentChats = pgTable(
 			.$onUpdate(() => new Date()),
 	},
 	(table) => [
-		index("agent_chats_website_user_updated_idx").on(
-			table.websiteId,
+		index("agent_chats_org_user_updated_idx").on(
+			table.organizationId,
 			table.userId,
 			table.updatedAt.desc()
 		),
@@ -85,7 +85,7 @@ export const agentChats = pgTable(
 			columns: [table.websiteId],
 			foreignColumns: [websites.id],
 			name: "agent_chats_website_id_fkey",
-		}).onDelete("cascade"),
+		}).onDelete("set null"),
 		foreignKey({
 			columns: [table.userId],
 			foreignColumns: [user.id],
diff --git a/packages/rpc/package.json b/packages/rpc/package.json
index 53de54656..fb5994ff9 100644
--- a/packages/rpc/package.json
+++ b/packages/rpc/package.json
@@ -12,6 +12,7 @@
   },
   "exports": {
     ".": "./src/index.ts",
+    "./analytics-utils": "./src/lib/analytics-utils.ts",
     "./autumn": "./src/lib/autumn-client.ts",
     "./billing": "./src/utils/billing.ts",
     "./flags": "./src/utils/flags.ts",
diff --git a/packages/rpc/src/procedures/with-workspace.ts b/packages/rpc/src/procedures/with-workspace.ts
index 280e42ff1..aec279fd2 100644
--- a/packages/rpc/src/procedures/with-workspace.ts
+++ b/packages/rpc/src/procedures/with-workspace.ts
@@ -10,7 +10,7 @@ import { cacheNamespaces, cacheable } from "@databuddy/redis";
 import type { PlanId } from "@databuddy/shared/types/features";
 import { z } from "zod";
 import { rpcError } from "../errors";
-import { logger, record } from "../lib/logger";
+import { record } from "../lib/logger";
 import { type Context, os } from "../orpc";
 
 type Website = NonNullable<Awaited<ReturnType<typeof getWebsiteById>>>;
@@ -42,14 +42,9 @@ const getWebsiteById = cacheable(
 		if (!id) {
 			return null;
 		}
-		try {
-			return await db.query.websites.findFirst({
-				where: { id },
-			});
-		} catch (error) {
-			logger.error({ error, id }, "Error fetching website by ID");
-			return null;
-		}
+		return await db.query.websites.findFirst({
+			where: { id },
+		});
 	},
 	{
 		expireInSec: 600,
@@ -63,16 +58,11 @@ const _getOrganizationRole = async (
 	userId: string,
 	organizationId: string
 ): Promise<string | null> => {
-	try {
-		const membership = await db.query.member.findFirst({
-			where: { userId, organizationId },
-			columns: { role: true },
-		});
-		return membership?.role ?? null;
-	} catch (error) {
-		logger.error({ error, userId, organizationId }, "Error fetching org role");
-		return null;
-	}
+	const membership = await db.query.member.findFirst({
+		where: { userId, organizationId },
+		columns: { role: true },
+	});
+	return membership?.role ?? null;
 };
 
 const getOrganizationRole = cacheable(_getOrganizationRole, {
diff --git a/packages/rpc/src/routers/agent-chats.ts b/packages/rpc/src/routers/agent-chats.ts
index bc60fabe4..4c7790dd1 100644
--- a/packages/rpc/src/routers/agent-chats.ts
+++ b/packages/rpc/src/routers/agent-chats.ts
@@ -4,11 +4,14 @@ import { getActiveStream } from "@databuddy/redis/stream-buffer";
 import { z } from "zod";
 import { rpcError } from "../errors";
 import { sessionProcedure, trackedSessionProcedure } from "../orpc";
-import { withWorkspace } from "../procedures/with-workspace";
+import {
+	withWorkspace,
+	workspaceInputSchema,
+} from "../procedures/with-workspace";
 
 const chatListItemSchema = z.object({
 	id: z.string(),
-	websiteId: z.string(),
+	websiteId: z.string().nullable(),
 	title: z.string(),
 	createdAt: z.coerce.date(),
 	updatedAt: z.coerce.date(),
@@ -58,14 +61,14 @@ export const agentChatsRouter = {
 		.route({
 			method: "POST",
 			path: "/agent-chats/list",
-			summary: "List agent chats for the current user and website",
+			summary: "List agent chats for the current user and organization",
 			tags: ["AgentChats"],
 		})
-		.input(z.object({ websiteId: z.string() }))
+		.input(workspaceInputSchema)
 		.output(z.array(chatListItemSchema))
 		.handler(async ({ context, input }) => {
-			await withWorkspace(context, {
-				websiteId: input.websiteId,
+			const workspace = await withWorkspace(context, {
+				organizationId: input.organizationId,
 				permissions: ["read"],
 			});
 
@@ -81,7 +84,7 @@ export const agentChatsRouter = {
 				.where(
 					and(
 						eq(agentChats.userId, context.user.id),
-						eq(agentChats.websiteId, input.websiteId)
+						eq(agentChats.organizationId, workspace.organizationId)
 					)
 				)
 				.orderBy(desc(agentChats.updatedAt))
@@ -108,12 +111,14 @@ export const agentChatsRouter = {
 				return null;
 			}
 
-			await withWorkspace(context, {
-				websiteId: row.websiteId,
-				permissions: ["read"],
-			});
+			if (row.organizationId) {
+				await withWorkspace(context, {
+					organizationId: row.organizationId,
+					permissions: ["read"],
+				});
+			}
 
-			const activeStreamId = await getActiveStream(row.websiteId, row.id);
+			const activeStreamId = await getActiveStream(row.userId, row.id);
 
 			return {
 				id: row.id,
@@ -143,17 +148,19 @@ export const agentChatsRouter = {
 		.handler(async ({ context, input }) => {
 			const row = await context.db.query.agentChats.findFirst({
 				where: { id: input.id, userId: context.user.id },
-				columns: { id: true, websiteId: true },
+				columns: { id: true, organizationId: true },
 			});
 
 			if (!row) {
 				throw rpcError.notFound("agent chat", input.id);
 			}
 
-			await withWorkspace(context, {
-				websiteId: row.websiteId,
-				permissions: ["update"],
-			});
+			if (row.organizationId) {
+				await withWorkspace(context, {
+					organizationId: row.organizationId,
+					permissions: ["read"],
+				});
+			}
 
 			await context.db
 				.update(agentChats)
@@ -175,17 +182,19 @@ export const agentChatsRouter = {
 		.handler(async ({ context, input }) => {
 			const row = await context.db.query.agentChats.findFirst({
 				where: { id: input.id, userId: context.user.id },
-				columns: { id: true, websiteId: true },
+				columns: { id: true, organizationId: true },
 			});
 
 			if (!row) {
 				throw rpcError.notFound("agent chat", input.id);
 			}
 
-			await withWorkspace(context, {
-				websiteId: row.websiteId,
-				permissions: ["delete"],
-			});
+			if (row.organizationId) {
+				await withWorkspace(context, {
+					organizationId: row.organizationId,
+					permissions: ["read"],
+				});
+			}
 
 			await context.db.delete(agentChats).where(eq(agentChats.id, input.id));
 
diff --git a/packages/rpc/src/routers/billing.ts b/packages/rpc/src/routers/billing.ts
index 5545658df..b68025102 100644
--- a/packages/rpc/src/routers/billing.ts
+++ b/packages/rpc/src/routers/billing.ts
@@ -225,25 +225,65 @@ const spendLimitConfigSchema = z
 		}
 	);
 
-interface AutoTopupEntry {
-	enabled: boolean;
-	featureId: string;
-	quantity: number;
-	threshold: number;
+interface BillingControlEntries {
+	autoTopups: {
+		enabled: boolean;
+		featureId: string;
+		quantity: number;
+		threshold: number;
+	};
+	spendLimits: {
+		enabled: boolean;
+		featureId: string;
+		overageLimit: number;
+	};
+	usageAlerts: {
+		enabled: boolean;
+		featureId: string;
+		threshold: number;
+		thresholdType: "usage_percentage";
+	};
 }
 
-interface UsageAlertEntry {
-	enabled: boolean;
-	featureId: string;
-	name?: string;
-	threshold: number;
-	thresholdType: "usage_percentage";
-}
+async function upsertBillingControl<
+	K extends keyof BillingControlEntries,
+>(args: {
+	context: { user: { id: string }; organizationId?: string | null };
+	key: K;
+	entry: BillingControlEntries[K];
+	operation: string;
+}): Promise<void> {
+	const { customerId, canUserUpgrade } = await getBillingOwner(
+		args.context.user.id,
+		args.context.organizationId
+	);
+	if (!canUserUpgrade) {
+		throw rpcError.forbidden(
+			"Only an organization owner or admin can change billing settings."
+		);
+	}
 
-interface SpendLimitEntry {
-	enabled: boolean;
-	featureId: string;
-	overageLimit: number;
+	try {
+		const autumn = getAutumn();
+		const customer = await autumn.customers.getOrCreate({ customerId });
+		const existing = (customer.billingControls?.[args.key] ?? []) as Array<{
+			featureId: string;
+		}>;
+		const merged = [
+			...existing.filter((e) => e.featureId !== args.entry.featureId),
+			args.entry,
+		];
+		await autumn.customers.update({
+			customerId,
+			billingControls: { [args.key]: merged } as Record<K, typeof merged>,
+		});
+	} catch (error) {
+		logger.error(
+			{ error, customerId, userId: args.context.user.id },
+			`Failed to update ${args.operation} configuration`
+		);
+		throw rpcError.internal(`Failed to update ${args.operation} settings`);
+	}
 }
 
 export const billingRouter = {
@@ -260,49 +300,18 @@ export const billingRouter = {
 		.output(autoTopupConfigSchema)
 		.handler(async ({ context, input }) => {
 			setTrackProperties({ enabled: input.enabled });
-			const { customerId, canUserUpgrade } = await getBillingOwner(
-				context.user.id,
-				context.organizationId
-			);
-			if (!canUserUpgrade) {
-				throw rpcError.forbidden(
-					"Only an organization owner or admin can change billing settings."
-				);
-			}
-
-			try {
-				const autumn = getAutumn();
-				const customer = await autumn.customers.getOrCreate({ customerId });
-				const existing = (customer.billingControls?.autoTopups ??
-					[]) as AutoTopupEntry[];
-				const nextEntry: AutoTopupEntry = {
+			await upsertBillingControl({
+				context,
+				key: "autoTopups",
+				entry: {
 					featureId: AUTO_TOPUP_FEATURE_ID,
 					enabled: input.enabled,
 					threshold: input.threshold,
 					quantity: input.quantity,
-				};
-				const merged = [
-					...existing.filter((t) => t.featureId !== AUTO_TOPUP_FEATURE_ID),
-					nextEntry,
-				];
-
-				await autumn.customers.update({
-					customerId,
-					billingControls: { autoTopups: merged },
-				});
-
-				return {
-					enabled: nextEntry.enabled,
-					threshold: nextEntry.threshold,
-					quantity: nextEntry.quantity,
-				};
-			} catch (error) {
-				logger.error(
-					{ error, customerId, userId: context.user.id },
-					"Failed to update auto top-up configuration"
-				);
-				throw rpcError.internal("Failed to update auto top-up settings");
-			}
+				},
+				operation: "auto top-up",
+			});
+			return input;
 		}),
 
 	setUsageAlert: trackedSessionProcedure
@@ -318,48 +327,18 @@ export const billingRouter = {
 		.output(usageAlertConfigSchema)
 		.handler(async ({ context, input }) => {
 			setTrackProperties({ enabled: input.enabled });
-			const { customerId, canUserUpgrade } = await getBillingOwner(
-				context.user.id,
-				context.organizationId
-			);
-			if (!canUserUpgrade) {
-				throw rpcError.forbidden(
-					"Only an organization owner or admin can change billing settings."
-				);
-			}
-
-			try {
-				const autumn = getAutumn();
-				const customer = await autumn.customers.getOrCreate({ customerId });
-				const existing = (customer.billingControls?.usageAlerts ??
-					[]) as UsageAlertEntry[];
-				const nextEntry: UsageAlertEntry = {
+			await upsertBillingControl({
+				context,
+				key: "usageAlerts",
+				entry: {
 					featureId: EVENTS_FEATURE_ID,
 					enabled: input.enabled,
 					threshold: input.threshold,
-					thresholdType: "usage_percentage",
-				};
-				const merged = [
-					...existing.filter((a) => a.featureId !== EVENTS_FEATURE_ID),
-					nextEntry,
-				];
-
-				await autumn.customers.update({
-					customerId,
-					billingControls: { usageAlerts: merged },
-				});
-
-				return {
-					enabled: nextEntry.enabled,
-					threshold: nextEntry.threshold,
-				};
-			} catch (error) {
-				logger.error(
-					{ error, customerId, userId: context.user.id },
-					"Failed to update usage alert configuration"
-				);
-				throw rpcError.internal("Failed to update usage alert settings");
-			}
+					thresholdType: "usage_percentage" as const,
+				},
+				operation: "usage alert",
+			});
+			return input;
 		}),
 
 	setSpendLimit: trackedSessionProcedure
@@ -375,47 +354,17 @@ export const billingRouter = {
 		.output(spendLimitConfigSchema)
 		.handler(async ({ context, input }) => {
 			setTrackProperties({ enabled: input.enabled });
-			const { customerId, canUserUpgrade } = await getBillingOwner(
-				context.user.id,
-				context.organizationId
-			);
-			if (!canUserUpgrade) {
-				throw rpcError.forbidden(
-					"Only an organization owner or admin can change billing settings."
-				);
-			}
-
-			try {
-				const autumn = getAutumn();
-				const customer = await autumn.customers.getOrCreate({ customerId });
-				const existing = (customer.billingControls?.spendLimits ??
-					[]) as SpendLimitEntry[];
-				const nextEntry: SpendLimitEntry = {
+			await upsertBillingControl({
+				context,
+				key: "spendLimits",
+				entry: {
 					featureId: SPEND_LIMIT_FEATURE_ID,
 					enabled: input.enabled,
 					overageLimit: input.overageLimit,
-				};
-				const merged = [
-					...existing.filter((s) => s.featureId !== SPEND_LIMIT_FEATURE_ID),
-					nextEntry,
-				];
-
-				await autumn.customers.update({
-					customerId,
-					billingControls: { spendLimits: merged },
-				});
-
-				return {
-					enabled: nextEntry.enabled,
-					overageLimit: nextEntry.overageLimit,
-				};
-			} catch (error) {
-				logger.error(
-					{ error, customerId, userId: context.user.id },
-					"Failed to update spend limit configuration"
-				);
-				throw rpcError.internal("Failed to update spend limit settings");
-			}
+				},
+				operation: "spend limit",
+			});
+			return input;
 		}),
 
 	getUsage: protectedProcedure
diff --git a/packages/rpc/src/types/billing.ts b/packages/rpc/src/types/billing.ts
index d6dc58a9c..503616f88 100644
--- a/packages/rpc/src/types/billing.ts
+++ b/packages/rpc/src/types/billing.ts
@@ -13,31 +13,13 @@ import {
 } from "@databuddy/shared/types/features";
 import { ORPCError } from "@orpc/server";
 
-/**
- * Billing context included in the RPC context
- * This is automatically populated when a user is authenticated
- */
 export interface BillingContext {
-	/** Whether the current user can upgrade the plan */
 	canUserUpgrade: boolean;
-	/** The customer ID for billing (user ID or org owner ID) */
 	customerId: string;
-	/** Whether the billing is based on an organization */
 	isOrganization: boolean;
-	/** The current plan ID (e.g., 'free', 'hobby', 'pro', 'scale') */
 	planId: string;
 }
 
-/**
- * Helper to check if a user has a specific plan or higher
- *
- * @example
- * ```ts
- * if (hasPlan((await context.getBilling())?.planId, PLAN_IDS.PRO)) {
- *   // User has pro or higher
- * }
- * ```
- */
 export function hasPlan(
 	currentPlan: string | undefined,
 	requiredPlan: PlanId
@@ -56,31 +38,10 @@ export function hasPlan(
 	return currentIndex >= requiredIndex;
 }
 
-/**
- * Helper to check if a user is on the free plan
- *
- * @example
- * ```ts
- * if (isFreePlan((await context.getBilling())?.planId)) {
- *   throw errors.FEATURE_UNAVAILABLE({ data: { feature: "export" } });
- * }
- * ```
- */
 export function isFreePlan(planId: string | undefined): boolean {
 	return !planId || planId.toLowerCase() === PLAN_IDS.FREE;
 }
 
-/**
- * Get the feature limit for the user's plan
- *
- * @example
- * ```ts
- * const limit = getFeatureLimit((await context.getBilling())?.planId, GATED_FEATURES.FUNNELS);
- * if (limit === false) {
- *   throw errors.FEATURE_UNAVAILABLE({ data: { feature: "funnels" } });
- * }
- * ```
- */
 export function getFeatureLimit(
 	planId: string | undefined,
 	feature: GatedFeatureId
@@ -88,17 +49,6 @@ export function getFeatureLimit(
 	return getPlanFeatureLimit(planId ?? null, feature);
 }
 
-/**
- * Check if current usage is within the plan's limit for a feature
- *
- * @example
- * ```ts
- * const funnelCount = await getFunnelCount(websiteId);
- * if (!isUsageWithinLimit((await context.getBilling())?.planId, GATED_FEATURES.FUNNELS, funnelCount)) {
- *   throw errors.PLAN_LIMIT_EXCEEDED({ data: { limit: 5, current: funnelCount } });
- * }
- * ```
- */
 export function isUsageWithinLimit(
 	planId: string | undefined,
 	feature: GatedFeatureId,
@@ -107,16 +57,6 @@ export function isUsageWithinLimit(
 	return isWithinLimit(planId ?? null, feature, currentUsage);
 }
 
-/**
- * Throws an error if the feature is not available on the user's plan.
- * Uses FEATURE_UNAVAILABLE error code for type-safe client handling.
- *
- * @example
- * ```ts
- * requireFeature((await context.getBilling())?.planId, GATED_FEATURES.FUNNELS);
- * // Throws if user doesn't have access
- * ```
- */
 export function requireFeature(
 	planId: string | undefined,
 	feature: GatedFeatureId
@@ -132,16 +72,6 @@ export function requireFeature(
 	}
 }
 
-/**
- * Checks feature availability AND usage limit in one call.
- * Throws FEATURE_UNAVAILABLE if the feature isn't on the plan,
- * or PLAN_LIMIT_EXCEEDED if the usage limit is reached.
- *
- * @example
- * ```ts
- * requireFeatureWithLimit(workspace.plan, GATED_FEATURES.FUNNELS, existingCount);
- * ```
- */
 export function requireFeatureWithLimit(
 	planId: string | undefined,
 	feature: GatedFeatureId,
@@ -151,16 +81,6 @@ export function requireFeatureWithLimit(
 	requireUsageWithinLimit(planId, feature, currentUsage);
 }
 
-/**
- * Throws an error if current usage exceeds the plan's limit.
- * Uses PLAN_LIMIT_EXCEEDED error code for type-safe client handling.
- *
- * @example
- * ```ts
- * const funnelCount = await db.query.funnels.findMany({ where: eq(funnels.websiteId, websiteId) }).length;
- * requireUsageWithinLimit(workspace.plan, GATED_FEATURES.FUNNELS, funnelCount);
- * ```
- */
 export function requireUsageWithinLimit(
 	planId: string | undefined,
 	feature: GatedFeatureId,
diff --git a/packages/rpc/src/utils/billing.ts b/packages/rpc/src/utils/billing.ts
index ded5e467c..d3547b503 100644
--- a/packages/rpc/src/utils/billing.ts
+++ b/packages/rpc/src/utils/billing.ts
@@ -16,16 +16,11 @@ const _getOrganizationOwnerId = async (
 	if (!organizationId) {
 		return null;
 	}
-	try {
-		const orgMember = await db.query.member.findFirst({
-			where: { organizationId, role: "owner" },
-			columns: { userId: true },
-		});
-		return orgMember?.userId ?? null;
-	} catch (error) {
-		logger.error({ error }, "Error resolving organization owner");
-		return null;
-	}
+	const orgMember = await db.query.member.findFirst({
+		where: { organizationId, role: "owner" },
+		columns: { userId: true },
+	});
+	return orgMember?.userId ?? null;
 };
 
 export const getOrganizationOwnerId = cacheable(_getOrganizationOwnerId, {
diff --git a/packages/validation/src/schemas/analytics.ts b/packages/validation/src/schemas/analytics.ts
index 1ad028474..844439be8 100644
--- a/packages/validation/src/schemas/analytics.ts
+++ b/packages/validation/src/schemas/analytics.ts
@@ -202,3 +202,5 @@ export const analyticsEventSchema = z.object({
 		.optional()
 		.nullable(),
 });
+
+export type AnalyticsEventInput = z.infer<typeof analyticsEventSchema>;
diff --git a/packages/validation/src/schemas/custom-events.ts b/packages/validation/src/schemas/custom-events.ts
index d94c44812..c4490f459 100644
--- a/packages/validation/src/schemas/custom-events.ts
+++ b/packages/validation/src/schemas/custom-events.ts
@@ -58,3 +58,5 @@ export const outgoingLinkSchema = z.object({
 	text: z.string().max(VALIDATION_LIMITS.TEXT_MAX_LENGTH).nullable().optional(),
 	properties: boundedPropertiesJson.optional().nullable(),
 });
+
+export type OutgoingLinkInput = z.infer<typeof outgoingLinkSchema>;