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 |
||
|---|---|---|
| .. | ||
| api_tools_manage_service.py | ||
| builtin_tools_manage_service.py | ||
| mcp_tools_manage_service.py | ||
| tool_labels_service.py | ||
| tools_manage_service.py | ||
| tools_transform_service.py | ||
| workflow_tools_manage_service.py | ||