openhands 3bbffa1769 Merge branch 'main' into feature/cli-conversation-list
Resolved merge conflicts by:
- Keeping main's versions of files that were deleted or moved
- Re-applying PR changes to agent_chat.py and tui.py
- Maintaining all PR functionality (conversation listing, loading, and completion)

PR files preserved:
- openhands-cli/openhands_cli/conversation_manager.py
- openhands-cli/tests/test_conversation_manager.py

Modified files with PR changes re-applied:
- openhands-cli/openhands_cli/agent_chat.py
- openhands-cli/openhands_cli/tui/tui.py

Co-authored-by: openhands <openhands@all-hands.dev>
2025-11-13 16:24:44 +00:00
..
2025-06-23 14:21:47 -04:00
2025-11-05 19:56:34 +01:00