From 91a2050b9f97a36ee16ded35c652f1d694170ead Mon Sep 17 00:00:00 2001
From: sladro <sladro@163.com>
Date: Mon, 29 Dec 2025 16:31:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E7=BA=BF=E5=BE=AA?=
 =?UTF-8?q?=E7=8E=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/bidmaster/nodes/content/init_config.py | 44 ++++++++++++++++------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/bidmaster/nodes/content/init_config.py b/src/bidmaster/nodes/content/init_config.py
index 9956184..885fd56 100644
--- a/src/bidmaster/nodes/content/init_config.py
+++ b/src/bidmaster/nodes/content/init_config.py
@@ -227,40 +227,60 @@ class InitConfigNode(BaseNode):
         # 构建章节树
         chapter_map = {ch["id"]: ch for ch in chapters}
 
+        # 预构建子章节映射，避免重复遍历
+        children_map: Dict[str, List[Dict[str, Any]]] = defaultdict(list)
+        for ch in chapters:
+            parent_id = ch.get("parent_id")
+            if parent_id:
+                children_map[parent_id].append(ch)
+
+        # 对每个父节点的子节点按order_index排序
+        for parent_id in children_map:
+            children_map[parent_id].sort(key=lambda x: x.get("order_index", 0))
+
         # 找出根节点（1级标题）
         root_chapters = [ch for ch in chapters if ch["level"] == 1]
 
-        # 深度优先遍历
-        queue = []
+        # 深度优先遍历，使用visited集合防止循环引用
+        queue: List[Dict[str, Any]] = []
+        visited: set[str] = set()
+
         for root in root_chapters:
-            self._dfs_traverse(root, chapter_map, queue, chapters)
+            self._dfs_traverse(root, children_map, queue, visited)
 
         return queue
 
     def _dfs_traverse(
         self,
         chapter: Dict[str, Any],
-        chapter_map: Dict[str, Dict],
-        queue: List[Dict],
-        all_chapters: List[Dict],
+        children_map: Dict[str, List[Dict[str, Any]]],
+        queue: List[Dict[str, Any]],
+        visited: set[str],
     ) -> None:
         """深度优先遍历
 
         Args:
             chapter: 当前章节
-            chapter_map: 章节映射
+            children_map: 父ID -> 子章节列表映射
             queue: 结果队列
-            all_chapters: 所有章节列表
+            visited: 已访问章节ID集合，防止循环引用
         """
+        chapter_id = chapter["id"]
+
+        # 防止循环引用导致无限递归
+        if chapter_id in visited:
+            logger.warning("检测到循环引用，跳过章节: %s", chapter_id)
+            return
+
+        visited.add(chapter_id)
         queue.append(chapter)
 
-        chapter_id = chapter["id"]
-        children = [ch for ch in all_chapters if ch.get("parent_id") == chapter_id]
-        children.sort(key=lambda x: x.get("order_index", 0))
+        # 获取子章节（已预排序）
+        children = children_map.get(chapter_id, [])
 
         # 递归遍历子章节
         for child in children:
-            self._dfs_traverse(child, chapter_map, queue, all_chapters)
+            self._dfs_traverse(child, children_map, queue, visited)
 
     def _expand_config_inheritance(self, chapter_queue: List[Dict[str, Any]]) -> Dict[str, str]:
         """预展开配置继承链，避免运行时查找