Merge branch 'Mai-with-u:dev' into dev

Author: Ronifue

README.md

@@ -115,11 +115,14 @@ MaiSaka 不仅仅是一个机器人，不仅仅是一个可以帮你完成任务
 
 | 类别 / Category | 群组 / Group | 说明 / Description |
 | :--- | :--- | :--- |
-| **技术交流**<br><sub><sup>Technical</sup></sub> | [麦麦脑电图](https://qm.qq.com/q/RzmCiRtHEW)<br><sub><sup>MaiBrain EEG</sup></sub> | 技术交流 / 答疑<br><sub><sup>Technical discussion / Q&A</sup></sub> |
-| **技术交流**<br><sub><sup>Technical</sup></sub> | [麦麦大脑磁共振](https://qm.qq.com/q/VQ3XZrWgMs)<br><sub><sup>MaiBrain MRI</sup></sub> | 技术交流 / 答疑<br><sub><sup>Technical discussion / Q&A</sup></sub> |
+| **技术交流**<br><sub><sup>Technical</sup></sub> | 麦麦脑电图:571780722
+<br><sub><sup>MaiBrain EEG</sup></sub> | 技术交流 / 答疑<br><sub><sup>Technical discussion / Q&A</sup></sub> |
+| **技术交流**<br><sub><sup>Technical</sup></sub> | 麦麦大脑磁共振:766798517
+<br><sub><sup>MaiBrain MRI</sup></sub> | 技术交流 / 答疑<br><sub><sup>Technical discussion / Q&A</sup></sub> |
 | **技术交流**<br><sub><sup>Technical</sup></sub> | [麦麦要当 VTB](https://qm.qq.com/q/wGePTl1UyY)<br><sub><sup>Mai Wants to Be a VTuber</sup></sub> | 技术交流 / 答疑<br><sub><sup>Technical discussion / Q&A</sup></sub> |
 | **闲聊吹水**<br><sub><sup>Casual Chat</sup></sub> | [麦麦之闲聊群](https://qm.qq.com/q/JxvHZnxyec)<br><sub><sup>Mai Casual Chat Group</sup></sub> | 仅限闲聊，不答疑<br><sub><sup>Casual chat only, no support</sup></sub> |
-| **插件开发**<br><sub><sup>Plugin Development</sup></sub> | [插件开发群](https://qm.qq.com/q/1036092828)<br><sub><sup>Plugin Dev Group</sup></sub> | 进阶开发与测试<br><sub><sup>Advanced development and testing</sup></sub> |
+| **插件开发**<br><sub><sup>Plugin Development</sup></sub> | 插件开发群:1036092828
+<br><sub><sup>Plugin Dev Group</sup></sub> | 进阶开发与测试<br><sub><sup>Advanced development and testing</sup></sub> |
 
 ---
 

dashboard/src/i18n/locales/zh.json

@@ -518,7 +518,7 @@
     },
     "header": {
       "title": "首次配置向导",
-      "description": "让我们一起完成 {{appName}} 的初始配置"
+      "description": "让我们一起完成麦麦的初始配置"
     },
     "progress": {
       "stepCounter": "步骤 {{current}} / {{total}}"
@@ -735,7 +735,7 @@
     "restartingTip": "🔄 配置已保存，正在重启主程序...",
     "checking": "检查服务状态",
     "checkingDesc": "等待服务恢复... ({{current}}/{{max}})",
-    "checkingTip": "⏳ 正在等待服务恢复，请勿关闭页面...",
+    "checkingTip": "重启中，请勿关闭页面...",
     "success": "重启成功",
     "successDesc": "正在跳转到登录页面...",
     "successTip": "✅ 配置已生效，服务运行正常",

dashboard/src/routes/config/model.tsx

@@ -85,10 +85,12 @@ function unwrapModelConfig(data: unknown): Record<string, unknown> {
   return data as Record<string, unknown>
 }
 
+const ADVANCED_MODEL_TASK_NAMES = new Set(['memory', 'learner', 'emoji', 'voice'])
+
 function getRequiredTaskNames(schema: ConfigSchema | null): Set<string> {
   return new Set(
     (schema?.fields ?? [])
-      .filter((field) => field.type === 'object' && !field.advanced)
+      .filter((field) => field.type === 'object' && !field.advanced && !ADVANCED_MODEL_TASK_NAMES.has(field.name))
       .map((field) => field.name)
   )
 }

dashboard/src/routes/setup/index.tsx

@@ -220,6 +220,7 @@ function SetupPageContent() {
         description: t('setupPage.toast.saveSuccessDescription', {
           step: steps[currentStep].title,
         }),
+        duration: 1000,
       })
       return true
     } catch (error) {

pytests/test_maisaka_chat_loop_visual_mode.py

@@ -0,0 +1,26 @@
+import pytest
+
+from src.maisaka import chat_loop_service as chat_loop_service_module
+from src.maisaka.chat_loop_service import MaisakaChatLoopService
+
+
+def test_expression_selector_uses_text_context() -> None:
+    assert MaisakaChatLoopService._resolve_enable_visual_message("expression_selector") is False
+
+
+def test_reply_effect_judge_uses_text_context() -> None:
+    assert MaisakaChatLoopService._resolve_enable_visual_message("reply_effect_judge") is False
+
+
+@pytest.mark.parametrize("request_kind", ["planner", "timing_gate"])
+def test_planner_requests_follow_planner_visual_mode(
+    monkeypatch: pytest.MonkeyPatch,
+    request_kind: str,
+) -> None:
+    monkeypatch.setattr(chat_loop_service_module, "resolve_enable_visual_planner", lambda: False)
+
+    assert MaisakaChatLoopService._resolve_enable_visual_message(request_kind) is False
+
+
+def test_visual_sub_agent_requests_keep_visual_context() -> None:
+    assert MaisakaChatLoopService._resolve_enable_visual_message("emotion") is True

pytests/webui/test_plugin_management_routes.py

@@ -134,3 +134,67 @@ async def clone_repository(self, **kwargs):
     assert plugin_path is not None
     manifest = json.loads((plugin_path / "_manifest.json").read_text(encoding="utf-8"))
     assert manifest["id"] == "market.legacy"
+
+
+def test_install_plugin_cleans_config_only_residue(client: TestClient, monkeypatch):
+    residue_path, _ = support_module.get_plugin_candidate_paths("market.residue")
+    residue_path.mkdir(parents=True)
+    (residue_path / "config.toml").write_text("[plugin]\nenabled = true\n", encoding="utf-8")
+
+    class FakeGitMirrorService:
+        async def clone_repository(self, **kwargs):
+            target_path = kwargs["target_path"]
+            assert target_path == residue_path
+            assert not (target_path / "config.toml").exists()
+            target_path.mkdir(parents=True, exist_ok=True)
+            (target_path / "_manifest.json").write_text(
+                json.dumps(
+                    {
+                        "manifest_version": 2,
+                        "id": "market.residue",
+                        "name": "Residue Plugin",
+                        "version": "1.0.0",
+                        "author": {"name": "market"},
+                    }
+                ),
+                encoding="utf-8",
+            )
+            return {"success": True}
+
+    monkeypatch.setattr(management_module, "get_git_mirror_service", lambda: FakeGitMirrorService())
+
+    response = client.post(
+        "/api/webui/plugins/install",
+        json={
+            "plugin_id": "market.residue",
+            "repository_url": "https://github.com/market/residue",
+            "branch": "main",
+        },
+    )
+
+    assert response.status_code == 200
+    assert (residue_path / "_manifest.json").exists()
+    assert not (residue_path / "config.toml").exists()
+
+
+def test_uninstall_plugin_releases_runtime_before_delete(client: TestClient, monkeypatch):
+    from src.plugin_runtime import integration as integration_module
+
+    plugin_path = support_module.resolve_installed_plugin_path("test.demo")
+    assert plugin_path is not None
+    reload_calls = []
+
+    class FakeRuntimeManager:
+        async def reload_plugins_globally(self, plugin_ids, reason="manual"):
+            reload_calls.append((list(plugin_ids), reason))
+            config_text = (plugin_path / "config.toml").read_text(encoding="utf-8")
+            assert "enabled = false" in config_text
+            return True
+
+    monkeypatch.setattr(integration_module, "get_plugin_runtime_manager", lambda: FakeRuntimeManager())
+
+    response = client.post("/api/webui/plugins/uninstall", json={"plugin_id": "test.demo"})
+
+    assert response.status_code == 200
+    assert reload_calls == [(["test.demo"], "uninstall")]
+    assert not plugin_path.exists()

src/maisaka/chat_loop_service.py

@@ -1016,5 +1016,7 @@ def _filter_history_for_request_kind(
     def _resolve_enable_visual_message(request_kind: str) -> bool:
         if request_kind in {"planner", "timing_gate"}:
             return resolve_enable_visual_planner()
+        if request_kind in {"expression_selector", "reply_effect_judge"}:
+            return False
         return True
 

src/plugin_runtime/component_query.py

@@ -20,6 +20,7 @@
 )
 from src.core.types import ActionActivationType, ActionInfo, CommandInfo, ComponentInfo, ComponentType, ToolInfo
 from src.llm_models.payload_content.tool_option import normalize_tool_option
+from src.plugin_runtime.host.message_utils import PluginMessageUtils
 
 if TYPE_CHECKING:
     from src.plugin_runtime.host.component_registry import ActionEntry, CommandEntry, ComponentEntry, ToolEntry
@@ -503,6 +504,10 @@ async def _executor(**kwargs: Any) -> tuple[bool, Optional[str], bool]:
                 "user_id": str(getattr(user_info, "user_id", "") or ""),
                 "matched_groups": matched_groups if isinstance(matched_groups, dict) else {},
             }
+            if message is not None:
+                invoke_args["message"] = dict(
+                    PluginMessageUtils._session_message_to_dict(message, include_binary_data=False)
+                )
             if isinstance(plugin_config, dict):
                 invoke_args["plugin_config"] = plugin_config
 

src/webui/routers/plugin/management.py

@@ -14,6 +14,7 @@
     find_plugin_path_by_id,
     get_plugin_candidate_paths,
     get_plugin_config_path,
+    is_plugin_install_residue,
     iter_plugin_directories,
     load_manifest_json,
     parse_repository_url,
@@ -99,6 +100,36 @@ def _get_runtime_plugin_load_statuses() -> Dict[str, str]:
         return {}
 
 
+def _write_plugin_disabled_for_uninstall(plugin_path: Path) -> None:
+    config_path = resolve_plugin_file_path(plugin_path, "config.toml")
+    if config_path.exists():
+        with open(config_path, "r", encoding="utf-8") as file_obj:
+            config_doc = tomlkit.load(file_obj)
+    else:
+        config_doc = tomlkit.document()
+
+    plugin_section = config_doc.get("plugin")
+    if not isinstance(plugin_section, dict):
+        plugin_section = tomlkit.table()
+        config_doc["plugin"] = plugin_section
+    plugin_section["enabled"] = False
+
+    with open(config_path, "w", encoding="utf-8") as file_obj:
+        file_obj.write(tomlkit.dumps(config_doc))
+
+
+async def _release_plugin_runtime_before_delete(plugin_id: str, plugin_path: Path) -> bool:
+    try:
+        _write_plugin_disabled_for_uninstall(plugin_path)
+
+        from src.plugin_runtime.integration import get_plugin_runtime_manager
+
+        return await get_plugin_runtime_manager().reload_plugins_globally([plugin_id], reason="uninstall")
+    except Exception as exc:
+        logger.warning(f"插件 {plugin_id} 删除前运行时卸载失败，将继续尝试删除文件: {exc}")
+        return False
+
+
 @router.post("/install")
 async def install_plugin(request: InstallPluginRequest, maibot_session: Optional[str] = Cookie(None)) -> Dict[str, Any]:
     require_plugin_token(maibot_session)
@@ -121,6 +152,10 @@ async def install_plugin(request: InstallPluginRequest, maibot_session: Optional
         )
 
         target_path, old_format_path = get_plugin_candidate_paths(plugin_id)
+        for candidate_path in (target_path, old_format_path):
+            if is_plugin_install_residue(candidate_path):
+                logger.warning(f"检测到插件安装残留目录，安装前自动清理: {candidate_path}")
+                remove_tree(candidate_path)
         if target_path.exists() or old_format_path.exists():
             await update_progress(
                 stage="error",
@@ -257,15 +292,24 @@ async def uninstall_plugin(
             )
             raise HTTPException(status_code=404, detail="插件未安装")
 
+        manifest = load_manifest_json(resolve_plugin_file_path(plugin_path, "_manifest.json"))
+        plugin_name = str(manifest.get("name", plugin_id)) if manifest is not None else plugin_id
+        runtime_plugin_id = str(manifest.get("id", plugin_id)) if manifest is not None else plugin_id
         await update_progress(
             stage="loading",
             progress=30,
+            message=f"正在卸载运行中的插件: {plugin_name}",
+            operation="uninstall",
+            plugin_id=plugin_id,
+        )
+        await _release_plugin_runtime_before_delete(runtime_plugin_id, plugin_path)
+        await update_progress(
+            stage="loading",
+            progress=45,
             message=f"正在删除插件文件: {plugin_path}",
             operation="uninstall",
             plugin_id=plugin_id,
         )
-        manifest = load_manifest_json(resolve_plugin_file_path(plugin_path, "_manifest.json"))
-        plugin_name = str(manifest.get("name", plugin_id)) if manifest is not None else plugin_id
         await update_progress(
             stage="loading",
             progress=50,

src/webui/routers/plugin/support.py

@@ -205,6 +205,22 @@ def get_plugin_candidate_paths(plugin_id: str) -> Tuple[Path, Path]:
     return validate_safe_path(folder_name, plugins_dir), validate_safe_path(plugin_id, plugins_dir)
 
 
+def is_plugin_install_residue(plugin_path: Path) -> bool:
+    """判断目录是否只是卸载失败留下的插件安装残留。"""
+    if not plugin_path.exists() or not plugin_path.is_dir() or plugin_path.is_symlink():
+        return False
+
+    manifest_path = resolve_plugin_file_path(plugin_path, "_manifest.json")
+    if manifest_path.exists():
+        return False
+
+    allowed_residue_files = {"config.toml"}
+    try:
+        return all(entry.is_file() and entry.name in allowed_residue_files for entry in plugin_path.iterdir())
+    except OSError:
+        return False
+
+
 def resolve_installed_plugin_path(plugin_id: str) -> Optional[Path]:
     new_format_path, old_format_path = get_plugin_candidate_paths(plugin_id)
     plugins_dir = get_plugins_dir()