CuzTeam · Starry-Sky-World · May 5, 2026 · May 4, 2026 · May 4, 2026 · May 4, 2026
diff --git a/common/frontend_theme.go b/common/frontend_theme.go
@@ -8,6 +8,7 @@ import (
 
 const FrontendThemeCookieName = "frontend_theme"
 const FrontendThemeCookieMaxAge = 60 * 60 * 24 * 365
+const FrontendThemeSessionKey = "frontend_theme"
 
 func NormalizeFrontendTheme(theme string) string {
 	theme = strings.ToLower(strings.TrimSpace(theme))

diff --git a/controller/user.go b/controller/user.go
@@ -92,7 +92,8 @@ func Login(c *gin.Context) {
 // setup session & cookies and then return user info
 func setupLogin(user *model.User, c *gin.Context) {
 	model.UpdateUserLastLoginAt(user.Id)
-	if theme := common.NormalizeFrontendTheme(user.GetSetting().FrontendTheme); theme != "" {
+	theme := common.NormalizeFrontendTheme(user.GetSetting().FrontendTheme)
+	if theme != "" {
 		common.SetFrontendThemeCookie(c, theme)
 	}
 	session := sessions.Default(c)
@@ -101,6 +102,11 @@ func setupLogin(user *model.User, c *gin.Context) {
 	session.Set("role", user.Role)
 	session.Set("status", user.Status)
 	session.Set("group", user.Group)
+	if theme != "" {
+		session.Set(common.FrontendThemeSessionKey, theme)
+	} else {
+		session.Delete(common.FrontendThemeSessionKey)
+	}
 	err := session.Save()
 	if err != nil {
 		common.ApiErrorI18n(c, i18n.MsgUserSessionSaveFailed)
@@ -392,6 +398,11 @@ func GetSelf(c *gin.Context) {
 	userSetting := user.GetSetting()
 	if theme := common.NormalizeFrontendTheme(userSetting.FrontendTheme); theme != "" {
 		common.SetFrontendThemeCookie(c, theme)
+		session := sessions.Default(c)
+		if common.Interface2String(session.Get(common.FrontendThemeSessionKey)) != theme {
+			session.Set(common.FrontendThemeSessionKey, theme)
+			_ = session.Save()
+		}
 	}
 
 	// 构建响应数据，包含用户信息和权限
@@ -636,133 +647,136 @@ func UpdateSelf(c *gin.Context) {
 		return
 	}
 
-	// 检查是否是用户设置更新请求 (sidebar_modules 或 language)
-	if sidebarModules, sidebarExists := requestData["sidebar_modules"]; sidebarExists {
-		userId := c.GetInt("id")
+	userId := c.GetInt("id")
+	settingChanged := false
+	updatedTheme := ""
+	var updatedSetting *dto.UserSetting
+
+	for _, key := range []string{"sidebar_modules", "frontend_theme", "language"} {
+		if _, ok := requestData[key]; ok {
+			settingChanged = true
+			break
+		}
+	}
+
+	if settingChanged {
 		user, err := model.GetUserById(userId, false)
 		if err != nil {
 			common.ApiError(c, err)
 			return
 		}
 
-		// 获取当前用户设置
 		currentSetting := user.GetSetting()
 
-		// 更新sidebar_modules字段
-		if sidebarModulesStr, ok := sidebarModules.(string); ok {
+		if sidebarModules, ok := requestData["sidebar_modules"]; ok {
+			sidebarModulesStr, valid := sidebarModules.(string)
+			if !valid {
+				common.ApiErrorI18n(c, i18n.MsgInvalidParams)
+				return
+			}
 			currentSetting.SidebarModules = sidebarModulesStr
 		}
 
-		// 保存更新后的设置
-		user.SetSetting(currentSetting)
-		if err := user.Update(false); err != nil {
-			common.ApiErrorI18n(c, i18n.MsgUpdateFailed)
-			return
+		if frontendTheme, ok := requestData["frontend_theme"]; ok {
+			themeStr, valid := frontendTheme.(string)
+			if !valid {
+				common.ApiErrorI18n(c, i18n.MsgInvalidParams)
+				return
+			}
+			themeStr = common.NormalizeFrontendTheme(themeStr)
+			if themeStr == "" {
+				common.ApiErrorI18n(c, i18n.MsgInvalidParams)
+				return
+			}
+			currentSetting.FrontendTheme = themeStr
+			updatedTheme = themeStr
 		}
-		common.ApiSuccessI18n(c, i18n.MsgUpdateSuccess, nil)
-		return
+
+		if language, ok := requestData["language"]; ok {
+			langStr, valid := language.(string)
+			if !valid {
+				common.ApiErrorI18n(c, i18n.MsgInvalidParams)
+				return
+			}
+			currentSetting.Language = langStr
+		}
+
+		updatedSetting = &currentSetting
 	}
 
-	// 检查是否是 UI 风格更新请求
-	if frontendTheme, themeExists := requestData["frontend_theme"]; themeExists {
-		userId := c.GetInt("id")
-		user, err := model.GetUserById(userId, false)
-		if err != nil {
-			common.ApiError(c, err)
-			return
+	hasProfileUpdate := false
+	for _, key := range []string{"username", "display_name", "password", "original_password"} {
+		if _, ok := requestData[key]; ok {
+			hasProfileUpdate = true
+			break
 		}
+	}
 
-		currentSetting := user.GetSetting()
-		themeStr, ok := frontendTheme.(string)
-		if !ok {
+	if hasProfileUpdate {
+		var user model.User
+		requestDataBytes, err := common.Marshal(requestData)
+		if err != nil {
 			common.ApiErrorI18n(c, i18n.MsgInvalidParams)
 			return
 		}
-		themeStr = strings.ToLower(strings.TrimSpace(themeStr))
-		if themeStr != "default" && themeStr != "classic" {
+		err = common.Unmarshal(requestDataBytes, &user)
+		if err != nil {
 			common.ApiErrorI18n(c, i18n.MsgInvalidParams)
 			return
 		}
-		currentSetting.FrontendTheme = themeStr
 
-		user.SetSetting(currentSetting)
-		if err := user.Update(false); err != nil {
-			common.ApiErrorI18n(c, i18n.MsgUpdateFailed)
+		if user.Password == "" {
+			user.Password = "$I_LOVE_U" // make Validator happy :)
+		}
+		if err := common.Validate.Struct(&user); err != nil {
+			common.ApiErrorI18n(c, i18n.MsgInvalidInput)
 			return
 		}
-		common.SetFrontendThemeCookie(c, themeStr)
-
-		common.ApiSuccessI18n(c, i18n.MsgUpdateSuccess, nil)
-		return
-	}
 
-	// 检查是否是语言偏好更新请求
-	if language, langExists := requestData["language"]; langExists {
-		userId := c.GetInt("id")
-		user, err := model.GetUserById(userId, false)
+		cleanUser := model.User{
+			Id:          userId,
+			Username:    user.Username,
+			Password:    user.Password,
+			DisplayName: user.DisplayName,
+		}
+		if user.Password == "$I_LOVE_U" {
+			user.Password = ""
+			cleanUser.Password = ""
+		}
+		updatePassword, err := checkUpdatePassword(user.OriginalPassword, user.Password, cleanUser.Id)
 		if err != nil {
 			common.ApiError(c, err)
 			return
 		}
-
-		// 获取当前用户设置
-		currentSetting := user.GetSetting()
-
-		// 更新language字段
-		if langStr, ok := language.(string); ok {
-			currentSetting.Language = langStr
-		}
-
-		// 保存更新后的设置
-		user.SetSetting(currentSetting)
-		if err := user.Update(false); err != nil {
-			common.ApiErrorI18n(c, i18n.MsgUpdateFailed)
+		if err := cleanUser.Update(updatePassword); err != nil {
+			common.ApiError(c, err)
 			return
 		}
-
-		common.ApiSuccessI18n(c, i18n.MsgUpdateSuccess, nil)
-		return
 	}
 
-	// 原有的用户信息更新逻辑
-	var user model.User
-	requestDataBytes, err := common.Marshal(requestData)
-	if err != nil {
-		common.ApiErrorI18n(c, i18n.MsgInvalidParams)
-		return
-	}
-	err = common.Unmarshal(requestDataBytes, &user)
-	if err != nil {
+	if !settingChanged && !hasProfileUpdate {
 		common.ApiErrorI18n(c, i18n.MsgInvalidParams)
 		return
 	}
 
-	if user.Password == "" {
-		user.Password = "$I_LOVE_U" // make Validator happy :)
-	}
-	if err := common.Validate.Struct(&user); err != nil {
-		common.ApiErrorI18n(c, i18n.MsgInvalidInput)
-		return
+	if updatedSetting != nil {
+		user, err := model.GetUserById(userId, false)
+		if err != nil {
+			common.ApiError(c, err)
+			return
+		}
+		user.SetSetting(*updatedSetting)
+		if err := user.Update(false); err != nil {
+			common.ApiErrorI18n(c, i18n.MsgUpdateFailed)
+			return
+		}
 	}
 
-	cleanUser := model.User{
-		Id:          c.GetInt("id"),
-		Username:    user.Username,
-		Password:    user.Password,
-		DisplayName: user.DisplayName,
-	}
-	if user.Password == "$I_LOVE_U" {
-		user.Password = "" // rollback to what it should be
-		cleanUser.Password = ""
-	}
-	updatePassword, err := checkUpdatePassword(user.OriginalPassword, user.Password, cleanUser.Id)
-	if err != nil {
-		common.ApiError(c, err)
-		return
-	}
-	if err := cleanUser.Update(updatePassword); err != nil {
-		common.ApiError(c, err)
-		return
+	if updatedTheme != "" {
+		common.SetFrontendThemeCookie(c, updatedTheme)
+		session := sessions.Default(c)
+		session.Set(common.FrontendThemeSessionKey, updatedTheme)
+		_ = session.Save()
 	}
 
 	c.JSON(http.StatusOK, gin.H{

diff --git a/router/web-router.go b/router/web-router.go
@@ -63,24 +63,40 @@ func SetWebRouter(router *gin.Engine, assets ThemeAssets) {
 }
 
 func resolveFrontendTheme(c *gin.Context) string {
+	themeCookie, err := c.Cookie(common.FrontendThemeCookieName)
+	if err == nil {
+		theme := common.NormalizeFrontendTheme(themeCookie)
+		if theme != "" {
+			return theme
+		}
+	}
+
 	session := sessions.Default(c)
+	sessionTheme := common.NormalizeFrontendTheme(common.Interface2String(session.Get(common.FrontendThemeSessionKey)))
+	if sessionTheme != "" {
+		common.SetFrontendThemeCookie(c, sessionTheme)
+		return sessionTheme
+	}
+
 	if sessionID := session.Get("id"); sessionID != nil {
 		if userID, ok := sessionID.(int); ok && userID > 0 {
-			user, err := model.GetUserById(userID, false)
+			setting, err := model.GetUserSetting(userID, false)
 			if err == nil {
-				theme := common.NormalizeFrontendTheme(user.GetSetting().FrontendTheme)
+				theme := common.NormalizeFrontendTheme(setting.FrontendTheme)
 				if theme != "" {
+					session.Set(common.FrontendThemeSessionKey, theme)
+					_ = session.Save()
 					common.SetFrontendThemeCookie(c, theme)
 					return theme
 				}
 			}
-		}
-	}
-	themeCookie, err := c.Cookie(common.FrontendThemeCookieName)
-	if err == nil {
-		theme := common.NormalizeFrontendTheme(themeCookie)
-		if theme != "" {
-			return theme
+
+			fallbackTheme := common.NormalizeFrontendTheme(common.GetTheme())
+			if fallbackTheme != "" {
+				session.Set(common.FrontendThemeSessionKey, fallbackTheme)
+				_ = session.Save()
+				return fallbackTheme
+			}
 		}
 	}
 	return common.GetTheme()

diff --git a/web/default/src/components/ai-elements/response.tsx b/web/default/src/components/ai-elements/response.tsx
@@ -3,6 +3,10 @@
 import { type ComponentProps, memo } from 'react'
 import { Streamdown } from 'streamdown'
 import { cn } from '@/lib/utils'
+import rehypeKatex from 'rehype-katex'
+import remarkMath from 'remark-math'
+import { normalizeMathDelimiters } from '@/lib/markdown-math'
+import 'katex/dist/katex.min.css'
 
 type ResponseProps = ComponentProps<typeof Streamdown>
 
@@ -23,16 +27,22 @@ export const Response = memo(
     }
 
     const safeChildren = stripCustomTags(children) as string
+    const normalizedChildren =
+      typeof safeChildren === 'string'
+        ? normalizeMathDelimiters(safeChildren)
+        : safeChildren
 
     return (
       <Streamdown
         className={cn(
           'size-full [&>*:first-child]:mt-0 [&>*:last-child]:mb-0',
           className
         )}
+        remarkPlugins={[remarkMath]}
+        rehypePlugins={[rehypeKatex]}
         {...props}
       >
-        {safeChildren}
+        {normalizedChildren}
       </Streamdown>
     )
   },

diff --git a/web/default/src/components/ui/markdown.tsx b/web/default/src/components/ui/markdown.tsx
@@ -1,14 +1,20 @@
 import ReactMarkdown from 'react-markdown'
 import rehypeRaw from 'rehype-raw'
+import rehypeKatex from 'rehype-katex'
 import remarkGfm from 'remark-gfm'
+import remarkMath from 'remark-math'
 import { cn } from '@/lib/utils'
+import { normalizeMathDelimiters } from '@/lib/markdown-math'
+import 'katex/dist/katex.min.css'
 
 interface MarkdownProps {
   children: string
   className?: string
 }
 
 export function Markdown({ children, className }: MarkdownProps) {
+  const content = normalizeMathDelimiters(children)
+
   return (
     <div
       className={cn(
@@ -30,16 +36,16 @@ export function Markdown({ children, className }: MarkdownProps) {
       )}
     >
       <ReactMarkdown
-        remarkPlugins={[remarkGfm]}
-        rehypePlugins={[rehypeRaw]}
+        remarkPlugins={[remarkGfm, remarkMath]}
+        rehypePlugins={[rehypeRaw, rehypeKatex]}
         components={{
           // 自定义组件渲染（可选）
           a: ({ node, ...props }) => (
             <a {...props} target='_blank' rel='noopener noreferrer' />
           ),
         }}
       >
-        {children}
+        {content}
       </ReactMarkdown>
     </div>
   )