Merge branch 'r-dev' of https://github.com/Mai-with-u/MaiBot into r-dev

src/config/legacy_migration.py

@@ -94,6 +94,11 @@ def _migrate_expression_learning_list(expr: dict[str, Any]) -> bool:
         ["", "enable", "enable", "enable"],
         ["qq:1919810:group", "enable", "enable", "enable"],
       ]
+    兼容旧旧格式：
+      learning_list = [
+        ["qq:1919810:group", "enable", "enable", "0.5"],
+        ["", "disable", "disable", "0.1"],
+      ]
     新：
       [[expression.learning_list]]
       platform="", item_id="", rule_type="group", use_expression=true, enable_learning=true, enable_jargon_learning=true
@@ -117,6 +122,16 @@ def _migrate_expression_learning_list(expr: dict[str, Any]) -> bool:
         use_expression = _parse_enable_disable(r[1])
         enable_learning = _parse_enable_disable(r[2])
         enable_jargon_learning = _parse_enable_disable(r[3])
+        if enable_jargon_learning is None:
+            # 更早期的配置在第 4 列记录的是一个已废弃的数值权重/阈值，
+            # 当前 schema 已没有对应字段。这里按保守策略兼容迁移：
+            # 丢弃旧数值，并将 enable_jargon_learning 置为 False。
+            try:
+                float(str(r[3]))
+            except (TypeError, ValueError):
+                pass
+            else:
+                enable_jargon_learning = False
         if use_expression is None or enable_learning is None or enable_jargon_learning is None:
             return False
 

src/config/official_configs.py

@@ -403,6 +403,60 @@ class MemoryConfig(ConfigBase):
 
     __ui_parent__ = "emoji"
 
+    max_agent_iterations: int = Field(
+        default=5,
+        ge=1,
+        json_schema_extra={
+            "x-widget": "input",
+            "x-icon": "layers",
+        },
+    )
+    """记忆思考深度（最低为1）"""
+
+    agent_timeout_seconds: float = Field(
+        default=120.0,
+        json_schema_extra={
+            "x-widget": "input",
+            "x-icon": "clock",
+        },
+    )
+    """最长回忆时间（秒）"""
+
+    global_memory: bool = Field(
+        default=False,
+        json_schema_extra={
+            "x-widget": "switch",
+            "x-icon": "globe",
+        },
+    )
+    """是否允许记忆检索在聊天记录中进行全局查询（忽略当前chat_id，仅对 search_chat_history 等工具生效）"""
+
+    global_memory_blacklist: list[TargetItem] = Field(
+        default_factory=lambda: [],
+        json_schema_extra={
+            "x-widget": "custom",
+            "x-icon": "shield-off",
+        },
+    )
+    """_wrap_全局记忆黑名单，当启用全局记忆时，不将特定聊天流纳入检索"""
+
+    long_term_auto_summary_enabled: bool = Field(
+        default=True,
+        json_schema_extra={
+            "x-widget": "switch",
+            "x-icon": "book-open",
+        },
+    )
+    """是否自动启动聊天总结并导入长期记忆"""
+
+    person_fact_writeback_enabled: bool = Field(
+        default=True,
+        json_schema_extra={
+            "x-widget": "switch",
+            "x-icon": "user-round-pen",
+        },
+    )
+    """是否在发送回复后自动提取并写回人物事实到长期记忆"""
     chat_history_topic_check_message_threshold: int = Field(
         default=80,
         ge=1,