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 |
||
|---|---|---|
| .. | ||
| console | ||
| base.ts | ||
| marketplace.ts | ||
| router.ts | ||