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 | ||
| _workflow_exc.py | ||
| account.py | ||
| api_based_extension.py | ||
| app_asset.py | ||
| base.py | ||
| comment.py | ||
| dataset.py | ||
| engine.py | ||
| enums.py | ||
| execution_extra_content.py | ||
| human_input.py | ||
| model.py | ||
| oauth.py | ||
| provider.py | ||
| provider_ids.py | ||
| sandbox.py | ||
| source.py | ||
| task.py | ||
| tools.py | ||
| trigger.py | ||
| types.py | ||
| web.py | ||
| workflow.py | ||
| workflow_features.py | ||