mirror of
https://github.com/hanzoai/dev.git
synced 2026-10-25 03:32:32 +00:00
Successfully merged all upstream changes while preserving our custom functionality: - Kept our browser integration and screenshot features - Preserved agent tracking and multi-agent support - Maintained our live ring widget and custom UI components - Integrated upstream's streaming improvements and new conversation manager - Combined both versions' protocol updates and event handling All conflicts resolved with preference for our functionality where there were genuine differences.