From 44e8c0061eb404ff3b767c242074fbab210ded57 Mon Sep 17 00:00:00 2001
From: Haoran Xu <3230105281@zju.edu.cn>
Date: Tue, 5 May 2026 21:16:53 +0800
Subject: [PATCH] fix: preserve folder parent on rename (#7974)

---
 astrbot/core/persona_mgr.py         | 4 ++--
 astrbot/dashboard/routes/persona.py | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/astrbot/core/persona_mgr.py b/astrbot/core/persona_mgr.py
index 290501438..b70164801 100644
--- a/astrbot/core/persona_mgr.py
+++ b/astrbot/core/persona_mgr.py
@@ -239,8 +239,8 @@ class PersonaManager:
         self,
         folder_id: str,
         name: str | None = None,
-        parent_id: str | None = None,
-        description: str | None = None,
+        parent_id: str | None | object = NOT_GIVEN,
+        description: str | None | object = NOT_GIVEN,
         sort_order: int | None = None,
     ) -> PersonaFolder | None:
         """更新文件夹信息"""
diff --git a/astrbot/dashboard/routes/persona.py b/astrbot/dashboard/routes/persona.py
index 56c14fe61..8a805d432 100644
--- a/astrbot/dashboard/routes/persona.py
+++ b/astrbot/dashboard/routes/persona.py
@@ -5,6 +5,7 @@ from quart import request
 from astrbot.core import logger
 from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
 from astrbot.core.db import BaseDatabase
+from astrbot.core.sentinels import NOT_GIVEN
 
 from .route import Response, Route, RouteContext
 
@@ -415,8 +416,10 @@ class PersonaRoute(Route):
             data = await request.get_json()
             folder_id = data.get("folder_id")
             name = data.get("name")
-            parent_id = data.get("parent_id")
-            description = data.get("description")
+            parent_id = data.get("parent_id") if "parent_id" in data else NOT_GIVEN
+            description = (
+                data.get("description") if "description" in data else NOT_GIVEN
+            )
             sort_order = data.get("sort_order")
 
             if not folder_id: