Skip to content

Merge latest main into cloud sync branch#57

Draft
SunkenInTime wants to merge 21 commits into
mainfrom
cursor/main-branch-synchronization-3324
Draft

Merge latest main into cloud sync branch#57
SunkenInTime wants to merge 21 commits into
mainfrom
cursor/main-branch-synchronization-3324

Conversation

@SunkenInTime
Copy link
Copy Markdown
Owner

@SunkenInTime SunkenInTime commented Mar 21, 2026

Summary

  • merge the existing cloud collaboration/auth stack into the latest main branch state
  • reconcile Flutter app wiring so newer desktop UX and persistence features still build with Convex + Supabase enabled
  • fix cloud auth/query hydration so the desktop library renders Convex-backed folders and strategies reliably
  • remove duplicate cloud strategy opening on create so freshly created cloud strategies enter the editor cleanly

Testing

  • fvm flutter pub get
  • npm install
  • fvm flutter build linux --debug
  • fvm flutter test test/collab_sync_models_test.dart
  • fvm flutter test test/strategy_folder_import_test.dart test/update_checker_test.dart
  • fvm flutter analyze (4 pre-existing test-only infos remain)
  • manual desktop verification with signed-in test account against npx convex dev

Manual verification highlights

  • email/password sign-in succeeds with the provided test account
  • Convex backend stores cloud folders and strategies for the signed-in user
  • cloud library renders populated root folders/strategies in the desktop app
  • opening an existing cloud strategy hydrates the correct title and rendered map in the editor

Notes

  • the full Flutter suite still retains pre-existing failures outside this cloud flow area (strategy_integrity_test, resizable_square_ability_test, windows_desktop_update_controller_test)
Open in Web Open in Cursor 

SunkenInTime and others added 12 commits March 4, 2026 16:09
- Added new dependencies: app_links, convex_flutter, supabase, and win32_registry.
- Implemented deep link handling in main.dart to manage incoming links and initialize services.
- Updated pubspec.yaml and pubspec.lock to reflect new package versions and dependencies.
- Registered necessary plugins for app links and other functionalities in platform-specific files.
- Added user management module to the API definition.
- Integrated authentication provider in main.dart for handling authentication callbacks.
- Updated SettingsTab to display user account information and provide sign-in/sign-out functionality with Discord.
- Improved UI to reflect authentication state and error messages.
Co-authored-by: Codex <noreply@openai.com>
Co-authored-by: Dara Adedeji <SunkenInTime@users.noreply.github.com>
Co-authored-by: Dara Adedeji <SunkenInTime@users.noreply.github.com>
Co-authored-by: Dara Adedeji <SunkenInTime@users.noreply.github.com>
Co-authored-by: Dara Adedeji <SunkenInTime@users.noreply.github.com>
@vercel
Copy link
Copy Markdown

vercel Bot commented Mar 21, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
icarus Error Error Mar 21, 2026 8:06pm

cursoragent and others added 9 commits March 21, 2026 20:57
Co-authored-by: Dara Adedeji <SunkenInTime@users.noreply.github.com>
Co-authored-by: Dara Adedeji <SunkenInTime@users.noreply.github.com>
Co-authored-by: Dara Adedeji <SunkenInTime@users.noreply.github.com>
Co-authored-by: Dara Adedeji <SunkenInTime@users.noreply.github.com>
- Add shared Convex skills under `.agent`, `.agents`, `.claude`, and `.windsurf`
- Include skill docs, prompts, icons, and reference guides
- Move strategy data, state, import/export, and migrations into dedicated files
- Update callers and tests to use the new strategy module
- Move active page hydration and transition handling into the page session provider
- Switch strategy identity usage to `strategyId` and reset session state on clear
- Update related widgets, guards, and tests for the new page/session flow
- Sync folder icon/color fields through Convex and Flutter
- Add cloud strategy roles, page actions, and folder navigation parity
- Enable exporting cloud strategies from remote snapshots
- Expand Convex skill references and migration guidance
- Add library workspace provider and auth test coverage
- Update auth and strategy providers for workspace behavior
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants