diff --git a/apps/code/src/components/profile/ProfileView.tsx b/apps/code/src/components/profile/ProfileView.tsx
index 4c240e6ed5..57018fe84e 100644
--- a/apps/code/src/components/profile/ProfileView.tsx
+++ b/apps/code/src/components/profile/ProfileView.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { Calendar, Coins, Flame, Github, Hash, Zap } from "lucide-react";
+import dynamic from "next/dynamic";
 import Link from "next/link";
 
 import {
@@ -14,7 +15,6 @@ import {
 	ProfileShareActions,
 	XIcon,
 } from "@/components/profile/ProfileShareActions";
-import { ProfileTokensChart } from "@/components/profile/ProfileTokensChart";
 import { ProfileViewerCta } from "@/components/profile/ProfileViewerCta";
 import { ProfileWrapped } from "@/components/profile/ProfileWrapped";
 import { useAppConfig } from "@/lib/config";
@@ -27,6 +27,16 @@ import type { paths } from "@/lib/api/v1";
 export type ProfileData =
 	paths["/user/profile"]["get"]["responses"][200]["content"]["application/json"]["profile"];
 
+// The tokens chart pulls in recharts and renders below the fold, so keep it
+// out of the profile page's initial bundle.
+const ProfileTokensChart = dynamic(
+	() =>
+		import("@/components/profile/ProfileTokensChart").then(
+			(mod) => mod.ProfileTokensChart,
+		),
+	{ ssr: false, loading: () => <div className="h-52 w-full" /> },
+);
+
 const AGENT_BY_SOURCE = new Map<string, AgentDefinition>();
 for (const agent of AGENTS) {
 	for (const source of agent.sources) {
diff --git a/apps/code/src/components/providers.tsx b/apps/code/src/components/providers.tsx
index 5cf3cb1397..664e0dc931 100644
--- a/apps/code/src/components/providers.tsx
+++ b/apps/code/src/components/providers.tsx
@@ -5,13 +5,12 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 import { ThemeProvider } from "next-themes";
 import posthog from "posthog-js";
 import { PostHogProvider } from "posthog-js/react";
-import { useEffect, useMemo } from "react";
+import { useEffect, useState } from "react";
 
 import { Toaster } from "@/components/ui/sonner";
 import { AppConfigProvider } from "@/lib/config";
 
 import type { AppConfig } from "@/lib/config-server";
-import type { PostHogConfig } from "posthog-js";
 import type { ReactNode } from "react";
 
 interface ProvidersProps {
@@ -20,7 +19,9 @@ interface ProvidersProps {
 }
 
 export function Providers({ children, config }: ProvidersProps) {
-	const queryClient = useMemo(
+	// useState, not useMemo: React may discard a useMemo cache, which would
+	// silently swap in a fresh QueryClient and drop the whole query cache.
+	const [queryClient] = useState(
 		() =>
 			new QueryClient({
 				defaultOptions: {
@@ -31,20 +32,6 @@ export function Providers({ children, config }: ProvidersProps) {
 					},
 				},
 			}),
-		[],
-	);
-
-	const posthogOptions = useMemo<Partial<PostHogConfig>>(
-		() => ({
-			// Ingest through our own origin (see the /ingest rewrites in
-			// next.config.ts) so ad blockers that block *.posthog.com don't
-			// silently drop client events.
-			api_host: "/ingest",
-			ui_host: config.posthogHost,
-			capture_pageview: "history_change",
-			autocapture: true,
-		}),
-		[config.posthogHost],
 	);
 
 	useEffect(() => {
@@ -52,8 +39,20 @@ export function Providers({ children, config }: ProvidersProps) {
 			return;
 		}
 		const key = config.posthogKey;
+		const host = config.posthogHost;
+		// Built inline and keyed on primitives: a memoized options object that
+		// React discards would re-run this effect, and its cleanup would cancel
+		// the already-queued init.
 		const init = () => {
-			posthog.init(key, posthogOptions);
+			posthog.init(key, {
+				// Ingest through our own origin (see the /ingest rewrites in
+				// next.config.ts) so ad blockers that block *.posthog.com don't
+				// silently drop client events.
+				api_host: "/ingest",
+				ui_host: host,
+				capture_pageview: "history_change",
+				autocapture: true,
+			});
 		};
 		// Captures fired before init() are dropped by posthog-js, so the idle
 		// deferral must be bounded — a busy main thread can starve
@@ -64,7 +63,7 @@ export function Providers({ children, config }: ProvidersProps) {
 		}
 		const timer = setTimeout(init, 300);
 		return () => clearTimeout(timer);
-	}, [config.posthogKey, posthogOptions]);
+	}, [config.posthogKey, config.posthogHost]);
 
 	return (
 		<AppConfigProvider config={config}>
diff --git a/apps/code/src/lib/utils/markdown.tsx b/apps/code/src/lib/utils/markdown.tsx
index 9f32ec1c2d..1ddcd680bb 100644
--- a/apps/code/src/lib/utils/markdown.tsx
+++ b/apps/code/src/lib/utils/markdown.tsx
@@ -1,4 +1,10 @@
-import { SyntaxHighlightedPre } from "./markdown-code-block";
+import dynamic from "next/dynamic";
+
+// Defer the prism-based highlighter chunk until a markdown document actually
+// renders a fenced code block.
+const SyntaxHighlightedPre = dynamic(() =>
+	import("./markdown-code-block").then((mod) => mod.SyntaxHighlightedPre),
+);
 
 // Get markdown component options with custom styling
 export function getMarkdownOptions() {
diff --git a/apps/docs/app/(home)/[[...slug]]/page.tsx b/apps/docs/app/(home)/[[...slug]]/page.tsx
index cf0bb14804..a77959d9d6 100644
--- a/apps/docs/app/(home)/[[...slug]]/page.tsx
+++ b/apps/docs/app/(home)/[[...slug]]/page.tsx
@@ -7,7 +7,6 @@ import {
 	DocsTitle,
 } from "fumadocs-ui/page";
 import { notFound } from "next/navigation";
-import posthog from "posthog-js";
 
 import { LLMCopyButton, ViewOptions } from "@/components/ai/page-actions";
 import { EnterpriseCTA } from "@/components/enterprise-cta";
@@ -90,6 +89,11 @@ export default async function Page(props: {
 		// Ignore errors (rate limits, network issues, missing auth in Docker builds)
 	}
 
+	// Left undefined when the GitHub lookup fails: fumadocs then omits the line
+	// entirely, which is better than stamping the build date on a page that was
+	// not edited — "Last updated" must only ever reflect a real content edit.
+	const lastUpdate = time ? new Date(time) : undefined;
+
 	const MDXContent = page.data.body;
 
 	const path = page.url === "/" ? "" : page.url;
@@ -120,7 +124,7 @@ export default async function Page(props: {
 				style: "clerk",
 				footer: <EnterpriseCTA />,
 			}}
-			lastUpdate={time ? new Date(time) : new Date()}
+			lastUpdate={lastUpdate}
 		>
 			<JsonLd data={techArticleSchema} />
 			<nav
@@ -150,9 +154,8 @@ export default async function Page(props: {
 				/>
 			</DocsBody>
 			<Feedback
-				onRateAction={async (url, feedback) => {
+				onRateAction={async (url) => {
 					"use server";
-					posthog.capture("on_rate_docs", feedback);
 					return await Promise.resolve({
 						githubUrl: `https://github.com/theopenco/llmgateway/blob/main/apps/docs/content${url}.mdx`,
 					});
diff --git a/apps/docs/app/(home)/layout.tsx b/apps/docs/app/(home)/layout.tsx
index f1521b7e31..b884e3510f 100644
--- a/apps/docs/app/(home)/layout.tsx
+++ b/apps/docs/app/(home)/layout.tsx
@@ -1,14 +1,7 @@
-import { buttonVariants } from "fumadocs-ui/components/ui/button";
 import { DocsLayout } from "fumadocs-ui/layouts/docs";
-import { MessageCircleIcon } from "lucide-react";
 
 import { baseOptions } from "@/app/layout.config";
-import {
-	AISearch,
-	AISearchPanel,
-	AISearchTrigger,
-} from "@/components/ai/search";
-import { cn } from "@/lib/cn";
+import { AskAI } from "@/components/ai/ask-ai";
 import { source } from "@/lib/source";
 
 import type { DocsLayoutProps } from "fumadocs-ui/layouts/docs";
@@ -42,21 +35,7 @@ const docsOptions: DocsLayoutProps = {
 export default function Layout({ children }: { children: ReactNode }) {
 	return (
 		<DocsLayout {...docsOptions}>
-			<AISearch>
-				<AISearchPanel />
-				<AISearchTrigger
-					position="float"
-					className={cn(
-						buttonVariants({
-							color: "secondary",
-							className: "text-fd-muted-foreground rounded-2xl",
-						}),
-					)}
-				>
-					<MessageCircleIcon className="size-4.5" />
-					Ask AI
-				</AISearchTrigger>
-			</AISearch>
+			<AskAI />
 			{children}
 		</DocsLayout>
 	);
diff --git a/apps/docs/components/ai/ask-ai.tsx b/apps/docs/components/ai/ask-ai.tsx
new file mode 100644
index 0000000000..1e5c899ee6
--- /dev/null
+++ b/apps/docs/components/ai/ask-ai.tsx
@@ -0,0 +1,68 @@
+"use client";
+import { buttonVariants } from "fumadocs-ui/components/ui/button";
+import { MessageCircleIcon } from "lucide-react";
+import dynamic from "next/dynamic";
+import { useCallback, useEffect, useEffectEvent, useState } from "react";
+
+import { cn } from "@/lib/cn";
+
+// The panel module pulls in @ai-sdk/react, its transport and the remark/shiki
+// markdown pipeline. Loading it on demand keeps all of that out of the initial
+// bundle of every docs page; the trigger below stays server-rendered so the
+// button never pops in after hydration.
+const AISearchPanel = dynamic(() => import("./search"), {
+	loading: () => null,
+});
+
+export function AskAI() {
+	const [open, setOpen] = useState(false);
+	// Once opened, the panel stays mounted so the conversation survives closing
+	// and reopening — the chat state lives inside the lazily loaded module.
+	const [hasOpened, setHasOpened] = useState(false);
+
+	const toggle = useCallback((next: boolean) => {
+		if (next) {
+			setHasOpened(true);
+		}
+		setOpen(next);
+	}, []);
+
+	const onKeyPress = useEffectEvent((e: KeyboardEvent) => {
+		if (e.key === "Escape" && open) {
+			toggle(false);
+			e.preventDefault();
+		}
+
+		if (e.key === "/" && (e.metaKey || e.ctrlKey) && !open) {
+			toggle(true);
+			e.preventDefault();
+		}
+	});
+
+	useEffect(() => {
+		window.addEventListener("keydown", onKeyPress);
+		return () => window.removeEventListener("keydown", onKeyPress);
+	}, []);
+
+	return (
+		<>
+			{hasOpened && <AISearchPanel open={open} setOpen={toggle} />}
+			<button
+				type="button"
+				data-state={open ? "open" : "closed"}
+				className={cn(
+					buttonVariants({
+						color: "secondary",
+						className: "text-fd-muted-foreground rounded-2xl",
+					}),
+					"fixed bottom-4 gap-3 w-24 inset-e-[calc(--spacing(4)+var(--removed-body-scroll-bar-size,0px))] shadow-lg z-20 transition-[translate,opacity]",
+					open && "translate-y-10 opacity-0",
+				)}
+				onClick={() => toggle(!open)}
+			>
+				<MessageCircleIcon className="size-4.5" />
+				Ask AI
+			</button>
+		</>
+	);
+}
diff --git a/apps/docs/components/ai/search.tsx b/apps/docs/components/ai/search.tsx
index b76334cb79..dd4a036e91 100644
--- a/apps/docs/components/ai/search.tsx
+++ b/apps/docs/components/ai/search.tsx
@@ -14,11 +14,9 @@ import {
 import {
 	type ComponentProps,
 	createContext,
-	type ReactNode,
 	type SyntheticEvent,
 	use,
 	useEffect,
-	useEffectEvent,
 	useMemo,
 	useRef,
 	useState,
@@ -349,8 +347,16 @@ function Message({
 	);
 }
 
-export function AISearch({ children }: { children: ReactNode }) {
-	const [open, setOpen] = useState(false);
+// Default export so ask-ai.tsx can lazily import this module: it drags in the
+// AI SDK, its transport and the remark/shiki markdown pipeline, none of which a
+// reader who never opens Ask AI should have to download.
+export default function AISearchPanel({
+	open,
+	setOpen,
+}: {
+	open: boolean;
+	setOpen: (open: boolean) => void;
+}) {
 	const chat = useChat<ChatUIMessage>({
 		id: "search",
 		transport: new DefaultChatTransport({
@@ -359,43 +365,9 @@ export function AISearch({ children }: { children: ReactNode }) {
 	});
 
 	return (
-		<Context value={useMemo(() => ({ chat, open, setOpen }), [chat, open])}>
-			{children}
-		</Context>
-	);
-}
-
-export function AISearchTrigger({
-	position = "default",
-	className,
-	...props
-}: ComponentProps<"button"> & { position?: "default" | "float" }) {
-	const { open, setOpen } = useAISearchContext();
-
-	return (
-		<button
-			data-state={open ? "open" : "closed"}
-			className={cn(
-				position === "float" && [
-					"fixed bottom-4 gap-3 w-24 inset-e-[calc(--spacing(4)+var(--removed-body-scroll-bar-size,0px))] shadow-lg z-20 transition-[translate,opacity]",
-					open && "translate-y-10 opacity-0",
-				],
-				className,
-			)}
-			onClick={() => setOpen(!open)}
-			{...props}
+		<Context
+			value={useMemo(() => ({ chat, open, setOpen }), [chat, open, setOpen])}
 		>
-			{props.children}
-		</button>
-	);
-}
-
-export function AISearchPanel() {
-	const { open, setOpen } = useAISearchContext();
-	useHotKey();
-
-	return (
-		<>
 			<style>
 				{`
         @keyframes ask-ai-open {
@@ -447,7 +419,7 @@ export function AISearchPanel() {
 					</div>
 				</div>
 			</Presence>
-		</>
+		</Context>
 	);
 }
 
@@ -493,27 +465,6 @@ export function AISearchPanelList({
 	);
 }
 
-export function useHotKey() {
-	const { open, setOpen } = useAISearchContext();
-
-	const onKeyPress = useEffectEvent((e: KeyboardEvent) => {
-		if (e.key === "Escape" && open) {
-			setOpen(false);
-			e.preventDefault();
-		}
-
-		if (e.key === "/" && (e.metaKey || e.ctrlKey) && !open) {
-			setOpen(true);
-			e.preventDefault();
-		}
-	});
-
-	useEffect(() => {
-		window.addEventListener("keydown", onKeyPress);
-		return () => window.removeEventListener("keydown", onKeyPress);
-	}, []);
-}
-
 export function useAISearchContext() {
 	return use(Context)!;
 }
diff --git a/apps/docs/components/feedback.tsx b/apps/docs/components/feedback.tsx
index b710312e45..079968e211 100644
--- a/apps/docs/components/feedback.tsx
+++ b/apps/docs/components/feedback.tsx
@@ -6,6 +6,7 @@ import {
 } from "fumadocs-ui/components/ui/collapsible";
 import { ThumbsDown, ThumbsUp } from "lucide-react";
 import { usePathname } from "next/navigation";
+import { usePostHog } from "posthog-js/react";
 import {
 	type SyntheticEvent,
 	useEffect,
@@ -43,17 +44,37 @@ interface Result extends Feedback {
 	response?: ActionResponse;
 }
 
+// localStorage throws outright in Safari Private Browsing and when site data is
+// blocked, so persistence is best-effort: it must never take the widget down or
+// block the confirmation UI.
 function readStoredFeedback(url: string): Result | null {
-	const item = localStorage.getItem(`docs-feedback-${url}`);
-	return item === null ? null : (JSON.parse(item) as Result);
+	try {
+		const item = localStorage.getItem(`docs-feedback-${url}`);
+		return item === null ? null : (JSON.parse(item) as Result);
+	} catch {
+		return null;
+	}
+}
+
+function writeStoredFeedback(url: string, result: Result | null) {
+	try {
+		if (result) {
+			localStorage.setItem(`docs-feedback-${url}`, JSON.stringify(result));
+		} else {
+			localStorage.removeItem(`docs-feedback-${url}`);
+		}
+	} catch {
+		// Ignore: the rating is already recorded server-side and in PostHog.
+	}
 }
 
 export function Feedback({
 	onRateAction,
 }: {
-	onRateAction: (url: string, feedback: Feedback) => Promise<ActionResponse>;
+	onRateAction: (url: string) => Promise<ActionResponse>;
 }) {
 	const url = usePathname();
+	const posthog = usePostHog();
 	const [previous, replacePrevious] = useReducer(
 		(_previous: Result | null, nextPrevious: Result | null) => nextPrevious,
 		null,
@@ -66,16 +87,6 @@ export function Feedback({
 		replacePrevious(readStoredFeedback(url));
 	}, [url]);
 
-	useEffect(() => {
-		const key = `docs-feedback-${url}`;
-
-		if (previous) {
-			localStorage.setItem(key, JSON.stringify(previous));
-		} else {
-			localStorage.removeItem(key);
-		}
-	}, [previous, url]);
-
 	function submit(e?: SyntheticEvent) {
 		if (opinion === null) {
 			return;
@@ -87,13 +98,18 @@ export function Feedback({
 				message,
 			};
 
-			void onRateAction(url, feedback).then((response) => {
-				replacePrevious({
+			posthog.capture("on_rate_docs", { ...feedback, url });
+			void onRateAction(url).then((response) => {
+				const result: Result = {
 					response,
 					...feedback,
-				});
+				};
+				// Commit the UI first: a storage failure must not swallow the
+				// confirmation panel and leave Submit looking unresponsive.
+				replacePrevious(result);
 				setMessage("");
 				setOpinion(null);
+				writeStoredFeedback(url, result);
 			});
 		});
 
@@ -172,6 +188,7 @@ export function Feedback({
 								onClick={() => {
 									setOpinion(previous.opinion);
 									replacePrevious(null);
+									writeStoredFeedback(url, null);
 								}}
 							>
 								Submit Again
diff --git a/apps/docs/components/markdown.tsx b/apps/docs/components/markdown.tsx
index 21850660df..0b9b81fd41 100644
--- a/apps/docs/components/markdown.tsx
+++ b/apps/docs/components/markdown.tsx
@@ -9,6 +9,7 @@ import {
 	isValidElement,
 	use,
 	useDeferredValue,
+	useEffect,
 } from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { remark } from "remark";
@@ -123,11 +124,59 @@ export function Markdown({ text }: { text: string }) {
 	);
 }
 
+// Streaming answers render one snapshot per token, so cap the cache to keep
+// intermediate strings from accumulating for the lifetime of the tab.
 const cache = new Map<string, Promise<ReactNode>>();
+const cacheLimit = 200;
+
+// Text a mounted Renderer still depends on, by reference count. Evicting one of
+// these would make that Renderer re-suspend on its next render and flash an
+// already-answered message back to the invisible fallback — messages stop
+// re-rendering once they finish streaming (apps/docs runs the React Compiler),
+// so LRU ordering alone does not keep them warm.
+const pinned = new Map<string, number>();
+
+function evictColdEntries(exclude?: string) {
+	for (const key of cache.keys()) {
+		if (cache.size <= cacheLimit) {
+			return;
+		}
+		if (key !== exclude && !pinned.has(key)) {
+			cache.delete(key);
+		}
+	}
+}
 
 function Renderer({ text }: { text: string }) {
-	const result = cache.get(text) ?? processor.process(text);
+	useEffect(() => {
+		pinned.set(text, (pinned.get(text) ?? 0) + 1);
+
+		return () => {
+			const count = pinned.get(text) ?? 0;
+			if (count > 1) {
+				pinned.set(text, count - 1);
+			} else {
+				pinned.delete(text);
+			}
+			// A slot just went cold; reclaim it so the cache shrinks back once
+			// long-lived messages unmount.
+			evictColdEntries();
+		};
+	}, [text]);
+
+	let result = cache.get(text);
+
+	if (result) {
+		// Refresh insertion order so eviction removes cold entries first.
+		cache.delete(text);
+	} else {
+		result = processor.process(text);
+	}
 	cache.set(text, result);
+	// The current entry is not pinned until the effect runs, so shield it from
+	// eviction — deleting it here would recreate the promise every render and
+	// suspend the message indefinitely once all other slots are pinned.
+	evictColdEntries(text);
 
 	return use(result);
 }
diff --git a/apps/docs/lib/providers.tsx b/apps/docs/lib/providers.tsx
index 4938dd609e..0ebd60c1a2 100644
--- a/apps/docs/lib/providers.tsx
+++ b/apps/docs/lib/providers.tsx
@@ -30,11 +30,14 @@ export function PostHogProvider({ children }: { children: ReactNode }) {
 				},
 			});
 		};
+		// Captures fired before init() are dropped by posthog-js, so the idle
+		// deferral must be bounded — a busy main thread can starve
+		// requestIdleCallback long enough for a reader to rate a page.
 		if (typeof requestIdleCallback !== "undefined") {
-			const id = requestIdleCallback(init);
+			const id = requestIdleCallback(init, { timeout: 800 });
 			return () => cancelIdleCallback(id);
 		}
-		const timer = setTimeout(init, 1000);
+		const timer = setTimeout(init, 300);
 		return () => clearTimeout(timer);
 	}, [config.isLoaded, config.posthogKey, config.posthogHost, config.hasError]);
 
diff --git a/apps/playground/src/app/group/page.tsx b/apps/playground/src/app/group/page.tsx
index 7d257e8e10..15ff38beff 100644
--- a/apps/playground/src/app/group/page.tsx
+++ b/apps/playground/src/app/group/page.tsx
@@ -30,38 +30,31 @@ export default async function GroupPage({
 }) {
 	const { orgId, projectId } = await searchParams;
 
-	// Fetch models and providers from API
-	const [models, providers] = await Promise.all([
-		fetchModels(),
-		fetchProviders(),
-	]);
-
-	// Ensure the dedicated Chat org exists, then list it so it can back the
-	// default billing context for the playground.
-	await fetchServerData("GET", "/playground/chat-org");
-	const initialOrganizationsData = await fetchServerData("GET", "/orgs", {
-		params: { query: { includeChat: "true" } },
-	});
-
-	// Fetch projects for the specific organization (if provided)
-	let initialProjectsData: { projects: Project[] } | null = null;
-	if (orgId) {
-		try {
-			initialProjectsData = (await fetchServerData(
-				"GET",
-				"/orgs/{id}/projects",
-				{
-					params: {
-						path: {
-							id: orgId,
+	const [models, providers, initialOrganizationsData, orgIdProjectsData] =
+		await Promise.all([
+			fetchModels(),
+			fetchProviders(),
+			// Ensure the dedicated Chat org exists, then list it so it can back the
+			// default billing context for the playground.
+			fetchServerData("GET", "/playground/chat-org").then(() =>
+				fetchServerData("GET", "/orgs", {
+					params: { query: { includeChat: "true" } },
+				}),
+			),
+			orgId
+				? fetchServerData("GET", "/orgs/{id}/projects", {
+						params: {
+							path: {
+								id: orgId,
+							},
 						},
-					},
-				},
-			)) as { projects: Project[] };
-		} catch (error) {
-			console.warn("Failed to fetch projects for organization:", orgId, error);
-		}
-	}
+					})
+				: null,
+		]);
+
+	let initialProjectsData = (orgIdProjectsData ?? null) as {
+		projects: Project[];
+	} | null;
 
 	// Validate that the project exists and is not deleted (if explicitly provided)
 	if (
diff --git a/apps/playground/src/app/playground-shell.tsx b/apps/playground/src/app/playground-shell.tsx
index e136ca2d64..fbc1475802 100644
--- a/apps/playground/src/app/playground-shell.tsx
+++ b/apps/playground/src/app/playground-shell.tsx
@@ -70,7 +70,34 @@ export async function renderPlaygroundShell({
 	const modelsPromise = fetchModels();
 	const providersPromise = fetchProviders();
 
-	const initialOrganizationsData = await fetchServerData("GET", "/orgs");
+	const shouldCheckChatPlan =
+		!orgId && !orgShareView && !cookieStore.get(CHAT_CONTEXT_COOKIE);
+
+	// /orgs, the chat-plan status, and the orgId-scoped projects list are
+	// mutually independent (the projects fetch only happens with an orgId, the
+	// plan check only without one), so resolve them in one round trip. Only the
+	// chat-org fetch below must stay sequenced after the plan-redirect check.
+	const [initialOrganizationsData, chatPlanStatusData, eagerProjectsData] =
+		await Promise.all([
+			fetchServerData("GET", "/orgs"),
+			shouldCheckChatPlan ? fetchServerData("GET", "/chat-plans/status") : null,
+			orgId
+				? fetchServerData("GET", "/orgs/{id}/projects", {
+						params: {
+							path: {
+								id: orgId,
+							},
+						},
+					}).catch((error) => {
+						console.warn(
+							"Failed to fetch projects for organization:",
+							orgId,
+							error,
+						);
+						return null;
+					})
+				: null,
+		]);
 	const allOrganizations = (
 		initialOrganizationsData &&
 		typeof initialOrganizationsData === "object" &&
@@ -89,11 +116,7 @@ export async function renderPlaygroundShell({
 	// chat-org fetch so redirected users never get a Chat org provisioned.
 	// Skipped when the user explicitly picked the Chat plan context in the org
 	// switcher (cookie) — this fallback must not override an explicit choice.
-	if (!orgId && !orgShareView && !cookieStore.get(CHAT_CONTEXT_COOKIE)) {
-		const chatPlanStatusData = await fetchServerData(
-			"GET",
-			"/chat-plans/status",
-		);
+	if (shouldCheckChatPlan) {
 		const chatPlanStatus =
 			chatPlanStatusData &&
 			typeof chatPlanStatusData === "object" &&
@@ -140,24 +163,9 @@ export async function renderPlaygroundShell({
 		notFound();
 	}
 
-	let initialProjectsData: { projects: Project[] } | null = null;
-	if (orgId) {
-		try {
-			initialProjectsData = (await fetchServerData(
-				"GET",
-				"/orgs/{id}/projects",
-				{
-					params: {
-						path: {
-							id: orgId,
-						},
-					},
-				},
-			)) as { projects: Project[] };
-		} catch (error) {
-			console.warn("Failed to fetch projects for organization:", orgId, error);
-		}
-	}
+	let initialProjectsData = eagerProjectsData as {
+		projects: Project[];
+	} | null;
 
 	if (
 		projectId &&
diff --git a/apps/playground/src/app/posthog.ts b/apps/playground/src/app/posthog.ts
index 5eec050ac2..dd64acec20 100644
--- a/apps/playground/src/app/posthog.ts
+++ b/apps/playground/src/app/posthog.ts
@@ -2,6 +2,10 @@ import { PostHog } from "posthog-node";
 
 import { getConfig } from "@/lib/config-server";
 
+// Each PostHog instance owns an event queue and flush timer, so construct one
+// shared client per process instead of one per request.
+let client: PostHog | null = null;
+
 export default function PostHogClient() {
 	const config = getConfig();
 
@@ -13,8 +17,8 @@ export default function PostHogClient() {
 		return null;
 	}
 
-	const posthogClient = new PostHog(config.posthogKey!, {
+	client ??= new PostHog(config.posthogKey, {
 		host: config.posthogHost,
 	});
-	return posthogClient;
+	return client;
 }
diff --git a/apps/playground/src/components/ai-elements/code-block.tsx b/apps/playground/src/components/ai-elements/code-block.tsx
index 09d066f8b8..e56c609f22 100644
--- a/apps/playground/src/components/ai-elements/code-block.tsx
+++ b/apps/playground/src/components/ai-elements/code-block.tsx
@@ -12,7 +12,6 @@ import {
 	useRef,
 	useState,
 } from "react";
-import { createHighlighter } from "shiki";
 
 import { Button } from "@/components/ui/button";
 import {
@@ -148,10 +147,24 @@ const getHighlighter = (
 		return cached;
 	}
 
-	const highlighterPromise = createHighlighter({
-		langs: [language],
-		themes: ["github-light", "github-dark"],
-	});
+	// Import shiki lazily so its engine and grammar registry stay out of the
+	// chunk until a code block actually renders.
+	const highlighterPromise = import("shiki")
+		.then(({ createHighlighter }) =>
+			createHighlighter({
+				langs: [language],
+				themes: ["github-light", "github-dark"],
+			}),
+		)
+		.catch((error: unknown) => {
+			// Dropping the rejected promise keeps a one-off chunk-load failure
+			// (e.g. a deploy rotating hashes under an open tab) from permanently
+			// downgrading every later code block to unhighlighted plain text.
+			if (highlighterCache.get(language) === highlighterPromise) {
+				highlighterCache.delete(language);
+			}
+			throw error;
+		});
 
 	highlighterCache.set(language, highlighterPromise);
 	return highlighterPromise;
diff --git a/apps/playground/src/components/providers.tsx b/apps/playground/src/components/providers.tsx
index f769bd8634..c8149ca2ab 100644
--- a/apps/playground/src/components/providers.tsx
+++ b/apps/playground/src/components/providers.tsx
@@ -5,10 +5,11 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 import { ThemeProvider } from "next-themes";
 import posthog from "posthog-js";
 import { PostHogProvider } from "posthog-js/react";
-import { useEffect, useMemo } from "react";
+import { useEffect, useState } from "react";
 
 import { Toaster } from "@/components/ui/sonner";
 import { AppConfigProvider } from "@/lib/config";
+import { flushPendingIdentity } from "@/lib/posthog-identity";
 
 import type { AppConfig } from "@/lib/config-server";
 import type { ReactNode } from "react";
@@ -19,7 +20,9 @@ interface ProvidersProps {
 }
 
 export function Providers({ children, config }: ProvidersProps) {
-	const queryClient = useMemo(
+	// useState, not useMemo: React may discard a useMemo cache, which would
+	// silently swap in a fresh QueryClient and drop the whole query cache.
+	const [queryClient] = useState(
 		() =>
 			new QueryClient({
 				defaultOptions: {
@@ -30,7 +33,6 @@ export function Providers({ children, config }: ProvidersProps) {
 					},
 				},
 			}),
-		[],
 	);
 
 	useEffect(() => {
@@ -48,6 +50,7 @@ export function Providers({ children, config }: ProvidersProps) {
 				ui_host: host,
 				capture_pageview: "history_change",
 				autocapture: true,
+				loaded: flushPendingIdentity,
 			});
 		};
 		// Captures fired before init() are dropped by posthog-js, so the idle
diff --git a/apps/playground/src/hooks/useUser.ts b/apps/playground/src/hooks/useUser.ts
index 80b9fe44dc..006bffa51f 100644
--- a/apps/playground/src/hooks/useUser.ts
+++ b/apps/playground/src/hooks/useUser.ts
@@ -5,6 +5,7 @@ import { usePostHog } from "posthog-js/react";
 import { useEffect } from "react";
 
 import { useApi } from "@/lib/fetch-client";
+import { clearPendingIdentity, identifyUser } from "@/lib/posthog-identity";
 
 export interface UserUpdateData {
 	name?: string;
@@ -38,12 +39,19 @@ export function useUser(options?: UseUserOptions) {
 		},
 	);
 
-	if (data) {
-		posthog.identify(data.user.id, {
-			email: data.user.email,
-			name: data.user.name,
-		});
-	}
+	useEffect(() => {
+		if (data?.user) {
+			// Queued rather than called directly: this effect fires once and can
+			// win the race against the deferred posthog.init(), which would drop
+			// the identify() and leave the whole session anonymous.
+			identifyUser(posthog, data.user.id, {
+				email: data.user.email,
+				name: data.user.name,
+			});
+		} else {
+			clearPendingIdentity();
+		}
+	}, [data?.user, posthog]);
 
 	// Check for onboarding completion for all authenticated users
 	useEffect(() => {
diff --git a/apps/playground/src/lib/posthog-identity.ts b/apps/playground/src/lib/posthog-identity.ts
new file mode 100644
index 0000000000..538d94ec2e
--- /dev/null
+++ b/apps/playground/src/lib/posthog-identity.ts
@@ -0,0 +1,49 @@
+// Structural rather than the concrete PostHog class: posthog.init()'s `loaded`
+// callback hands back the narrower PostHogInterface.
+interface PostHogLike {
+	identify: (id: string, properties?: Record<string, unknown>) => void;
+}
+
+interface PendingIdentity {
+	id: string;
+	properties: Record<string, unknown>;
+}
+
+let pending: PendingIdentity | null = null;
+let isLoaded = false;
+
+// posthog.init() is deferred to idle time in providers.tsx, and posthog-js
+// silently drops identify() calls made before it finishes. The user query
+// usually resolves first, so hold the latest identity here and let the init
+// callback flush it — otherwise every event for that session stays anonymous.
+export function identifyUser(
+	client: PostHogLike,
+	id: string,
+	properties: Record<string, unknown>,
+) {
+	if (isLoaded) {
+		client.identify(id, properties);
+		return;
+	}
+
+	pending = { id, properties };
+}
+
+// Drop a queued identity that never flushed — without this, an identity queued
+// before logout would be flushed after init and attribute the now-anonymous
+// session to the previous user.
+export function clearPendingIdentity() {
+	pending = null;
+}
+
+export function flushPendingIdentity(client: PostHogLike) {
+	isLoaded = true;
+
+	if (!pending) {
+		return;
+	}
+
+	const { id, properties } = pending;
+	pending = null;
+	client.identify(id, properties);
+}
diff --git a/apps/playground/src/lib/providers.tsx b/apps/playground/src/lib/providers.tsx
index ada2d3366c..c4a79443ec 100644
--- a/apps/playground/src/lib/providers.tsx
+++ b/apps/playground/src/lib/providers.tsx
@@ -4,7 +4,7 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 import { ThemeProvider } from "next-themes";
 import { PostHogProvider } from "posthog-js/react";
-import { useMemo } from "react";
+import { useState } from "react";
 
 import { Toaster } from "@/components/ui/sonner";
 import { AppConfigProvider } from "@/lib/config";
@@ -19,7 +19,9 @@ interface ProvidersProps {
 }
 
 export function Providers({ children, config }: ProvidersProps) {
-	const queryClient = useMemo(
+	// useState, not useMemo: React may discard a useMemo cache, which would
+	// silently swap in a fresh QueryClient and drop the whole query cache.
+	const [queryClient] = useState(
 		() =>
 			new QueryClient({
 				defaultOptions: {
@@ -30,7 +32,6 @@ export function Providers({ children, config }: ProvidersProps) {
 					},
 				},
 			}),
-		[],
 	);
 
 	const posthogOptions: Partial<PostHogConfig> | undefined = {
diff --git a/apps/ui/src/app/blog/page.tsx b/apps/ui/src/app/blog/page.tsx
index c50845c4a1..78564e3fed 100644
--- a/apps/ui/src/app/blog/page.tsx
+++ b/apps/ui/src/app/blog/page.tsx
@@ -2,6 +2,8 @@ import { BlogList } from "@/components/blog/list";
 import { HeroRSC } from "@/components/landing/hero-rsc";
 import { JsonLd } from "@/components/seo/json-ld";
 
+import type { Blog } from "content-collections";
+
 interface BlogItem {
 	id: string;
 	slug: string;
@@ -14,12 +16,12 @@ export default async function BlogPage() {
 	const { allBlogs } = await import("content-collections");
 
 	const sortedEntries = allBlogs
+		.filter((entry: Blog) => !entry?.draft)
 		.sort(
-			(a: any, b: any) =>
+			(a: Blog, b: Blog) =>
 				new Date(b.date).getTime() - new Date(a.date).getTime(),
 		)
-		.filter((entry: any) => !entry?.draft)
-		.map(({ ...entry }: any) => entry as BlogItem);
+		.map(({ ...entry }: Blog) => entry as BlogItem);
 
 	// Standalone top-level ItemList (referenced by the CollectionPage via @id)
 	// so parsers that only inspect top-level @type values still see the list.
diff --git a/apps/ui/src/app/changelog/page.tsx b/apps/ui/src/app/changelog/page.tsx
index bfff11b2a5..7b385cf301 100644
--- a/apps/ui/src/app/changelog/page.tsx
+++ b/apps/ui/src/app/changelog/page.tsx
@@ -7,11 +7,11 @@ export default async function ChangelogPage() {
 	const { allChangelogs } = await import("content-collections");
 
 	const sortedEntries = allChangelogs
+		.filter((entry: ChangelogType) => !entry?.draft)
 		.sort(
 			(a: ChangelogType, b: ChangelogType) =>
 				new Date(b.date).getTime() - new Date(a.date).getTime(),
 		)
-		.filter((entry: ChangelogType) => !entry?.draft)
 		.map(({ ...entry }: ChangelogType) => entry);
 
 	return (
diff --git a/apps/ui/src/app/dashboard/[orgId]/[projectId]/layout.tsx b/apps/ui/src/app/dashboard/[orgId]/[projectId]/layout.tsx
index 3dc4ba9f29..d64963b41c 100644
--- a/apps/ui/src/app/dashboard/[orgId]/[projectId]/layout.tsx
+++ b/apps/ui/src/app/dashboard/[orgId]/[projectId]/layout.tsx
@@ -1,7 +1,7 @@
 import { DeveloperRouteGuard } from "@/components/dashboard/developer-route-guard";
 import { LastUsedProjectTracker } from "@/components/dashboard/last-used-project-tracker";
 import { UnauthorizedView } from "@/components/dashboard/unauthorized-view";
-import { fetchServerData } from "@/lib/server-api";
+import { getOrgProjects } from "@/lib/server-api";
 
 import type { Project } from "@/lib/types";
 import type { ReactNode } from "react";
@@ -21,17 +21,7 @@ export default async function ProjectLayout({
 	let initialProjectsData = null;
 	if (orgId) {
 		try {
-			initialProjectsData = await fetchServerData(
-				"GET",
-				"/orgs/{id}/projects",
-				{
-					params: {
-						path: {
-							id: orgId,
-						},
-					},
-				},
-			);
+			initialProjectsData = await getOrgProjects(orgId);
 		} catch (error) {
 			console.warn("Failed to fetch projects for organization:", orgId, error);
 		}
diff --git a/apps/ui/src/app/dashboard/[orgId]/[projectId]/page.tsx b/apps/ui/src/app/dashboard/[orgId]/[projectId]/page.tsx
index 7cc5969f34..3045e0a48a 100644
--- a/apps/ui/src/app/dashboard/[orgId]/[projectId]/page.tsx
+++ b/apps/ui/src/app/dashboard/[orgId]/[projectId]/page.tsx
@@ -2,7 +2,7 @@ import { subDays, format } from "date-fns";
 import { redirect } from "next/navigation";
 
 import { DashboardClient } from "@/components/dashboard/dashboard-client";
-import { fetchServerData } from "@/lib/server-api";
+import { fetchServerData, getOrganizations } from "@/lib/server-api";
 
 import type { ActivitT } from "@/types/activity";
 
@@ -25,9 +25,7 @@ export default async function Dashboard({
 		searchParamsData?.from ?? format(subDays(today, 6), "yyyy-MM-dd");
 	const toParam = searchParamsData?.to ?? format(today, "yyyy-MM-dd");
 
-	const orgsDataPromise = fetchServerData<{
-		organizations?: { id: string; role?: string }[];
-	}>("GET", "/orgs");
+	const orgsDataPromise = getOrganizations();
 
 	const initialActivityDataPromise = fetchServerData<ActivitT>(
 		"GET",
diff --git a/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/preferences/_components/archive-project.tsx b/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/preferences/_components/archive-project.tsx
index 688bd35d55..745ad4f2bc 100644
--- a/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/preferences/_components/archive-project.tsx
+++ b/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/preferences/_components/archive-project.tsx
@@ -1,15 +1,5 @@
 import { ArchiveProjectSettings as ArchiveProjectSettingsClient } from "@/components/settings/archive-project-settings";
-import { fetchServerData } from "@/lib/server-api";
-
-import type { Project, Organization } from "@/lib/types";
-
-interface ProjectData {
-	project: Project;
-}
-
-interface OrganizationsData {
-	organizations: Organization[];
-}
+import { getOrganizations, getProject } from "@/lib/server-api";
 
 export const ArchiveProjectSettings = async ({
 	orgId,
@@ -19,14 +9,8 @@ export const ArchiveProjectSettings = async ({
 	projectId: string;
 }) => {
 	const [projectData, organizationsData] = await Promise.all([
-		fetchServerData<ProjectData>("GET", "/projects/{id}", {
-			params: {
-				path: {
-					id: projectId,
-				},
-			},
-		}),
-		fetchServerData<OrganizationsData>("GET", "/orgs"),
+		getProject(projectId),
+		getOrganizations(),
 	]);
 
 	// Handle null data cases
diff --git a/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/preferences/_components/caching-settings-rsc.tsx b/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/preferences/_components/caching-settings-rsc.tsx
index ce323735a7..65b1875339 100644
--- a/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/preferences/_components/caching-settings-rsc.tsx
+++ b/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/preferences/_components/caching-settings-rsc.tsx
@@ -1,13 +1,8 @@
 import { CachingSettings } from "@/components/settings/caching-settings";
-import { fetchServerData } from "@/lib/server-api";
+import { getProject } from "@/lib/server-api";
 
-import type { Project } from "@/lib/types";
 import type { CachingSettingsData } from "@/types/settings";
 
-interface ProjectData {
-	project: Project;
-}
-
 export const CachingSettingsRsc = async ({
 	orgId,
 	projectId,
@@ -15,17 +10,7 @@ export const CachingSettingsRsc = async ({
 	orgId: string;
 	projectId: string;
 }) => {
-	const projectData = await fetchServerData<ProjectData>(
-		"GET",
-		"/projects/{id}",
-		{
-			params: {
-				path: {
-					id: projectId,
-				},
-			},
-		},
-	);
+	const projectData = await getProject(projectId);
 
 	// Handle null data cases
 	if (!projectData) {
diff --git a/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/preferences/_components/project-mode-settings-rsc.tsx b/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/preferences/_components/project-mode-settings-rsc.tsx
index dd68384436..111c6b3c20 100644
--- a/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/preferences/_components/project-mode-settings-rsc.tsx
+++ b/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/preferences/_components/project-mode-settings-rsc.tsx
@@ -1,13 +1,8 @@
 import { ProjectModeSettings } from "@/components/settings/project-mode-settings";
-import { fetchServerData } from "@/lib/server-api";
+import { getProject } from "@/lib/server-api";
 
-import type { Project } from "@/lib/types";
 import type { ProjectModeSettingsData } from "@/types/settings";
 
-interface ProjectData {
-	project: Project;
-}
-
 export const ProjectModeSettingsRsc = async ({
 	orgId,
 	projectId,
@@ -15,17 +10,7 @@ export const ProjectModeSettingsRsc = async ({
 	orgId: string;
 	projectId: string;
 }) => {
-	const projectData = await fetchServerData<ProjectData>(
-		"GET",
-		"/projects/{id}",
-		{
-			params: {
-				path: {
-					id: projectId,
-				},
-			},
-		},
-	);
+	const projectData = await getProject(projectId);
 
 	// Handle null data cases
 	if (!projectData) {
diff --git a/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/preferences/_components/project-name-settings-rsc.tsx b/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/preferences/_components/project-name-settings-rsc.tsx
index 17b46192ab..f12c8c3637 100644
--- a/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/preferences/_components/project-name-settings-rsc.tsx
+++ b/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/preferences/_components/project-name-settings-rsc.tsx
@@ -1,11 +1,5 @@
 import { ProjectNameSettings } from "@/components/settings/project-name-settings";
-import { fetchServerData } from "@/lib/server-api";
-
-import type { Project } from "@/lib/types";
-
-interface ProjectData {
-	project: Project;
-}
+import { getProject } from "@/lib/server-api";
 
 export const ProjectNameSettingsRsc = async ({
 	orgId,
@@ -14,17 +8,7 @@ export const ProjectNameSettingsRsc = async ({
 	orgId: string;
 	projectId: string;
 }) => {
-	const projectData = await fetchServerData<ProjectData>(
-		"GET",
-		"/projects/{id}",
-		{
-			params: {
-				path: {
-					id: projectId,
-				},
-			},
-		},
-	);
+	const projectData = await getProject(projectId);
 
 	if (!projectData) {
 		return (
diff --git a/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/sdk/page.tsx b/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/sdk/page.tsx
index 70004078c3..d01ce83022 100644
--- a/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/sdk/page.tsx
+++ b/apps/ui/src/app/dashboard/[orgId]/[projectId]/settings/sdk/page.tsx
@@ -6,9 +6,7 @@ import {
 	CardHeader,
 	CardTitle,
 } from "@/lib/components/card";
-import { fetchServerData } from "@/lib/server-api";
-
-import type { Project } from "@/lib/types";
+import { getProject } from "@/lib/server-api";
 
 export default async function SdkPage({
 	params,
@@ -16,17 +14,7 @@ export default async function SdkPage({
 	params: Promise<{ orgId: string; projectId: string }>;
 }) {
 	const { orgId, projectId } = await params;
-	const projectData = await fetchServerData<{ project: Project }>(
-		"GET",
-		"/projects/{id}",
-		{
-			params: {
-				path: {
-					id: projectId,
-				},
-			},
-		},
-	);
+	const projectData = await getProject(projectId);
 
 	return (
 		<div className="flex flex-col">
diff --git a/apps/ui/src/app/dashboard/[orgId]/layout.tsx b/apps/ui/src/app/dashboard/[orgId]/layout.tsx
index 78cd60b9f9..48b21fb2c5 100644
--- a/apps/ui/src/app/dashboard/[orgId]/layout.tsx
+++ b/apps/ui/src/app/dashboard/[orgId]/layout.tsx
@@ -3,10 +3,14 @@ import { UnauthorizedView } from "@/components/dashboard/unauthorized-view";
 import { UserProvider } from "@/components/providers/user-provider";
 import { SidebarProvider } from "@/lib/components/sidebar";
 import { getLastUsedProjectId } from "@/lib/last-used-project-server";
-import { fetchServerData } from "@/lib/server-api";
+import {
+	fetchServerData,
+	getOrganizations,
+	getOrgProjects,
+} from "@/lib/server-api";
 
 import type { AnnouncementEntry } from "@/components/dashboard/changelog-notifications";
-import type { User, Organization, Project } from "@/lib/types";
+import type { User, Project } from "@/lib/types";
 import type { Blog, Changelog } from "content-collections";
 import type { ReactNode } from "react";
 
@@ -22,19 +26,9 @@ export default async function OrgLayout({ children, params }: OrgLayoutProps) {
 		{ user: User } | undefined | null
 	>("GET", "/user/me");
 
-	const initialOrganizationsDataPromise = fetchServerData<{
-		organizations: Organization[];
-	}>("GET", "/orgs");
-
-	const initialProjectsDataPromise = orgId
-		? fetchServerData("GET", "/orgs/{id}/projects", {
-				params: {
-					path: {
-						id: orgId,
-					},
-				},
-			})
-		: null;
+	const initialOrganizationsDataPromise = getOrganizations();
+
+	const initialProjectsDataPromise = orgId ? getOrgProjects(orgId) : null;
 
 	const [initialUserData, initialOrganizationsData] = await Promise.all([
 		initialUserDataPromise,
diff --git a/apps/ui/src/app/dashboard/[orgId]/org/guardrails/guardrails-client.tsx b/apps/ui/src/app/dashboard/[orgId]/org/guardrails/guardrails-client.tsx
index 36a7ad2ad7..7296e86bea 100644
--- a/apps/ui/src/app/dashboard/[orgId]/org/guardrails/guardrails-client.tsx
+++ b/apps/ui/src/app/dashboard/[orgId]/org/guardrails/guardrails-client.tsx
@@ -151,39 +151,53 @@ export function GuardrailsClient() {
 		(currentUserRole === "owner" || currentUserRole === "admin");
 
 	const fetchConfig = useCallback(async () => {
-		try {
-			setIsLoading(true);
-			const response = await fetchClient.GET(
-				"/guardrails/config/{organizationId}",
-				{
-					params: { path: { organizationId } },
-				},
+		setIsLoading(true);
+		setError(null);
+		// allSettled so a fulfilled response is still applied when the other
+		// request fails.
+		const [configResult, rulesResult] = await Promise.allSettled([
+			fetchClient.GET("/guardrails/config/{organizationId}", {
+				params: { path: { organizationId } },
+			}),
+			fetchClient.GET("/guardrails/rules/{organizationId}", {
+				params: { path: { organizationId } },
+			}),
+		]);
+
+		// openapi-fetch resolves non-2xx responses as { error }, so checking for a
+		// rejection alone would only catch network-level failures.
+		const configResponse =
+			configResult.status === "fulfilled" ? configResult.value : null;
+		const rulesResponse =
+			rulesResult.status === "fulfilled" ? rulesResult.value : null;
+
+		if (configResponse && !configResponse.error) {
+			// An org with no config yet gets a 200 with a null body — only then do
+			// the defaults apply. Falling back to them after an HTTP error would
+			// show guardrails as disabled and let the next save overwrite the
+			// org's real configuration.
+			setConfig(
+				(configResponse.data as unknown as GuardrailConfig | null) ??
+					DEFAULT_CONFIG,
 			);
+		}
 
-			if (response.data) {
-				setConfig(response.data as unknown as GuardrailConfig);
-			} else {
-				// No config exists yet, use defaults
-				setConfig(DEFAULT_CONFIG);
-			}
-
-			const rulesResponse = await fetchClient.GET(
-				"/guardrails/rules/{organizationId}",
-				{
-					params: { path: { organizationId } },
-				},
+		if (rulesResponse && !rulesResponse.error) {
+			setCustomRules(
+				(rulesResponse.data as { rules: CustomRule[] } | undefined)?.rules ??
+					[],
 			);
+		}
 
-			if (rulesResponse.data) {
-				setCustomRules(
-					(rulesResponse.data as { rules: CustomRule[] }).rules || [],
-				);
-			}
-		} catch {
+		if (
+			!configResponse ||
+			configResponse.error ||
+			!rulesResponse ||
+			rulesResponse.error
+		) {
 			setError("Failed to load guardrails configuration");
-		} finally {
-			setIsLoading(false);
 		}
+		setIsLoading(false);
 	}, [fetchClient, organizationId]);
 
 	useEffect(() => {
diff --git a/apps/ui/src/app/dashboard/[orgId]/page.tsx b/apps/ui/src/app/dashboard/[orgId]/page.tsx
index b911991d83..f12674fff2 100644
--- a/apps/ui/src/app/dashboard/[orgId]/page.tsx
+++ b/apps/ui/src/app/dashboard/[orgId]/page.tsx
@@ -1,7 +1,7 @@
 import { redirect } from "next/navigation";
 
 import { getLastUsedProjectId } from "@/lib/last-used-project-server";
-import { fetchServerData } from "@/lib/server-api";
+import { getOrgProjects } from "@/lib/server-api";
 
 interface OrgPageProps {
 	params: Promise<{ orgId: string }>;
@@ -11,13 +11,7 @@ export default async function OrgPage({ params }: OrgPageProps) {
 	const { orgId } = await params;
 
 	// Fetch projects for this organization
-	const projectsData = await fetchServerData("GET", "/orgs/{id}/projects", {
-		params: {
-			path: {
-				id: orgId,
-			},
-		},
-	});
+	const projectsData = await getOrgProjects(orgId);
 
 	// Check if API returned null (error case)
 	if (!projectsData) {
@@ -32,23 +26,18 @@ export default async function OrgPage({ params }: OrgPageProps) {
 		);
 	}
 
-	if (projectsData && typeof projectsData === "object") {
-		const projects = projectsData as {
-			projects?: Array<{ id: string; name: string }>;
-		};
+	const projects = projectsData.projects;
 
-		if (projects.projects && projects.projects.length > 0) {
-			// Check for last used project first, fallback to first project
-			const lastUsedProjectId = await getLastUsedProjectId(orgId);
-			const defaultProjectId =
-				lastUsedProjectId &&
-				projects.projects.some((p) => p.id === lastUsedProjectId)
-					? lastUsedProjectId
-					: projects.projects[0].id;
+	if (projects && projects.length > 0) {
+		// Check for last used project first, fallback to first project
+		const lastUsedProjectId = await getLastUsedProjectId(orgId);
+		const defaultProjectId =
+			lastUsedProjectId && projects.some((p) => p.id === lastUsedProjectId)
+				? lastUsedProjectId
+				: projects[0].id;
 
-			// Redirect to the selected project
-			redirect(`/dashboard/${orgId}/${defaultProjectId}`);
-		}
+		// Redirect to the selected project
+		redirect(`/dashboard/${orgId}/${defaultProjectId}`);
 	}
 
 	// If no projects found, show a message or redirect to create project
diff --git a/apps/ui/src/app/posthog.ts b/apps/ui/src/app/posthog.ts
index a1a28facc5..c0ef1e87b3 100644
--- a/apps/ui/src/app/posthog.ts
+++ b/apps/ui/src/app/posthog.ts
@@ -2,6 +2,10 @@ import { PostHog } from "posthog-node";
 
 import { getConfig } from "@/lib/config-server";
 
+// Each PostHog instance owns an event queue and flush timer, so construct one
+// shared client per process instead of one per request.
+let client: PostHog | null = null;
+
 export default function PostHogClient() {
 	const config = getConfig();
 
@@ -15,8 +19,8 @@ export default function PostHogClient() {
 		return null;
 	}
 
-	const posthogClient = new PostHog(config.posthogKey!, {
+	client ??= new PostHog(config.posthogKey, {
 		host: config.posthogHost,
 	});
-	return posthogClient;
+	return client;
 }
diff --git a/apps/ui/src/components/enterprise/calendly-inline.tsx b/apps/ui/src/components/enterprise/calendly-inline.tsx
index 3615deb833..c940841d48 100644
--- a/apps/ui/src/components/enterprise/calendly-inline.tsx
+++ b/apps/ui/src/components/enterprise/calendly-inline.tsx
@@ -29,7 +29,7 @@ export function CalendlyInline({
 	const containerRef = useRef<HTMLDivElement>(null);
 	const initializedRef = useRef(false);
 	const [scriptLoaded, setScriptLoaded] = useState(
-		typeof window !== "undefined" && Boolean(window.Calendly),
+		() => typeof window !== "undefined" && Boolean(window.Calendly),
 	);
 
 	useEffect(() => {
diff --git a/apps/ui/src/components/landing/navbar.tsx b/apps/ui/src/components/landing/navbar.tsx
index ee69db3939..a53be837a1 100644
--- a/apps/ui/src/components/landing/navbar.tsx
+++ b/apps/ui/src/components/landing/navbar.tsx
@@ -424,7 +424,7 @@ export const Navbar = ({
 		const handleScroll = () => {
 			setIsScrolled(window.scrollY > 50);
 		};
-		window.addEventListener("scroll", handleScroll);
+		window.addEventListener("scroll", handleScroll, { passive: true });
 		return () => window.removeEventListener("scroll", handleScroll);
 	}, []);
 
diff --git a/apps/ui/src/components/providers.tsx b/apps/ui/src/components/providers.tsx
index b5fed3c3ea..b239c4dd29 100644
--- a/apps/ui/src/components/providers.tsx
+++ b/apps/ui/src/components/providers.tsx
@@ -2,13 +2,13 @@
 
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
+import dynamic from "next/dynamic";
 import { ThemeProvider } from "next-themes";
 import posthog from "posthog-js";
 import { PostHogProvider } from "posthog-js/react";
-import { Suspense, useMemo, useEffect } from "react";
+import { Suspense, useState, useEffect } from "react";
 import { Toaster as SonnerToaster } from "sonner";
 
-import { ChatSupport } from "@/components/chat-support";
 import { ReferralHandler } from "@/components/referral-handler";
 import { Toaster } from "@/lib/components/toaster";
 import { toast } from "@/lib/components/use-toast";
@@ -17,6 +17,14 @@ import { AppConfigProvider } from "@/lib/config";
 import type { AppConfig } from "@/lib/config-server";
 import type { ReactNode } from "react";
 
+// The support widget starts collapsed but statically pulls in the AI SDK and
+// streamdown/shiki, so defer it out of the initial bundle of every route. No
+// ssr: false — the collapsed trigger is a permanently visible button and must
+// stay in the server-rendered HTML instead of popping in after hydration.
+const ChatSupport = dynamic(() =>
+	import("@/components/chat-support").then((mod) => mod.ChatSupport),
+);
+
 interface ProvidersProps {
 	children: ReactNode;
 	config: AppConfig;
@@ -42,7 +50,9 @@ function extractErrorMessage(error: unknown): string {
 }
 
 export function Providers({ children, config }: ProvidersProps) {
-	const queryClient = useMemo(
+	// useState, not useMemo: React may discard a useMemo cache, which would
+	// silently swap in a fresh QueryClient and drop the whole query cache.
+	const [queryClient] = useState(
 		() =>
 			new QueryClient({
 				defaultOptions: {
@@ -59,7 +69,6 @@ export function Providers({ children, config }: ProvidersProps) {
 					},
 				},
 			}),
-		[],
 	);
 
 	// Defer PostHog initialization to reduce TBT
diff --git a/apps/ui/src/lib/server-api.ts b/apps/ui/src/lib/server-api.ts
index 47ff01d437..b911ac73dd 100644
--- a/apps/ui/src/lib/server-api.ts
+++ b/apps/ui/src/lib/server-api.ts
@@ -1,9 +1,11 @@
 import { cookies } from "next/headers";
 import createFetchClient from "openapi-fetch";
+import { cache } from "react";
 
 import { getConfig } from "./config-server";
 
 import type { paths } from "./api/v1";
+import type { Organization, Project } from "./types";
 
 // Server-side API client
 export async function createServerApiClient() {
@@ -91,3 +93,69 @@ export async function fetchServerData<T>(
 		return null;
 	}
 }
+
+// Request-scoped store for the memoized fetchers below. cache() gives one map
+// per request, so entries never leak across requests or users.
+const requestCache = cache(() => new Map<string, Promise<unknown>>());
+
+// Sibling RSCs and nested layouts request the same endpoints independently, so
+// share the in-flight promise to collapse the duplicate round-trips into one.
+// Failed lookups are dropped from the map instead of memoized: fetchServerData
+// resolves to null on any error, and retaining that null would turn a single
+// transient blip into a request-wide outage — every consumer would render its
+// "unauthorized"/error branch off one bad response.
+function dedupeRequest<T>(
+	key: string,
+	fetcher: () => Promise<T | null>,
+): Promise<T | null> {
+	const store = requestCache();
+	const inFlight = store.get(key) as Promise<T | null> | undefined;
+	if (inFlight) {
+		return inFlight;
+	}
+
+	const promise = fetcher().then(
+		(result) => {
+			if (result === null) {
+				store.delete(key);
+			}
+			return result;
+		},
+		(error: unknown) => {
+			store.delete(key);
+			throw error;
+		},
+	);
+	store.set(key, promise);
+	return promise;
+}
+
+export function getProject(projectId: string) {
+	return dedupeRequest(`project:${projectId}`, () =>
+		fetchServerData<{ project: Project }>("GET", "/projects/{id}", {
+			params: {
+				path: {
+					id: projectId,
+				},
+			},
+		}),
+	);
+}
+
+export function getOrganizations() {
+	return dedupeRequest("orgs", () =>
+		fetchServerData<{ organizations: Organization[] }>("GET", "/orgs"),
+	);
+}
+
+export function getOrgProjects(orgId: string) {
+	return dedupeRequest(`orgProjects:${orgId}`, () =>
+		fetchServerData<{ projects: Project[] }>("GET", "/orgs/{id}/projects", {
+			params: {
+				path: {
+					id: orgId,
+				},
+			},
+		}),
+	);
+}