merge: resolve conflicts with main

dd7f2124 · cyhhao · 49be9d08 · bba5b3c0 · dd7f2124 · dd7f2124
Commit dd7f2124 authored Jan 19, 2026 by cyhhao
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
--- a/frontend/vitest.config.ts
+++ b/frontend/vitest.config.ts