fix:解决 upstream 合并冲突

在临时整合分支中合并 upstream/r-dev
保留人物事实写回与反馈纠错配置
移除已下线的聊天总结配置并同步测试

src/maisaka/reasoning_engine.py

@@ -14,7 +14,7 @@ from src.chat.message_receive.message import SessionMessage
 from src.common.data_models.message_component_data_model import EmojiComponent, ImageComponent, MessageSequence
 from src.common.logger import get_logger
 from src.common.prompt_i18n import load_prompt
-from src.config.config import config_manager, global_config
+from src.config.config import global_config
 from src.core.tooling import ToolExecutionContext, ToolExecutionResult, ToolInvocation, ToolSpec
 from src.llm_models.exceptions import ReqAbortException
 from src.llm_models.payload_content.tool_option import ToolCall
@@ -44,6 +44,7 @@ from .monitor_events import (
     emit_timing_gate_result,
 )
 from .planner_message_utils import build_planner_user_prefix_from_session_message
+from .visual_mode_utils import resolve_enable_visual_planner
 
 if TYPE_CHECKING:
     from .runtime import MaisakaHeartFlowChatting
@@ -739,47 +740,10 @@ class MaisakaReasoningEngine:
         planner_prefix: str,
     ) -> MessageSequence:
         message_sequence = build_prefixed_message_sequence(message.raw_message, planner_prefix)
-        if self._resolve_enable_visual_planner():
+        if resolve_enable_visual_planner():
             await self._hydrate_visual_components(message_sequence.components)
         return message_sequence
 
-    @staticmethod
-    def _resolve_enable_visual_planner() -> bool:
-        planner_mode = global_config.visual.planner_mode
-        planner_task_config = config_manager.get_model_config().model_task_config.planner
-        models_by_name = {model.name: model for model in config_manager.get_model_config().models}
-
-        if planner_mode == "text":
-            return False
-
-        planner_models: list[str] = list(planner_task_config.model_list)
-        missing_models = [model_name for model_name in planner_models if model_name not in models_by_name]
-        non_visual_models = [
-            model_name for model_name in planner_models if model_name in models_by_name and not models_by_name[model_name].visual
-        ]
-
-        if planner_mode == "multimodal":
-            if missing_models:
-                raise ValueError(
-                    "planner_mode=multimodal，但 planner 任务存在未定义的模型："
-                    f"{', '.join(missing_models)}"
-                )
-            if non_visual_models:
-                raise ValueError(
-                    "planner_mode=multimodal，但 planner 任务存在未开启 visual 的模型："
-                    f"{', '.join(non_visual_models)}"
-                )
-            return True
-
-        if missing_models:
-            logger.warning(
-                "planner_mode=auto 时发现 planner 任务存在未定义模型："
-                f"{', '.join(missing_models)}，将退化为纯文本 planner"
-            )
-            return False
-
-        return bool(planner_models) and not non_visual_models
-
     async def _hydrate_visual_components(self, planner_components: list[object]) -> None:
         """在 Maisaka 真正需要图片或表情时，按需回填二进制数据。"""
         load_tasks: list[asyncio.Task[None]] = []