Merge pull request #1668 from Mai-with-u/dev

Dev

Author: SengokuCola

Dockerfile

@@ -19,7 +19,7 @@ RUN uv sync --frozen --no-dev --no-install-project
 # Copy project source
 COPY . .
 
-RUN git clone --depth 1 --branch plugin https://github.com/Mai-with-u/MaiBot-Napcat-Adapter.git plugin-templates/MaiBot-Napcat-Adapter
+RUN git clone --depth 1 --branch main https://github.com/Mai-with-u/MaiBot-Napcat-Adapter.git plugin-templates/MaiBot-Napcat-Adapter
 RUN chmod +x docker-entrypoint.sh
 
 EXPOSE 8000

dashboard/src/lib/plugin-api/marketplace.ts

@@ -18,7 +18,7 @@ const PLUGIN_DETAILS_FILE = 'plugin_details.json'
  * 插件列表 API 响应类型（只包含我们需要的字段）
  */
 interface PluginApiResponse {
-  id: string
+  id?: string
   manifest: {
     manifest_version: number
     id?: string
@@ -110,7 +110,7 @@ export async function fetchPluginList(): Promise<ApiResponse<PluginInfo[]>> {
         console.warn('跳过无效插件数据:', item)
         return false
       }
-      const pluginId = item.manifest.id || item.id
+      const pluginId = item.manifest.id
       if (!pluginId) {
         console.warn('跳过缺少 ID 的插件:', item)
         return false
@@ -122,7 +122,7 @@ export async function fetchPluginList(): Promise<ApiResponse<PluginInfo[]>> {
       return true
     })
     .map((item) => ({
-      id: item.manifest.id || item.id,
+      id: item.manifest.id!,
       manifest: normalizePluginManifest(item.manifest),
       downloads: 0,
       rating: 0,

docker-compose.yml

@@ -25,7 +25,7 @@ services:
       - ./data/MaiMBot/emoji:/data/emoji # 持久化表情包
       - ./data/MaiMBot/plugins:/MaiMBot/plugins # 插件目录
       - ./data/MaiMBot/logs:/MaiMBot/logs # 日志目录
-      - ./depends-data:/MaiMBot/depends-data:ro # 运行时资源文件
+      - ./depends-data:/MaiMBot/depends-data # 运行时资源文件
       # - site-packages:/usr/local/lib/python3.13/site-packages # 持久化Python包，需要时启用
     restart: always
     networks:

prompts/zh-CN/image_description.prompt

@@ -1 +1 @@
-请用中文描述这张图片的内容。如果有文字，请把文字描述概括出来，请留意其主题、直观感受，输出为一段平文本，最多30字，请注意不要分点，就输出一段文本
+请用中文详细描述这张图片的内容。如果有文字，请把文字描述概括出来，请留意其主题、直观感受，输出为一段平文本，最多100字，请注意不要分点，就输出一段文本

pyproject.toml

@@ -4,9 +4,9 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "MaiBot"
-version = "1.0.0"
+version = "1.0.0-pre.16"
 description = "MaiCore 是一个基于大语言模型的可交互智能体"
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 dependencies = [
     "Babel>=2.17.0",
     "aiohttp>=3.12.14",

pytests/test_maisaka_builtin_context.py

@@ -6,6 +6,7 @@
 from src.common.data_models.message_component_data_model import AtComponent, MessageSequence, ReplyComponent, TextComponent
 from src.config.config import global_config
 from src.maisaka.builtin_tool.context import BuiltinToolRuntimeContext
+from src.maisaka.runtime import MaisakaHeartFlowChatting
 
 
 def _build_sent_message() -> SessionMessage:
@@ -63,7 +64,9 @@ def test_post_process_reply_message_sequences_converts_at_marker_before_bracket_
             )
         )
     )
-    runtime = SimpleNamespace(_source_messages_by_id={"12160142": target_message})
+    runtime = SimpleNamespace(
+        find_source_message_by_id=lambda message_id: target_message if message_id == "12160142" else None
+    )
     engine = SimpleNamespace(_get_runtime_manager=lambda: None)
     tool_ctx = BuiltinToolRuntimeContext(engine=engine, runtime=runtime)
 
@@ -85,7 +88,7 @@ def test_post_process_reply_message_sequences_ignores_at_marker_when_disabled(mo
         "src.maisaka.builtin_tool.context.process_llm_response",
         lambda text: [text.strip()] if text.strip() else [],
     )
-    runtime = SimpleNamespace(_source_messages_by_id={})
+    runtime = SimpleNamespace(find_source_message_by_id=lambda message_id: None)
     engine = SimpleNamespace(_get_runtime_manager=lambda: None)
     tool_ctx = BuiltinToolRuntimeContext(engine=engine, runtime=runtime)
 
@@ -96,3 +99,15 @@ def test_post_process_reply_message_sequences_ignores_at_marker_when_disabled(mo
     assert len(components) == 1
     assert isinstance(components[0], TextComponent)
     assert components[0].text == "at[12160142] 就这个群"
+
+
+def test_runtime_finds_source_message_from_history() -> None:
+    target_message = _build_sent_message()
+    runtime = object.__new__(MaisakaHeartFlowChatting)
+    runtime._chat_history = [
+        SimpleNamespace(message_id="other-message-id", original_message=SimpleNamespace()),
+        SimpleNamespace(message_id="real-message-id", original_message=target_message),
+    ]
+
+    assert runtime.find_source_message_by_id("real-message-id") is target_message
+    assert runtime.find_source_message_by_id("missing-message-id") is None

pytests/test_maisaka_memory_retention.py

@@ -0,0 +1,105 @@
+from types import SimpleNamespace
+
+import pytest
+import time
+
+from src.chat.heart_flow import heartflow_manager as heartflow_manager_module
+from src.chat.heart_flow.heartflow_manager import HEARTFLOW_ACTIVE_RETENTION_SECONDS, HeartflowManager
+from src.learners.expression_learner import ExpressionLearner
+from src.maisaka.runtime import MAX_RETAINED_MESSAGE_CACHE_SIZE, MaisakaHeartFlowChatting
+
+
+def _build_runtime_with_messages(message_count: int) -> MaisakaHeartFlowChatting:
+    runtime = object.__new__(MaisakaHeartFlowChatting)
+    runtime.log_prefix = "[test]"
+    runtime.message_cache = [SimpleNamespace(message_id=f"msg-{index}") for index in range(message_count)]
+    runtime._last_processed_index = message_count
+    runtime._expression_learner = ExpressionLearner("session-1")
+    runtime._expression_learner.mark_all_processed(runtime.message_cache)
+    return runtime
+
+
+def test_prune_processed_message_cache_keeps_bounded_recent_window() -> None:
+    runtime = _build_runtime_with_messages(MAX_RETAINED_MESSAGE_CACHE_SIZE + 25)
+
+    runtime._prune_processed_message_cache()
+
+    assert len(runtime.message_cache) == MAX_RETAINED_MESSAGE_CACHE_SIZE
+    assert runtime.message_cache[0].message_id == "msg-25"
+    assert runtime._last_processed_index == MAX_RETAINED_MESSAGE_CACHE_SIZE
+    assert runtime._expression_learner.last_processed_index == MAX_RETAINED_MESSAGE_CACHE_SIZE
+
+
+def test_prune_processed_message_cache_keeps_unlearned_messages() -> None:
+    runtime = _build_runtime_with_messages(MAX_RETAINED_MESSAGE_CACHE_SIZE + 25)
+    runtime._expression_learner.discard_processed_prefix(MAX_RETAINED_MESSAGE_CACHE_SIZE + 5)
+
+    runtime._prune_processed_message_cache()
+
+    assert len(runtime.message_cache) == MAX_RETAINED_MESSAGE_CACHE_SIZE + 5
+    assert runtime.message_cache[0].message_id == "msg-20"
+    assert runtime._expression_learner.last_processed_index == 0
+
+
+def test_collect_pending_messages_uses_single_pending_received_time() -> None:
+    runtime = _build_runtime_with_messages(2)
+    runtime._last_processed_index = 0
+    runtime._oldest_pending_message_received_at = 123.0
+    runtime._last_message_received_at = 456.0
+    runtime._reply_latency_measurement_started_at = None
+
+    pending_messages = runtime._collect_pending_messages()
+
+    assert [message.message_id for message in pending_messages] == ["msg-0", "msg-1"]
+    assert runtime._reply_latency_measurement_started_at == 123.0
+    assert runtime._oldest_pending_message_received_at is None
+
+
+@pytest.mark.asyncio
+async def test_heartflow_manager_evicts_lru_chat_over_limit(monkeypatch: pytest.MonkeyPatch) -> None:
+    manager = HeartflowManager()
+    stopped_session_ids: list[str] = []
+    old_active_at = time.time() - HEARTFLOW_ACTIVE_RETENTION_SECONDS - 1
+
+    class FakeChat:
+        def __init__(self, session_id: str) -> None:
+            self.session_id = session_id
+
+        async def stop(self) -> None:
+            stopped_session_ids.append(self.session_id)
+
+    monkeypatch.setattr(heartflow_manager_module, "HEARTFLOW_MAX_ACTIVE_CHATS", 2)
+    manager.heartflow_chat_list["session-1"] = FakeChat("session-1")
+    manager.heartflow_chat_list["session-2"] = FakeChat("session-2")
+    manager.heartflow_chat_list["session-3"] = FakeChat("session-3")
+    manager._chat_last_active_at["session-1"] = old_active_at
+    manager._chat_last_active_at["session-2"] = old_active_at
+    manager._chat_last_active_at["session-3"] = time.time()
+
+    await manager._evict_over_limit_chats(protected_session_id="session-3")
+
+    assert stopped_session_ids == ["session-1"]
+    assert list(manager.heartflow_chat_list) == ["session-2", "session-3"]
+
+
+@pytest.mark.asyncio
+async def test_heartflow_manager_keeps_recent_chats_even_over_limit(monkeypatch: pytest.MonkeyPatch) -> None:
+    manager = HeartflowManager()
+    stopped_session_ids: list[str] = []
+
+    class FakeChat:
+        def __init__(self, session_id: str) -> None:
+            self.session_id = session_id
+
+        async def stop(self) -> None:
+            stopped_session_ids.append(self.session_id)
+
+    monkeypatch.setattr(heartflow_manager_module, "HEARTFLOW_MAX_ACTIVE_CHATS", 2)
+    for session_id in ("session-1", "session-2", "session-3"):
+        manager.heartflow_chat_list[session_id] = FakeChat(session_id)
+        manager._chat_last_active_at[session_id] = time.time()
+
+    await manager._evict_over_limit_chats(protected_session_id="session-3")
+
+    assert stopped_session_ids == []
+    assert list(manager.heartflow_chat_list) == ["session-1", "session-2", "session-3"]

pytests/test_maisaka_monitor_protocol.py

@@ -199,7 +199,7 @@ async def generate_reply_with_context(self, **kwargs: Any) -> tuple[bool, ReplyG
         ),
     )
     runtime = SimpleNamespace(
-        _source_messages_by_id={"msg-1": target_message},
+        find_source_message_by_id=lambda message_id: target_message if message_id == "msg-1" else None,
         log_prefix="[test]",
         chat_stream=SimpleNamespace(platform=reply_tool_module.CLI_PLATFORM_NAME),
         session_id="session-1",

pytests/test_plugin_runtime.py

@@ -1169,6 +1169,8 @@ def test_normalize(self):
 
         assert VersionComparator.normalize_version("0.8.0-snapshot.1") == "0.8.0"
         assert VersionComparator.normalize_version("1.2") == "1.2.0"
+        assert VersionComparator.normalize_version("1.0.0rc16") == "1.0.0"
+        assert VersionComparator.normalize_version("1.0.0-pre.16") == "1.0.0"
         assert VersionComparator.normalize_version("") == "0.0.0"
 
     def test_compare(self):
@@ -2890,22 +2892,105 @@ async def fake_db_get(model_class, filters=None, limit=None, order_by=None, sing
         monkeypatch.setattr(real_database_service, "db_get", fake_db_get)
         monkeypatch.setattr(real_db_models, "DemoTable", DummyModel, raising=False)
 
-        result = await integration_module.PluginRuntimeManager._cap_database_get(
+        manager = object.__new__(integration_module.PluginRuntimeManager)
+        result = await manager._cap_database_get(
             "plugin_a",
             "database.get",
             {
-                "table": "DemoTable",
+                "model_name": "DemoTable",
                 "filters": {"status": "active"},
                 "limit": 5,
             },
         )
 
-        assert result == {"success": True, "result": [{"id": 1}]}
+        assert result == [{"id": 1}]
         assert captured["model_class"] is DummyModel
         assert captured["filters"] == {"status": "active"}
         assert captured["limit"] == 5
         assert captured["single_result"] is False
 
+    @pytest.mark.asyncio
+    async def test_cap_database_get_response_is_not_double_wrapped(self, monkeypatch):
+        from src.plugin_runtime import integration as integration_module
+        import src.common.database.database_model as real_db_models
+        from src.plugin_runtime.host.capability_service import CapabilityService
+        from src.plugin_runtime.protocol.envelope import CapabilityRequestPayload, Envelope, MessageType
+        from src.services import database_service as real_database_service
+
+        class AllowAllAuthorization:
+            def check_capability(self, plugin_id, capability):
+                return True, ""
+
+        class DummyModel:
+            pass
+
+        async def fake_db_get(model_class, filters=None, limit=None, order_by=None, single_result=False):
+            return {"id": 1, "full_path": "E:\\test.png"}
+
+        monkeypatch.setattr(real_database_service, "db_get", fake_db_get)
+        monkeypatch.setattr(real_db_models, "DemoTable", DummyModel, raising=False)
+
+        manager = object.__new__(integration_module.PluginRuntimeManager)
+        service = CapabilityService(AllowAllAuthorization())
+        service.register_capability("database.get", manager._cap_database_get)
+
+        request = Envelope(
+            request_id=1,
+            message_type=MessageType.REQUEST,
+            method="cap.call",
+            plugin_id="plugin_a",
+            payload=CapabilityRequestPayload(
+                capability="database.get",
+                args={"model_name": "DemoTable", "single_result": True},
+            ).model_dump(),
+        )
+
+        response = await service.handle_capability_request(request)
+
+        assert response.payload == {
+            "success": True,
+            "result": {"id": 1, "full_path": "E:\\test.png"},
+        }
+
+    @pytest.mark.asyncio
+    async def test_cap_database_success_handlers_return_raw_results(self, monkeypatch):
+        from src.plugin_runtime import integration as integration_module
+        import src.common.database.database_model as real_db_models
+        from src.services import database_service as real_database_service
+
+        class DummyModel:
+            pass
+
+        async def fake_db_get(**kwargs):
+            return [{"id": 1}]
+
+        async def fake_db_save(**kwargs):
+            return {"id": 2}
+
+        async def fake_db_delete(**kwargs):
+            return 3
+
+        async def fake_db_count(**kwargs):
+            return 4
+
+        monkeypatch.setattr(real_database_service, "db_get", fake_db_get)
+        monkeypatch.setattr(real_database_service, "db_save", fake_db_save)
+        monkeypatch.setattr(real_database_service, "db_delete", fake_db_delete)
+        monkeypatch.setattr(real_database_service, "db_count", fake_db_count)
+        monkeypatch.setattr(real_db_models, "DemoTable", DummyModel, raising=False)
+
+        manager = object.__new__(integration_module.PluginRuntimeManager)
+        base_args = {"model_name": "DemoTable"}
+
+        assert await manager._cap_database_query("plugin_a", "database.query", base_args) == [{"id": 1}]
+        assert await manager._cap_database_save(
+            "plugin_a", "database.save", {**base_args, "data": {"name": "demo"}}
+        ) == {"id": 2}
+        assert await manager._cap_database_delete(
+            "plugin_a", "database.delete", {**base_args, "filters": {"id": 2}}
+        ) == 3
+        assert await manager._cap_database_count("plugin_a", "database.count", base_args) == 4
+
     @pytest.mark.asyncio
     async def test_component_enable_rejects_ambiguous_short_name(self, monkeypatch):
         from src.plugin_runtime import integration as integration_module