mirror of
https://github.com/HKUDS/nanobot.git
synced 2026-04-05 19:02:38 +00:00
Resolved 6 conflicted files: - loop.py: adopt MemoryConsolidator pattern from main, keep _isolated_memory_store - web.py, base.py, helpers.py: merge both sides' imports - pyproject.toml: keep both api and wecom optional deps - test_consolidate_offset.py: adopt main's _make_loop helper and consolidate_messages signatures - test_openai_api.py: remove tests for deleted _consolidate_memory method Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>