Resolve 83 conflicts: 10 backend, 62 frontend, 11 config/lock files. Preserve sandbox/agent/collaboration features while adopting main's UI refactorings (Dialog/AlertDialog/Popover), model provider updates, and enterprise features. Made-with: Cursor |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| account.py | ||
| app.py | ||
| app_asset.py | ||
| app_model_config.py | ||
| audio.py | ||
| base.py | ||
| chunk.py | ||
| conversation.py | ||
| dataset.py | ||
| document.py | ||
| enterprise.py | ||
| file.py | ||
| index.py | ||
| llm.py | ||
| message.py | ||
| plugin.py | ||
| workflow_service.py | ||
| workspace.py | ||