Sync upstream Pass 49 into difflabai main - #48
Merged
Merged
Conversation
Part B: add eight Brazilian label identifiers verified as true gaps on latest main (allow, term-span-free on overlay-only and full-catalog paths under signed-to assertion framing, true catalog-only isolation with explicit catalog: shippedCatalog confirms allow): Copacabana Records + Continental Records + Chantecler + RGE Discos + Tapecar (classics) + Deckdisc + Tratore + Laboratório Fantasma (modern indie/distributor, accent-folded). Skipped candidates already covered by the catalog (Som Livre via Som; Biscoito Fino via Fino; YB Music via Music; Lab 344 via Lab; Coqueiro Verde via Verde; Joia Moderna via Joia; Altafonte Brasil via Brasil; Som da Gente via Som; Fermata Records via Fermata; Boogie Naipe via Boogie; Olho Seco Records via Olho Seco; Pineapple Storm via Pineapple/Storm; Honey Bomb Records via Honey/Bomb; Hearts Bleed Blue via Hearts/Bleed/Blue; Mondo Cane via Mondo/Cane; Barclay Brasil via Brasil; Balaclava Records via Balaclava; Midsummer Madness; Natura Musical via Natura). Greensleeves/Tuff Gong stay out (catalog-hit). Non-BR held top-ups (Merge/OWSLA/Astralwerks/Counter, 88rising/Lilystars, Rimas/Casete, YBNL, Taazi/Divo/G-Series, Sonolux/Nacional) held for coherent future regions. No commonWord gating needed (Records/Discos-bigram fold covers multiword entries); no DEFAULT_ALLOWLIST collisions; short ambiguous aliases omitted (bare RGE). Part A: re-audited all 33 remaining music-irrelevant unscoped trademarks on the music path with true catalog-only isolation (explicit catalog: shippedCatalog, signed-to framing) - each still fires from the shipped catalog (Adidas, Bose, Chanel, Coca-Cola, DreamWorks, Facebook, Gucci, Instagram, iPhone, Joy-Con, LEGO, Louis Vuitton, Luma, McDonald's, Microsoft, Netflix, Nintendo Switch, Nintendo Direct, Paramount, Pepsi, Prime Video, PS5 (review), Rolex, Sony Pictures, Starbucks, Steam, Switch 2, TikTok, Unity, Universal Pictures, Warner Bros, YouTube, Gemini; AirPods is catalog-silent but stays all-media as audio gear), so left unscoped per standing rule. No overlay changes in Part A. Audio/DJ gear and music platforms/distributors/labels stay all-media. Allow-path: explicit BR-label block cases on the overlay path (incl. accent-folded Laboratorio Fantasma) plus near-miss splits and innocent boundary prompts asserted allow on both overlay and full paths. Identifiers only, never lyrics. Not legal advice. Co-authored-by: Cursor Agent <cursoragent@cursor.com>
…ai main Co-authored-by: mikkel <mikkel@255bits.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Sync upstream Pass 49 from mikkel/copyright-censor into difflabai main for the public Pages demo.
Upstream: mikkel/copyright-censor main @ b8da9e6 — "Pass 49: BR-label overlay + media-scope + allow-path (#52)" (Copacabana Records / Continental Records / Chantecler / RGE Discos / Tapecar / Deckdisc / Tratore / Laboratório Fantasma, Part A audit-only).
This PR is a pure merge (no squash/rebase): parents = difflabai main (cae09c5) + upstream mikkel main (b8da9e6), so upstream SHAs are preserved. Merge with method merge (not squash) to keep upstream SHAs intact.
Test:
npm testgreen locally — 147 pass, 0 fail.