merge: resolve PR #1963 conflicts with main

2026-03-14 14:00:00 +00:00
parent 670d2a6ff8 37b994202d
commit a4f6b7d978
38 changed files with 1650 additions and 307 deletions
--- a/tests/test_feishu_reply.py
+++ b/tests/test_feishu_reply.py
@@ -8,8 +8,7 @@ import pytest

 from nanobot.bus.events import OutboundMessage
 from nanobot.bus.queue import MessageBus
-from nanobot.channels.feishu import FeishuChannel
-from nanobot.config.schema import FeishuConfig
+from nanobot.channels.feishu import FeishuChannel, FeishuConfig


 # ---------------------------------------------------------------------------