Merge remote-tracking branch 'upstream/main' into cursor/retention-toggle-14743

# Conflicts:
#	apps/web/src/components/settings/StorageSettings.browser.test.tsx
6661823be6macodev00 committed on 10/21/2026, 6:27:23 AMparentsc72a3094f651cb

Checks

All checks passed
64 files changedLine totals unavailable