mirror of
https://github.com/simstudioai/sim.git
synced 2026-11-05 00:02:28 +08:00
Resolve conflicts as unions preserving both sides: - blocks/registry.ts: keep this branch's BlockMeta imports/registry and add staging's new EnrichmentBlock and RB2BBlock. - ee/access-control: take staging's ProviderRow (per-model denylist feature). Make the merged catalog consistent with this branch's BlockMeta model: - Add EnrichmentBlockMeta + RB2BBlockMeta (valid tags + >=7 catalog templates each), register them, and drop the new blocks' config-level `tags`. - Regenerate integrations.json + docs canonically: enrichment now has a catalog entry and rb2b uses the singular integrationType (no stale plural).