feat：表达方式可简化

src/chat/replyer/maisaka_expression_selector.py

@@ -41,13 +41,6 @@ class MaisakaExpressionSelector:
             logger.error(f"检查表达方式使用开关失败: {exc}")
             return False
 
-    def _can_use_advanced_chosen(self, session_id: str) -> bool:
-        try:
-            return ExpressionConfigUtils.get_expression_advanced_chosen_for_chat(session_id)
-        except Exception as exc:
-            logger.error(f"检查表达方式二次选择开关失败: {exc}")
-            return False
-
     @staticmethod
     def _is_global_expression_group_marker(platform: str, item_id: str) -> bool:
         return platform == "*" and item_id == "*"
@@ -287,7 +280,7 @@ class MaisakaExpressionSelector:
             logger.info(f"表达方式选择已跳过：本地候选不足，session_id={session_id}")
             return MaisakaExpressionSelectionResult()
 
-        if not self._can_use_advanced_chosen(session_id):
+        if not global_config.expression.advanced_chosen:
             return self._build_direct_selection_result(
                 session_id=session_id,
                 candidates=candidates,

src/chat/utils/common_utils.py

@@ -35,14 +35,6 @@ class TempMethodsExpression:
 
         return None
 
-    @staticmethod
-    def get_expression_advanced_chosen_for_chat(chat_stream_id: Optional[str] = None) -> bool:
-        """根据聊天流 ID 获取表达方式是否启用二次选择。"""
-        config_item = TempMethodsExpression._find_expression_config_item(chat_stream_id)
-        if config_item is None:
-            return False
-        return config_item.advanced_chosen
-
     @staticmethod
     def get_expression_config_for_chat(chat_stream_id: Optional[str] = None) -> tuple[bool, bool, bool]:
         """

src/common/utils/utils_config.py

@@ -35,14 +35,6 @@ class ExpressionConfigUtils:
 
         return None
 
-    @staticmethod
-    def get_expression_advanced_chosen_for_chat(session_id: Optional[str] = None) -> bool:
-        """根据聊天会话 ID 获取表达方式是否启用二次选择。"""
-        config_item = ExpressionConfigUtils._find_expression_config_item(session_id)
-        if config_item is None:
-            return False
-        return config_item.advanced_chosen
-
     @staticmethod
     def get_expression_config_for_chat(session_id: Optional[str] = None) -> tuple[bool, bool, bool]:
         # sourcery skip: use-next

src/config/config.py

@@ -55,7 +55,7 @@ BOT_CONFIG_PATH: Path = (CONFIG_DIR / "bot_config.toml").resolve().absolute()
 MODEL_CONFIG_PATH: Path = (CONFIG_DIR / "model_config.toml").resolve().absolute()
 LEGACY_ENV_PATH: Path = (PROJECT_ROOT / ".env").resolve().absolute()
 MMC_VERSION: str = "1.0.0"
-CONFIG_VERSION: str = "8.9.5"
+CONFIG_VERSION: str = "8.9.6"
 MODEL_CONFIG_VERSION: str = "1.14.1"
 
 logger = get_logger("config")

src/config/official_configs.py

@@ -676,16 +676,6 @@ class LearningItem(ConfigBase):
     )
     """是否启用jargon学习"""
 
-    advanced_chosen: bool = Field(
-        default=False,
-        json_schema_extra={
-            "x-widget": "switch",
-            "x-icon": "sparkles",
-        },
-    )
-    """是否启用基于子代理的二次表达方式选择"""
-
-
 class ExpressionGroup(ConfigBase):
     """表达互通组配置类，若列表为空代表全局共享"""
 
@@ -714,7 +704,6 @@ class ExpressionConfig(ConfigBase):
                 use_expression=True,
                 enable_learning=True,
                 enable_jargon_learning=True,
-                advanced_chosen=False,
             )
         ],
         json_schema_extra={
@@ -724,6 +713,15 @@ class ExpressionConfig(ConfigBase):
     )
     """_wrap_表达学习配置列表，支持按聊天流配置"""
 
+    advanced_chosen: bool = Field(
+        default=False,
+        json_schema_extra={
+            "x-widget": "switch",
+            "x-icon": "sparkles",
+        },
+    )
+    """是否启用基于子代理的二次表达方式选择"""
+
     expression_groups: list[ExpressionGroup] = Field(
         default_factory=list,
         json_schema_extra={