Merge origin/main into claude/refactoring-opportunities-UHFCz-local
Resolve import conflict in admin.ts:
- Keep themes, themePolicies imports added by main (ATB-57 theme API)
- Keep inArray from PR (replaces pg-core alias for SQLite compat)
- Keep or from main (used by theme routes)
- Drop alias import from drizzle-orm/pg-core (removed by this PR)
Also mark refactoring-opportunities plan item #1 as complete.