# Merge remote-tracking branch 'origin/main' into codex/reconcile-main-into-cloud · dara/icarus

[View on GitCafe](https://git.cafe/dara/icarus/commit/3b044f4cb5497f76069e7447d6accd6785360dc7)

Repository: [dara/icarus](https://git.cafe/dara/icarus)

Visibility: public

Requested revision: 3b044f4cb5497f76069e7447d6accd6785360dc7

Requested commit: 3b044f4cb5497f76069e7447d6accd6785360dc7

Commit: 3b044f4cb5497f76069e7447d6accd6785360dc7

Tree: dde23ee18319d7d789e2673bea8535d20b4b7b0e

Author: Dara Adedeji

Committer: Dara Adedeji

## Message

```
Merge remote-tracking branch 'origin/main' into codex/reconcile-main-into-cloud

# Conflicts:
#	AGENTS.md
#	lib/providers/folder_provider.dart
#	lib/providers/strategy_provider.dart
#	lib/widgets/folder_pill.dart
#	test/agent_dragable_lineup_state_test.dart

```

## Parents

- [c0f451788472d2cbefe907699f502c4c232dbe24](https://git.cafe/dara/icarus/commit/c0f451788472d2cbefe907699f502c4c232dbe24?format=markdown)

- [c7a73163ecbeadfa1a4536f9568e75e17f76efd2](https://git.cafe/dara/icarus/commit/c7a73163ecbeadfa1a4536f9568e75e17f76efd2?format=markdown)

[Source at this commit](https://git.cafe/dara/icarus/tree/3b044f4cb5497f76069e7447d6accd6785360dc7?format=markdown)