Fix insecure draft storage

apps/server/convex/users.ts

@@ -244,12 +244,18 @@ export const getByExternalId = query({
 				profile?.encryptedOpenRouterKey ?? user.encryptedOpenRouterKey,
 =======
 <<<<<<< HEAD
+||||||| 54e09ce
+			encryptedOpenRouterKey:
+				profile?.encryptedOpenRouterKey ?? user.encryptedOpenRouterKey,
+=======
+<<<<<<< HEAD
 ||||||| 54e09ce
 			encryptedOpenRouterKey:
 				profile?.encryptedOpenRouterKey ?? user.encryptedOpenRouterKey,
 =======
 			hasOpenRouterKey: !!(profile?.encryptedOpenRouterKey ?? user.encryptedOpenRouterKey),
 >>>>>>> main
+>>>>>>> main
 >>>>>>> main
 			fileUploadCount: profile?.fileUploadCount ?? user.fileUploadCount ?? 0,
 			aiUsageCents: user.aiUsageCents,
@@ -334,12 +340,18 @@ export const getByExternalIdInternal = internalQuery({
 				profile?.encryptedOpenRouterKey ?? user.encryptedOpenRouterKey,
 =======
 <<<<<<< HEAD
+||||||| 54e09ce
+			encryptedOpenRouterKey:
+				profile?.encryptedOpenRouterKey ?? user.encryptedOpenRouterKey,
+=======
+<<<<<<< HEAD
 ||||||| 54e09ce
 			encryptedOpenRouterKey:
 				profile?.encryptedOpenRouterKey ?? user.encryptedOpenRouterKey,
 =======
 			hasOpenRouterKey: !!(profile?.encryptedOpenRouterKey ?? user.encryptedOpenRouterKey),
 >>>>>>> main
+>>>>>>> main
 >>>>>>> main
 			fileUploadCount: profile?.fileUploadCount ?? user.fileUploadCount ?? 0,
 			aiUsageCents: user.aiUsageCents,

apps/web/src/hooks/use-prompt-draft.ts

@@ -2,10 +2,10 @@ import { useCallback, useEffect, useRef } from "react";
 import { usePromptDraftStore } from "@/stores/prompt-draft";
 
 /**
- * Hook for syncing prompt input with localStorage-backed draft persistence.
+ * Hook for syncing prompt input with sessionStorage-backed draft persistence.
  *
  * Features:
- * - Debounced saves (300ms) to avoid excessive localStorage writes
+ * - Debounced saves (300ms) to avoid excessive storage writes
  * - Per-chat drafts (chatId can be null for new chat)
  * - Auto-restores draft on mount
  * - Auto-clears draft on unmount when text is empty
@@ -68,7 +68,7 @@ export function usePromptDraft({ chatId, textInputController }: UsePromptDraftOp
 		clearStoredDraft(chatId);
 	}, [chatId, clearStoredDraft]);
 
-	// Sync text changes to localStorage (debounced)
+	// Sync text changes to sessionStorage (debounced)
 	// Using chatId and setDraft directly to avoid re-running on saveDraft recreation
 	useEffect(() => {
 		// Only save after initial restoration

apps/web/src/routes/api/models.ts

@@ -9,6 +9,95 @@ const OPENROUTER_MODELS_URL = "https://openrouter.ai/api/v1/models";
 const OPENROUTER_FETCH_TIMEOUT_MS = 10_000;
 const TRUST_PROXY_MODE = process.env.TRUST_PROXY?.trim().toLowerCase();
 
+<<<<<<< HEAD
+if (TRUST_PROXY_MODE === "true") {
+	console.warn("[Models API] TRUST_PROXY=true requires x-forwarded-for for rate limiting");
+}
+
+if (!TRUST_PROXY_MODE) {
+	console.warn("[Models API] TRUST_PROXY is unset; models endpoint will reject requests when IP is unavailable");
+}
+
+if (
+	TRUST_PROXY_MODE &&
+	TRUST_PROXY_MODE !== "cloudflare" &&
+	TRUST_PROXY_MODE !== "vercel" &&
+	TRUST_PROXY_MODE !== "true"
+) {
+	console.warn("[Models API] Unrecognized TRUST_PROXY value; models endpoint will reject requests when IP is unavailable");
+}
+
+const modelsIpRatelimit = upstashRedis
+	? new Ratelimit({
+			redis: upstashRedis,
+			limiter: Ratelimit.slidingWindow(30, "60 s"),
+			prefix: "ratelimit:models:ip",
+		})
+	: null;
+
+async function fetchModelsFromOpenRouter(): Promise<Response> {
+	try {
+		const response = await fetch(OPENROUTER_MODELS_URL, {
+			headers: {
+				Accept: "application/json",
+			},
+			signal: AbortSignal.timeout(OPENROUTER_FETCH_TIMEOUT_MS),
+		});
+
+		if (!response.ok) {
+			return json(
+				{ error: "Upstream service error" },
+				{ status: 502 },
+			);
+		}
+
+		const payload = await response.text();
+
+		if (upstashRedis) {
+			try {
+				await upstashRedis.set(MODELS_CACHE_KEY, payload, {
+					ex: MODELS_CACHE_TTL_SECONDS,
+				});
+			} catch (error) {
+				console.warn("[Models API] Failed to write cache:", error);
+			}
+		}
+
+		return new Response(payload, {
+			status: 200,
+			headers: {
+				"Content-Type": "application/json",
+				"Cache-Control": "no-store",
+			},
+		});
+	} catch (error) {
+		console.warn("[Models API] OpenRouter fetch failed:", error);
+		return json({ error: "Upstream service unavailable" }, { status: 502 });
+	}
+}
+
+function getClientIp(request: Request): string | null {
+	if (!TRUST_PROXY_MODE) {
+		return null;
+	}
+
+	if (TRUST_PROXY_MODE === "cloudflare") {
+		const cfConnectingIp = request.headers.get("cf-connecting-ip")?.trim();
+		return cfConnectingIp || null;
+	}
+
+	if (TRUST_PROXY_MODE === "vercel") {
+		const vercelForwardedFor = request.headers.get("x-vercel-forwarded-for")?.trim();
+		if (vercelForwardedFor) {
+			const first = vercelForwardedFor.split(",")[0]?.trim();
+			if (first) return first;
+		}
+		return null;
+	}
+
+	if (TRUST_PROXY_MODE === "true") {
+||||||| 54e09ce
+=======
 <<<<<<< HEAD
 /**
  * TRUSTED_PROXIES: comma-separated list of trusted proxy IPs.
@@ -218,6 +307,7 @@ function getClientIp(request: Request): string | null {
 	}
 
 	if (TRUST_PROXY_MODE === "true") {
+>>>>>>> main
 >>>>>>> main
 		const forwardedFor = request.headers.get("x-forwarded-for")?.trim();
 		if (forwardedFor) {

apps/web/src/stores/prompt-draft.ts

@@ -2,15 +2,20 @@ import { create } from "zustand";
 import { createJSONStorage, devtools, persist } from "zustand/middleware";
 
 /**
- * Store for persisting prompt drafts across page reloads.
+ * Store for persisting prompt drafts within the current browser session.
+ *
+ * Security: Uses sessionStorage instead of localStorage to limit exposure
+ * of sensitive draft content. Drafts are automatically cleared when the
+ * browser tab is closed, reducing the risk of exfiltration via XSS or
+ * compromised browser profiles.
  *
  * Non-annoying approach:
  * - Drafts are saved per-chat (or "global" for new chat input)
  * - Drafts are automatically cleared when a message is sent
- * - Old drafts are cleaned up after 7 days to prevent localStorage bloat
+ * - Old drafts are cleaned up after 24 hours as a defensive measure
  */
 
-const DRAFT_EXPIRY_MS = 7 * 24 * 60 * 60 * 1000; // 7 days
+const DRAFT_EXPIRY_MS = 24 * 60 * 60 * 1000; // 24 hours (session-scoped, defensive expiry)
 const GLOBAL_DRAFT_KEY = "__global__";
 
 interface PromptDraft {
@@ -115,7 +120,7 @@ export const usePromptDraftStore = create<PromptDraftState>()(
 			}),
 			{
 				name: "openchat-prompt-drafts",
-				storage: createJSONStorage(() => localStorage),
+				storage: createJSONStorage(() => sessionStorage),
 			},
 		),
 		{ name: "prompt-draft-store" },