merge: 同步 upstream/r-dev 并解决冲突

2026-04-03 19:56:45 +08:00
parent da95b06f96 fc753f7e9f
commit 291420b7c7
186 changed files with 14212 additions and 6705 deletions
--- a/src/config/config.py
+++ b/src/config/config.py
@@ -21,7 +21,6 @@ from .official_configs import (
    DatabaseConfig,
    DebugConfig,
    EmojiConfig,
-    ExperimentalConfig,
    ExpressionConfig,
    KeywordReactionConfig,
    LPMMKnowledgeConfig,
@@ -56,7 +55,7 @@ CONFIG_DIR: Path = PROJECT_ROOT / "config"
 BOT_CONFIG_PATH: Path = (CONFIG_DIR / "bot_config.toml").resolve().absolute()
 MODEL_CONFIG_PATH: Path = (CONFIG_DIR / "model_config.toml").resolve().absolute()
 MMC_VERSION: str = "1.0.0"
-CONFIG_VERSION: str = "8.2.0"
+CONFIG_VERSION: str = "8.3.0"
 MODEL_CONFIG_VERSION: str = "1.13.1"

 logger = get_logger("config")
@@ -113,13 +112,10 @@ class Config(ConfigBase):
    debug: DebugConfig = Field(default_factory=DebugConfig)
    """调试配置类"""

-    experimental: ExperimentalConfig = Field(default_factory=ExperimentalConfig)
-    """实验性功能配置类"""
-
    maim_message: MaimMessageConfig = Field(default_factory=MaimMessageConfig)
    """maim_message配置类"""

-    lpmm_knowledge: LPMMKnowledgeConfig = Field(default_factory=LPMMKnowledgeConfig)
+    lpmm_knowledge: LPMMKnowledgeConfig = Field(default_factory=LPMMKnowledgeConfig, repr=False)
    """LPMM知识库配置类"""

    webui: WebUIConfig = Field(default_factory=WebUIConfig)
--- a/src/config/config_utils.py
+++ b/src/config/config_utils.py
@@ -30,7 +30,14 @@ def recursive_parse_item_to_table(
        if value is None:
            continue
        if isinstance(value, ConfigBase):
-            config_table.add(config_item_name, recursive_parse_item_to_table(value, override_repr=override_repr))
+            config_table.add(
+                config_item_name,
+                recursive_parse_item_to_table(
+                    value,
+                    is_inline_table=is_inline_table,
+                    override_repr=override_repr,
+                ),
+            )
        else:
            config_table.add(
                config_item_name, convert_field(config_item_name, config_item_info, value, override_repr=override_repr)
--- a/src/config/legacy_migration.py
+++ b/src/config/legacy_migration.py
@@ -268,11 +268,23 @@ def try_migrate_legacy_bot_config_dict(data: dict[str, Any]) -> MigrationResult:
                migrated_any = True
                reasons.append("expression.manual_reflect_operator_id")

+    chat = _as_dict(data.get("chat"))
+    if chat is None:
+        chat = {}
+        data["chat"] = chat
+
    mem = _as_dict(data.get("memory"))
    if mem is not None:
-        if _migrate_target_item_list(mem, "global_memory_blacklist"):
-            migrated_any = True
-            reasons.append("memory.global_memory_blacklist")
+        for removed_key in (
+            "agent_timeout_seconds",
+            "global_memory",
+            "global_memory_blacklist",
+            "max_agent_iterations",
+        ):
+            if removed_key in mem:
+                mem.pop(removed_key, None)
+                migrated_any = True
+                reasons.append(f"memory.{removed_key}_removed")

    exp = _as_dict(data.get("experimental"))
    if exp is not None:
@@ -280,7 +292,16 @@ def try_migrate_legacy_bot_config_dict(data: dict[str, Any]) -> MigrationResult:
            migrated_any = True
            reasons.append("experimental.chat_prompts")

-    chat = _as_dict(data.get("chat"))
+        for key in ("private_plan_style", "group_chat_prompt", "private_chat_prompts", "chat_prompts"):
+            if key in exp and key not in chat:
+                chat[key] = exp[key]
+                migrated_any = True
+                reasons.append(f"experimental.{key}_moved_to_chat")
+
+        data.pop("experimental", None)
+        migrated_any = True
+        reasons.append("experimental_removed")
+
    if chat is not None and "think_mode" in chat:
        chat.pop("think_mode", None)
        migrated_any = True
--- a/src/config/official_configs.py
+++ b/src/config/official_configs.py
@@ -244,15 +244,45 @@ class ChatConfig(ConfigBase):
        },
    )
    """每个聊天流最大保存的Plan/Reply日志数量，超过此数量时会自动删除最老的日志"""
-
-    llm_quote: bool = Field(
-        default=False,
+    private_plan_style: str = Field(
+        default=(
+            "1.思考**所有**的可用的action中的**每个动作**是否符合当下条件，如果动作使用条件符合聊天内容就使用\n"
+            "2.如果相同的内容已经被执行，请不要重复执行\n"
+            "3.某句话如果已经被回复过，不要重复回复"
+        ),
        json_schema_extra={
-            "x-widget": "switch",
-            "x-icon": "quote",
+            "x-widget": "textarea",
+            "x-icon": "user",
        },
    )
-    """是否在 reply action 中启用 quote 参数，启用后 LLM 可以控制是否引用消息"""
+    """_wrap_私聊说话规则，行为风格"""
+
+    group_chat_prompt: str = Field(
+        default="不要回复的太频繁！控制回复的频率，不要每个人的消息都回复，只回复你感兴趣的或者主动提及你的。",
+        json_schema_extra={
+            "x-widget": "textarea",
+            "x-icon": "users",
+        },
+    )
+    """_wrap_群聊通用注意事项"""
+
+    private_chat_prompts: str = Field(
+        default="",
+        json_schema_extra={
+            "x-widget": "textarea",
+            "x-icon": "user",
+        },
+    )
+    """_wrap_私聊通用注意事项"""
+
+    chat_prompts: list["ExtraPromptItem"] = Field(
+        default_factory=lambda: [],
+        json_schema_extra={
+            "x-widget": "custom",
+            "x-icon": "list",
+        },
+    )
+    """_wrap_为指定聊天添加额外的 prompt 配置列表"""

    enable_talk_value_rules: bool = Field(
        default=True,
@@ -410,7 +440,6 @@ class MemoryConfig(ConfigBase):
        },
    )
    """是否在发送回复后自动提取并写回人物事实到长期记忆"""
-
    chat_history_topic_check_message_threshold: int = Field(
        default=80,
        ge=1,
@@ -462,10 +491,6 @@ class MemoryConfig(ConfigBase):

    def model_post_init(self, context: Optional[dict] = None) -> None:
        """验证配置值"""
-        if self.max_agent_iterations < 1:
-            raise ValueError(f"max_agent_iterations 必须至少为1，当前值: {self.max_agent_iterations}")
-        if self.agent_timeout_seconds <= 0:
-            raise ValueError(f"agent_timeout_seconds 必须大于0，当前值: {self.agent_timeout_seconds}")
        if self.chat_history_topic_check_message_threshold < 1:
            raise ValueError(
                f"chat_history_topic_check_message_threshold 必须至少为1，当前值: {self.chat_history_topic_check_message_threshold}"
@@ -1070,39 +1095,13 @@ class ExtraPromptItem(ConfigBase):
    """额外的prompt内容"""

    def model_post_init(self, context: Optional[dict] = None) -> None:
+        if not self.platform and not self.item_id and not self.prompt:
+            return super().model_post_init(context)
        if not self.platform or not self.item_id or not self.prompt:
            raise ValueError("ExtraPromptItem 中 platform, id 和 prompt 不能为空")
        return super().model_post_init(context)


-class ExperimentalConfig(ConfigBase):
-    """实验功能配置类"""
-
-    __ui_parent__ = "debug"
-
-    private_plan_style: str = Field(
-        default=(
-            "1.思考**所有**的可用的action中的**每个动作**是否符合当下条件，如果动作使用条件符合聊天内容就使用"
-            "2.如果相同的内容已经被执行，请不要重复执行"
-            "3.某句话如果已经被回复过，不要重复回复"
-        ),
-        json_schema_extra={
-            "x-widget": "textarea",
-            "x-icon": "user",
-        },
-    )
-    """_wrap_私聊说话规则，行为风格（实验性功能）"""
-
-    chat_prompts: list[ExtraPromptItem] = Field(
-        default_factory=lambda: [],
-        json_schema_extra={
-            "x-widget": "custom",
-            "x-icon": "list",
-        },
-    )
-    """_wrap_为指定聊天添加额外的prompt配置列表"""
-
-
 class MaimMessageConfig(ConfigBase):
    """maim_message配置类"""

@@ -1473,7 +1472,6 @@ class MaiSakaConfig(ConfigBase):

    __ui_label__ = "MaiSaka"
    __ui_icon__ = "message-circle"
-    __ui_parent__ = "experimental"

    enable_knowledge_module: bool = Field(
        default=True,
@@ -1483,16 +1481,6 @@ class MaiSakaConfig(ConfigBase):
        },
    )
    """启用知识库模块"""
-
-    show_analyze_cognition_prompt: bool = Field(
-        default=False,
-        json_schema_extra={
-            "x-widget": "switch",
-            "x-icon": "terminal",
-        },
-    )
-    """是否在 CLI 中显示 analyze_cognition 的 Prompt"""
-
    show_thinking: bool = Field(
        default=True,
        json_schema_extra={
@@ -1529,6 +1517,15 @@ class MaiSakaConfig(ConfigBase):
    )
    """是否将新接收的用户发言合并为单个用户消息"""

+    replyer_generator_type: Literal["legacy", "multi"] = Field(
+        default="legacy",
+        json_schema_extra={
+            "x-widget": "select",
+            "x-icon": "git-branch",
+        },
+    )
+    """Maisaka replyer 生成器类型：legacy（旧版单 prompt）/ multi（多消息版）"""
+
    max_internal_rounds: int = Field(
        default=6,
        ge=1,
@@ -1568,24 +1565,14 @@ class MaiSakaConfig(ConfigBase):
    )
    """工具筛选阶段最多保留的非内置工具数量"""

-    terminal_image_preview: bool = Field(
-        default=False,
+    terminal_image_display_mode: Literal["legacy", "path_link"] = Field(
+        default="legacy",
        json_schema_extra={
-            "x-widget": "switch",
+            "x-widget": "select",
            "x-icon": "image",
        },
    )
-    """是否渲染低分辨率终端预览图片"""
-
-    terminal_image_preview_width: int = Field(
-        default=24,
-        ge=8,
-        json_schema_extra={
-            "x-widget": "input",
-            "x-icon": "columns",
-        },
-    )
-    """Maisaka终端图片预览的字符宽度"""
+    """图片展示模式：legacy（仅显示元信息）/ path_link（可点击本地路径）"""


 class MCPAuthorizationConfig(ConfigBase):
@@ -1969,6 +1956,129 @@ class MCPConfig(ConfigBase):
        return super().model_post_init(context)


+class PluginRuntimeRenderConfig(ConfigBase):
+    """插件运行时浏览器渲染配置。"""
+
+    enabled: bool = Field(
+        default=True,
+        json_schema_extra={
+            "x-widget": "switch",
+            "x-icon": "image",
+        },
+    )
+    """是否启用插件运行时浏览器渲染能力"""
+
+    browser_ws_endpoint: str = Field(
+        default="",
+        json_schema_extra={
+            "x-widget": "input",
+            "x-icon": "link",
+        },
+    )
+    """优先复用的现有 Chromium CDP 地址，可填写 ws/http 端点"""
+
+    executable_path: str = Field(
+        default="",
+        json_schema_extra={
+            "x-widget": "input",
+            "x-icon": "folder",
+        },
+    )
+    """浏览器可执行文件路径，留空时自动探测本机 Chrome/Chromium"""
+
+    browser_install_root: str = Field(
+        default="data/playwright-browsers",
+        json_schema_extra={
+            "x-widget": "input",
+            "x-icon": "hard-drive",
+        },
+    )
+    """Playwright 托管浏览器目录，自动下载 Chromium 时会复用该目录"""
+
+    headless: bool = Field(
+        default=True,
+        json_schema_extra={
+            "x-widget": "switch",
+            "x-icon": "monitor",
+        },
+    )
+    """是否以无头模式启动浏览器"""
+
+    launch_args: list[str] = Field(
+        default_factory=lambda: [
+            "--disable-gpu",
+            "--disable-dev-shm-usage",
+            "--disable-setuid-sandbox",
+            "--no-sandbox",
+            "--no-zygote",
+        ],
+        json_schema_extra={
+            "x-widget": "custom",
+            "x-icon": "terminal",
+        },
+    )
+    """浏览器启动参数列表"""
+
+    concurrency_limit: int = Field(
+        default=2,
+        ge=1,
+        json_schema_extra={
+            "x-widget": "number",
+            "x-icon": "layers",
+        },
+    )
+    """同时允许进行的最大渲染任务数"""
+
+    startup_timeout_sec: float = Field(
+        default=20.0,
+        gt=0,
+        json_schema_extra={
+            "x-widget": "number",
+            "x-icon": "clock",
+        },
+    )
+    """浏览器连接或启动超时时间（秒）"""
+
+    render_timeout_sec: float = Field(
+        default=15.0,
+        gt=0,
+        json_schema_extra={
+            "x-widget": "number",
+            "x-icon": "timer",
+        },
+    )
+    """单次渲染默认超时时间（秒）"""
+
+    auto_download_chromium: bool = Field(
+        default=True,
+        json_schema_extra={
+            "x-widget": "switch",
+            "x-icon": "download",
+        },
+    )
+    """未检测到可用浏览器时，是否自动下载 Playwright Chromium"""
+
+    download_connection_timeout_sec: float = Field(
+        default=120.0,
+        gt=0,
+        json_schema_extra={
+            "x-widget": "number",
+            "x-icon": "cloud-lightning",
+        },
+    )
+    """自动下载 Chromium 时的连接超时时间（秒）"""
+
+    restart_after_render_count: int = Field(
+        default=200,
+        ge=0,
+        json_schema_extra={
+            "x-widget": "number",
+            "x-icon": "refresh-cw",
+        },
+    )
+    """累计渲染指定次数后自动重建本地浏览器，0 表示关闭该策略"""
+
+
 class PluginRuntimeConfig(ConfigBase):
    """插件运行时配置类"""

@@ -2031,3 +2141,6 @@ class PluginRuntimeConfig(ConfigBase):
    自定义 IPC Socket 路径（仅 Linux/macOS 生效）
    留空则自动生成临时路径
    """
+
+    render: PluginRuntimeRenderConfig = Field(default_factory=PluginRuntimeRenderConfig)
+    """浏览器渲染能力配置"""