feat: 添加适配器回调处理和成功回执消息 ID 更新逻辑

pytests/test_napcat_adapter_sdk.py

@@ -6,6 +6,7 @@ from typing import Any, Dict, List, Tuple
 
 import logging
 import sys
+from types import SimpleNamespace
 
 import pytest
 
@@ -331,6 +332,66 @@ async def test_runtime_state_reports_via_gateway_capability() -> None:
     assert gateway_capability.calls[1]["platform"] == "qq"
 
 
+@pytest.mark.asyncio
+async def test_napcat_plugin_send_result_contains_message_id_echo_callback() -> None:
+    """NapCat 插件发送成功后应显式返回消息 ID 回调数据。"""
+
+    _napcat_gateway_name, _napcat_server_config, napcat_plugin_cls, _runtime_state_cls = _load_napcat_sdk_symbols()
+    plugin = napcat_plugin_cls()
+
+    class _FakeOutboundCodec:
+        """用于测试的出站编码器替身。"""
+
+        @staticmethod
+        def build_outbound_action(message: Dict[str, Any], route: Dict[str, Any]) -> Tuple[str, Dict[str, Any]]:
+            """返回固定动作与参数。"""
+
+            del message
+            del route
+            return "send_msg", {"message": "hello"}
+
+    class _FakeTransport:
+        """用于测试的传输层替身。"""
+
+        @staticmethod
+        async def call_action(action_name: str, params: Dict[str, Any]) -> Dict[str, Any]:
+            """返回带平台消息 ID 的成功响应。"""
+
+            del action_name
+            del params
+            return {
+                "status": "ok",
+                "data": {
+                    "message_id": "platform-message-id",
+                },
+            }
+
+    plugin._require_runtime_bundle = lambda: SimpleNamespace(  # type: ignore[method-assign]
+        outbound_codec=_FakeOutboundCodec(),
+        transport=_FakeTransport(),
+    )
+
+    result = await plugin.handle_napcat_gateway(
+        message={"message_id": "internal-message-id"},
+        route={},
+    )
+
+    assert result["success"] is True
+    assert result["external_message_id"] == "platform-message-id"
+    assert result["metadata"]["adapter_callbacks"] == [
+        {
+            "name": "message_id_echo",
+            "payload": {
+                "content": {
+                    "type": "echo",
+                    "echo": "internal-message-id",
+                    "actual_id": "platform-message-id",
+                }
+            },
+        }
+    ]
+
+
 @pytest.mark.asyncio
 async def test_inbound_codec_parses_forward_nodes_from_legacy_message_field() -> None:
     """入站编解码器应兼容旧版 ``sender + message`` 转发节点结构。"""

pytests/test_send_service.py

@@ -29,6 +29,7 @@ class _FakePlatformIOManager:
         self.sent_messages.append(
             {
                 "message": message,
+                "message_id_before_send": str(getattr(message, "message_id", "") or ""),
                 "route_key": route_key,
                 "metadata": metadata,
             }
@@ -67,16 +68,43 @@ def test_inherit_platform_io_route_metadata_falls_back_to_bot_account(
 
 @pytest.mark.asyncio
 async def test_text_to_stream_delegates_to_platform_io(monkeypatch: pytest.MonkeyPatch) -> None:
+    import src.common.message_server.api as message_server_api
+
     fake_manager = _FakePlatformIOManager(
         delivery_batch=SimpleNamespace(
             has_success=True,
-            sent_receipts=[SimpleNamespace(driver_id="plugin.qq.sender")],
+            sent_receipts=[
+                SimpleNamespace(
+                    driver_id="plugin.qq.sender",
+                    external_message_id="real-message-id",
+                    metadata={
+                        "adapter_callbacks": [
+                            {
+                                "name": "message_id_echo",
+                                "payload": {
+                                    "content": {
+                                        "type": "echo",
+                                        "echo": "send_api_test",
+                                        "actual_id": "real-message-id",
+                                    }
+                                },
+                            }
+                        ]
+                    },
+                )
+            ],
             failed_receipts=[],
             route_key=SimpleNamespace(platform="qq"),
         )
     )
+    callback_payloads: List[Dict[str, Any]] = []
     stored_messages: List[Any] = []
 
+    async def fake_echo_handler(payload: Dict[str, Any]) -> None:
+        """记录发送成功后的消息 ID 回调。"""
+
+        callback_payloads.append(payload)
+
     monkeypatch.setattr(send_service, "get_platform_io_manager", lambda: fake_manager)
     monkeypatch.setattr(send_service, "get_bot_account", lambda platform: "bot-qq")
     monkeypatch.setattr(
@@ -89,6 +117,11 @@ async def test_text_to_stream_delegates_to_platform_io(monkeypatch: pytest.Monke
         "store_message_to_db",
         lambda message: stored_messages.append(message),
     )
+    monkeypatch.setattr(
+        message_server_api,
+        "global_api",
+        SimpleNamespace(_custom_message_handlers={"message_id_echo": fake_echo_handler}),
+    )
 
     result = await send_service.text_to_stream(text="你好", stream_id="test-session")
 
@@ -97,6 +130,16 @@ async def test_text_to_stream_delegates_to_platform_io(monkeypatch: pytest.Monke
     assert len(fake_manager.sent_messages) == 1
     assert fake_manager.sent_messages[0]["metadata"] == {"show_log": False}
     assert len(stored_messages) == 1
+    assert stored_messages[0].message_id == "real-message-id"
+    assert callback_payloads == [
+        {
+            "content": {
+                "type": "echo",
+                "echo": "send_api_test",
+                "actual_id": "real-message-id",
+            }
+        }
+    ]
 
 
 @pytest.mark.asyncio