@nodaro/prompts 1.14.0 → 1.16.0

package/src/picker-catalogs.ts

@@ -87,6 +87,7 @@ import { INSTRUMENTS, PRODUCTION_STYLES, VOCAL_PRESENCE, SINGING_STYLES } from "
 import { VOICE_AGES, VOICE_GENDERS, VOICE_LANGUAGES, VOICE_ACCENTS, VOICE_TIMBRES } from "./voice-character.js"
 import { VOICE_PACES, VOICE_EMOTIONS, VOICE_ARCHETYPES } from "./voice-delivery.js"
 import { composePickerCatalogs, getRegisteredCatalogPacks, catalogPacksVersion } from "./catalog-packs.js"
+import { setComposedCatalogResolver } from "./catalog-overlay.js"
 import { deriveTerm, resolveTerm } from "./term.js"
 
 export interface PickerOption {
@@ -96,6 +97,8 @@ export interface PickerOption {
   /** The group id (matches `categoryOrder` / `categoryLabels`). */
   readonly category?: string
   readonly promptHint: string
+  /** W1-a: see Person.adultOnly. Carried verbatim through packs. */
+  readonly adultOnly?: true
   /**
    * The short professional term this id injects in COMPACT hint mode ("whip
    * pan left" where `promptHint` is the full mechanism sentence). Always
@@ -156,6 +159,8 @@ interface BaseCatalogEntry {
   readonly promptHint: string
   /** Optional authored compact term (see `term.ts` for the convention). */
   readonly term?: string
+  /** W1-a: see Person.adultOnly. Propagated verbatim into the flattened option. */
+  readonly adultOnly?: true
 }
 
 /**
@@ -183,6 +188,7 @@ function toOptions<T extends BaseCatalogEntry>(
     }
     if (e.description) opt.description = e.description
     if (categoryField) opt.category = e[categoryField] as unknown as string
+    if (e.adultOnly) opt.adultOnly = true
     return opt as PickerOption
   })
 }
@@ -836,6 +842,11 @@ export function getPickerCatalog(nodeTypeOrCatalogId: string): PickerCatalog | u
   )
 }
 
+// Install the composed view into the per-catalog getters (catalog-overlay.ts).
+// Done here, at the one module that already imports every catalog, so the
+// catalog modules themselves never import upward.
+setComposedCatalogResolver(getPickerCatalog)
+
 export function listPickerCatalogs(): readonly PickerCatalog[] {
   return getRegisteredPickerCatalogs()
 }

package/src/pose.ts

@@ -21,6 +21,7 @@
  */
 
 import { resolveTerm, type PickerHintMode } from "./term.js"
+import { overlayEntry } from "./catalog-overlay.js"
 
 export type PoseCategory =
   | "standing"
@@ -39,6 +40,16 @@ export interface Pose {
   readonly category: PoseCategory
   readonly description: string
   readonly promptHint: string
+  /**
+   * W1-a minor-age floor (spec 2026-09-01 §3.3). `true` marks an entry whose
+   * hint describes body exposure, sheer/wet clothing, swimwear/lingerie, a
+   * seductive expression or gaze, or a body-placed tattoo. The fragment
+   * collectors DROP flagged entries for a minor subject (`isMinorAge`), the
+   * picker hides their tiles, the analyzer never emits them, and the backend
+   * policy strips their wording from free text. Hand-curated; the
+   * `adult-only-ratchet` test only ratchets. Never set on neutral defaults.
+   */
+  readonly adultOnly?: true
   /**
    * Compact professional term injected instead of `promptHint` in compact hint
    * mode. Authored only where the lowercased label is not what a photographer
@@ -68,8 +79,8 @@ export const POSES: ReadonlyArray<Pose> = [
   { id: "cross-legged",       label: "Cross-legged",       category: "seated",   description: "Seated cross-legged on floor", promptHint: "sitting cross-legged on the ground", term: "sitting cross-legged" },
   { id: "kneeling",           label: "Kneeling",           category: "seated",   description: "Kneeling on the ground",      promptHint: "kneeling on one or both knees" },
   { id: "crouching",          label: "Crouching",          category: "seated",   description: "Crouched low",                promptHint: "crouched low with knees bent" },
-  { id: "lounging",           label: "Lounging",           category: "seated",   description: "Reclined, relaxed sitting",   promptHint: "lounging in a relaxed, reclined position" },
-  { id: "sitting-edge-of-bed", label: "Sitting on Edge of Bed", category: "seated", description: "Perched on the edge of a bed", promptHint: "perched on the edge of a bed, hands resting on the mattress", term: "sitting on the edge of a bed" },
+  { id: "lounging",           label: "Lounging",           category: "seated",   description: "Reclined, relaxed sitting",   promptHint: "lounging in a relaxed, reclined position" , adultOnly: true },
+  { id: "sitting-edge-of-bed", label: "Sitting on Edge of Bed", category: "seated", description: "Perched on the edge of a bed", promptHint: "perched on the edge of a bed, hands resting on the mattress", term: "sitting on the edge of a bed" , adultOnly: true },
   { id: "chair-arm-drape",    label: "Legs Draped Over Chair", category: "seated", description: "Legs draped over chair arm", promptHint: "sitting sideways in a chair with legs draped casually over one arm", term: "legs draped over the chair arm" },
   { id: "elbow-propped",      label: "Cheek on Propped Elbow", category: "seated", description: "Cheek resting on a propped elbow", promptHint: "seated with cheek resting against a propped-up elbow, contemplative", term: "cheek resting on a propped elbow" },
   { id: "lying-on-stomach-reading", label: "Lying Prone Reading", category: "seated", description: "Lying prone, propped on elbows reading", promptHint: "lying on the stomach, propped up on elbows while reading", term: "lying prone propped on elbows, reading" },
@@ -94,14 +105,14 @@ export const POSES: ReadonlyArray<Pose> = [
   { id: "throwing",           label: "Throwing",           category: "action",   description: "Mid-throw motion",            promptHint: "caught mid-throw, body coiled and releasing", term: "caught mid-throw" },
   { id: "leaping",            label: "Leaping",            category: "action",   description: "Leaping forward dynamically", promptHint: "leaping forward dynamically with body extended" },
   { id: "dramatic-action",    label: "Dramatic Action",    category: "action",   description: "Exaggerated action pose",     promptHint: "in a dramatic, exaggerated action pose full of motion", term: "dramatic exaggerated action pose" },
-  { id: "biting-lip",         label: "Biting Lip",         category: "action",   description: "Slight playful lip-bite",     promptHint: "biting the lower lip with a subtle playful expression", term: "biting the lower lip" },
+  { id: "biting-lip",         label: "Biting Lip",         category: "action",   description: "Slight playful lip-bite",     promptHint: "lightly biting the lower lip, a subtle playful expression", term: "biting lower lip" , adultOnly: true },
   { id: "mid-laugh",          label: "Mid-Laugh",          category: "action",   description: "Caught mid-laugh, head back", promptHint: "caught mid-laugh with head tipped back, eyes crinkled" },
   { id: "pointing-at-camera", label: "Pointing at Camera", category: "action",   description: "Pointing directly at camera", promptHint: "pointing one finger directly at the camera, arm extended", term: "pointing directly at the camera" },
   { id: "tongue-out",         label: "Sticking Tongue Out", category: "action",  description: "Playful tongue-out expression", promptHint: "sticking the tongue out playfully" },
   { id: "thinking",           label: "Thinking",           category: "action",   description: "Hand on chin, contemplative", promptHint: "in a thinking pose with hand on chin, gaze contemplative", term: "thinking pose, hand on chin" },
 
   // -------------------- Resting --------------------
-  { id: "lying-down",         label: "Lying Down",         category: "resting",  description: "Lying flat",                  promptHint: "lying down flat, relaxed" },
+  { id: "lying-down",         label: "Lying Down",         category: "resting",  description: "Lying flat",                  promptHint: "lying down flat, relaxed" , adultOnly: true },
   { id: "sleeping",           label: "Sleeping",           category: "resting",  description: "Eyes closed, sleeping",       promptHint: "sleeping peacefully with eyes closed" },
   { id: "hugging",            label: "Hugging",            category: "resting",  description: "Embracing another",           promptHint: "hugging or embracing another person" },
   { id: "looking-away",       label: "Looking Away",       category: "resting",  description: "Head turned, looking away",   promptHint: "head turned, looking off away from the camera" },
@@ -125,7 +136,7 @@ export const POSES: ReadonlyArray<Pose> = [
   { id: "leaning-back",            label: "Leaning Back",            category: "body-lean",     description: "Torso leaning back slightly",         promptHint: "with the torso leaning back at a slight backward angle", term: "torso leaning slightly back" },
   { id: "leaning-forward",         label: "Leaning Forward",         category: "body-lean",     description: "Torso leaning toward camera",         promptHint: "with the torso leaning forward toward the camera", term: "torso leaning forward" },
   { id: "body-lean-contrapposto",  label: "Contrapposto",            category: "body-lean",     description: "Weight on one leg, hip pushed out",   promptHint: "with the weight on one leg and one hip pushed out, classical contrapposto", term: "contrapposto, hip pushed out" },
-  { id: "arched-back",             label: "Arched Back",             category: "body-lean",     description: "Back gently arched, chest forward",   promptHint: "with the back gently arched, chest forward" },
+  { id: "arched-back",             label: "Arched Back",             category: "body-lean",     description: "Back gently arched, chest forward",   promptHint: "with the back gently arched, chest forward" , adultOnly: true },
   { id: "shoulder-rolled-forward", label: "Shoulder Rolled Forward", category: "body-lean",     description: "One shoulder rolled forward",         promptHint: "with one shoulder rolled forward, asymmetric stance", term: "one shoulder rolled forward" },
 
   // -------------------- Head Tilt --------------------
@@ -155,7 +166,7 @@ const poseById = new Map<string, Pose>(POSES.map((p) => [p.id, p]))
 
 export function getPose(id: string | undefined | null): Pose | undefined {
   if (!id) return undefined
-  return poseById.get(id)
+  return overlayEntry("pose", id, poseById.get(id))
 }
 
 export function getPoseLabel(id: string | undefined | null, fallback?: string): string {

package/src/post-process-effects.ts

@@ -22,6 +22,7 @@
  */
 
 import { resolveTerm, type PickerHintMode } from "./term.js"
+import { overlayEntry } from "./catalog-overlay.js"
 
 export interface PostProcessEffect {
   readonly id: string
@@ -65,7 +66,7 @@ const postProcessById = new Map<string, PostProcessEffect>(
 
 export function getPostProcessEffect(id: string | undefined | null): PostProcessEffect | undefined {
   if (!id) return undefined
-  return postProcessById.get(id)
+  return overlayEntry("post-process-effects", id, postProcessById.get(id))
 }
 
 export function getPostProcessEffectLabel(id: string | undefined | null, fallback?: string): string {

package/src/prompt-builder.ts

@@ -6,7 +6,7 @@
 
 import { resolveTemplate, applyTemplate } from "./prompt-templates.js"
 import { NATIVE_NEGATIVE_PROMPT_MODELS, MODELS_WITH_REFERENCE_IMAGE_SUPPORT, imageReferenceLimit, getMaxImagePromptChars, getMaxNegativePromptChars } from "@nodaro/shared"
-import { getStylePromptHint } from "./style.js"
+import { getStylePromptHint, isDeniedStyleId } from "./style.js"
 import {
   STYLE_SECTION_GAP,
   STYLE_SECTION_HEADER,
@@ -2812,7 +2812,7 @@ function buildImagePromptInternal(config: BuildImagePromptConfig, marks?: Assemb
     }
 
     const styleText = style?.trim()
-    const styleLine = styleText ? `Style: ${getStylePromptHint(styleText) || styleText}` : ""
+    const styleLine = styleText && !isDeniedStyleId(styleText) ? `Style: ${getStylePromptHint(styleText) || styleText}` : ""
 
     const negPrompt = negativePrompt?.trim()
     let nativeNegativePrompt: string | undefined
@@ -2937,7 +2937,7 @@ function buildImagePromptInternal(config: BuildImagePromptConfig, marks?: Assemb
   // the richer promptHint; otherwise fall back to the raw text (covers custom
   // free-text styles that don't match a preset).
   const styleText = style?.trim()
-  const styleLine = styleText ? `Style: ${getStylePromptHint(styleText) || styleText}` : ""
+  const styleLine = styleText && !isDeniedStyleId(styleText) ? `Style: ${getStylePromptHint(styleText) || styleText}` : ""
 
   // Handle negative prompt: native support vs prompt-appended
   const negPrompt = negativePrompt?.trim()

package/src/render-quality.ts

@@ -24,6 +24,7 @@
  */
 
 import { resolveTerm } from "./term.js"
+import { overlayEntry } from "./catalog-overlay.js"
 
 export interface RenderQuality {
   readonly id: string
@@ -85,7 +86,7 @@ const renderQualityById = new Map<string, RenderQuality>(
 
 export function getRenderQuality(id: string | undefined | null): RenderQuality | undefined {
   if (!id) return undefined
-  return renderQualityById.get(id)
+  return overlayEntry("render-quality", id, renderQualityById.get(id))
 }
 
 export function getRenderQualityLabel(id: string | undefined | null, fallback?: string): string {

package/src/setting.ts

@@ -20,6 +20,7 @@
  */
 
 import { resolveTerm } from "./term.js"
+import { overlayEntry } from "./catalog-overlay.js"
 
 export type SettingCategory = "indoor" | "urban" | "nature" | "fantastical"
 
@@ -118,7 +119,7 @@ const settingById = new Map<string, Setting>(SETTINGS.map((s) => [s.id, s]))
 
 export function getSetting(id: string | undefined | null): Setting | undefined {
   if (!id) return undefined
-  return settingById.get(id)
+  return overlayEntry("setting", id, settingById.get(id))
 }
 
 export function getSettingLabel(id: string | undefined | null, fallback?: string): string {

package/src/shared-catalog-overlay.ts

@@ -0,0 +1,83 @@
+import { getAnimalPromptHint, getAnimalTerm, getVehicle, getWeapon, getFurniture } from "@nodaro/shared"
+import { composedHas, composedOption } from "./catalog-overlay.js"
+import { deriveTerm } from "./term.js"
+
+/**
+ * The four object-entity catalogs — animals, vehicles, weapons, furniture —
+ * are OWNED by `@nodaro/shared`, which cannot depend on this package, so
+ * their getters cannot carry the `overlayEntry` the other 34 catalogs do.
+ * These wrappers are the overlay for them, and EVERY prompt-text read of
+ * those catalogs goes through here: the parameter-node dispatcher and the
+ * subject fold both. Two call sites resolving the same id to different text
+ * — one curated, one stock — is exactly what a second, un-overlaid path
+ * produced during review.
+ *
+ * Precedence per id, same four outcomes as catalog-overlay.ts:
+ *   - no pack on the catalog       → the stock getter, untouched
+ *   - denied / not in the pack     → ""  (nothing reaches the prompt)
+ *   - composed option present      → ITS promptHint / term. A pack author
+ *     who rewrote an entry wrote the hint they want injected; rebuilding it
+ *     from label + description would discard that
+ *   - pack-added id (no stock row) → the composed option (covered by the
+ *     branch above — the stock getter is never consulted when a pack exists)
+ */
+
+export function curatedAnimalPromptHint(id: string): string {
+  if (!id) return ""
+  if (!composedHas("animals", id)) return ""
+  return composedOption("animals", id)?.promptHint ?? getAnimalPromptHint(id)
+}
+export function curatedAnimalTerm(id: string): string {
+  if (!id) return ""
+  if (!composedHas("animals", id)) return ""
+  return composedOption("animals", id)?.term ?? getAnimalTerm(id)
+}
+
+type ObjectEntity = { readonly label: string; readonly description: string }
+
+function objectEntityText(
+  catalogId: string,
+  id: string,
+  stock: ObjectEntity | undefined,
+  stockHint: (e: ObjectEntity) => string,
+  stockTerm: (e: ObjectEntity) => string,
+): { readonly hint: string; readonly term: string } {
+  if (!id || !composedHas(catalogId, id)) return { hint: "", term: "" }
+  const composed = composedOption(catalogId, id)
+  if (composed) return { hint: composed.promptHint, term: composed.term }
+  if (!stock) return { hint: "", term: "" }
+  return { hint: stockHint(stock), term: stockTerm(stock) }
+}
+
+/**
+ * The compact fragment for an OBJECT-entity entry (animal / vehicle / weapon /
+ * furniture). Those catalogs carry no `promptHint` of their own — the full
+ * fragment is synthesized as "featuring a {label}, {description}" — so the
+ * compact form is the authored `term` when there is one and the derived label
+ * otherwise (a concrete object's label IS its trade term). The framing verb
+ * ("featuring a", "with a") belongs to the HINT; a term drops bare into
+ * whatever sentence the consumer is building, and "the object is in the scene"
+ * is precisely what these four nodes mean.
+ *
+ * The fallback MUST be `deriveTerm` and not a bare `toLowerCase()`: it is the
+ * same fallback `objectOptions` uses to build the `/v1/catalogs` projection,
+ * so a parenthetical label ("Rifle (bolt-action)") must strip identically here
+ * or the injected fragment and the projected term would disagree.
+ *
+ * `term` is read structurally because it is being added to the shared entity
+ * interfaces separately; this stays correct before and after that lands.
+ */
+
+function objectEntityTerm(entry: { readonly label: string }): string {
+  return (entry as { term?: string }).term ?? deriveTerm(entry.label)
+}
+
+export function curatedVehicleText(id: string) {
+  return objectEntityText("vehicles", id, getVehicle(id), (e) => `featuring a ${e.label.toLowerCase()}, ${e.description}`, objectEntityTerm)
+}
+export function curatedWeaponText(id: string) {
+  return objectEntityText("weapons", id, getWeapon(id), (e) => `with a ${e.label.toLowerCase()}, ${e.description}`, objectEntityTerm)
+}
+export function curatedFurnitureText(id: string) {
+  return objectEntityText("furniture", id, getFurniture(id), (e) => `including a ${e.label.toLowerCase()}, ${e.description}`, objectEntityTerm)
+}

package/src/style.ts

@@ -21,6 +21,7 @@
  */
 
 import { resolveTerm } from "./term.js"
+import { overlayEntry } from "./catalog-overlay.js"
 
 export interface Style {
   readonly id: string
@@ -96,7 +97,21 @@ const styleById = new Map<string, Style>(STYLES.map((s) => [s.id, s]))
 
 export function getStyle(id: string | undefined | null): Style | undefined {
   if (!id) return undefined
-  return styleById.get(id)
+  return overlayEntry("style", id, styleById.get(id))
+}
+
+/**
+ * The inline `style` field on an image node is id-OR-free-text: a catalog id
+ * resolves to its hint, anything else is the user's own words and is folded
+ * verbatim. That fallback has a hole on a curated deployment — a style id the
+ * pack REMOVED resolves to nothing, so the fold would treat it as prose and
+ * ship the raw id. This tells the fold apart: true for an id the stock
+ * catalog knows but this deployment does not offer. Such a value is neither
+ * a hint nor prose; it is dropped.
+ */
+export function isDeniedStyleId(value: string | undefined | null): boolean {
+  if (!value) return false
+  return styleById.has(value) && getStyle(value) === undefined
 }
 
 export function getStyleLabel(id: string | undefined | null, fallback?: string): string {

package/src/styling.ts

@@ -47,6 +47,15 @@
  */
 
 import { resolveTerm, type PickerHintMode } from "./term.js"
+// W1-a minor-age floor: `age-signal.ts` is an import-free leaf (no runtime
+// deps at all), so this import is cycle-safe unconditionally — unlike
+// `age-floor.js`, which pulls in the catalog funnel (`person-packs.js` /
+// `picker-catalogs.js`) and would reopen the person → age-floor →
+// picker-catalogs load-time cycle if imported from here.
+import { isMinorAge } from "./age-signal.js"
+// Same discipline: catalog-overlay.ts imports only the pack registry, never
+// the catalog funnel, so this is cycle-safe from every catalog module.
+import { overlayEntry } from "./catalog-overlay.js"
 
 export type StylingDimension =
   | "makeup"
@@ -73,6 +82,16 @@ export interface Styling {
   readonly dimension: StylingDimension
   readonly description: string
   readonly promptHint: string
+  /**
+   * W1-a minor-age floor (spec 2026-09-01 §3.3). `true` marks an entry whose
+   * hint describes body exposure, sheer/wet clothing, swimwear/lingerie, a
+   * seductive expression or gaze, or a body-placed tattoo. The fragment
+   * collectors DROP flagged entries for a minor subject (`isMinorAge`), the
+   * picker hides their tiles, the analyzer never emits them, and the backend
+   * policy strips their wording from free text. Hand-curated; the
+   * `adult-only-ratchet` test only ratchets. Never set on neutral defaults.
+   */
+  readonly adultOnly?: true
   /**
    * Compact professional term for hint-compact mode (see `term.ts`).
    *
@@ -220,14 +239,14 @@ export const STYLINGS: ReadonlyArray<Styling> = [
   { id: "jewelry-pearl",      label: "Pearl",      dimension: "jewelry", description: "Pearl necklace / earrings", promptHint: "wearing a pearl necklace and pearl earrings", term: "pearl jewelry" },
   { id: "jewelry-chunky",     label: "Chunky",     dimension: "jewelry", description: "Chunky chains and rings",   promptHint: "wearing chunky chains and oversized rings", term: "chunky chains and rings" },
   { id: "jewelry-smart-watch", label: "Smart Watch", dimension: "jewelry", description: "Modern smart watch on wrist", promptHint: "wearing a modern smart watch on the wrist with a sleek digital face and silicone band" },
-  { id: "jewelry-choker-leather", label: "Leather Choker", dimension: "jewelry", description: "Black leather choker close to throat", promptHint: "wearing a black leather choker fitted close around the throat" },
-  { id: "jewelry-choker-velvet", label: "Velvet Choker", dimension: "jewelry", description: "Velvet ribbon choker, dressy and vintage", promptHint: "wearing a velvet ribbon choker around the throat, a dressy vintage touch with a small pendant at the front" },
-  { id: "jewelry-choker-chain", label: "Chain Choker", dimension: "jewelry", description: "Thin metal-chain choker", promptHint: "wearing a thin metal-chain choker tight around the throat" },
+  { id: "jewelry-choker-leather", label: "Leather Choker", dimension: "jewelry", description: "Black leather choker close to throat", promptHint: "wearing a black leather choker fitted close around the throat" , adultOnly: true },
+  { id: "jewelry-choker-velvet", label: "Velvet Choker", dimension: "jewelry", description: "Velvet ribbon choker, dressy and vintage", promptHint: "wearing a velvet ribbon choker around the throat, a dressy vintage touch with a small pendant at the front" , adultOnly: true },
+  { id: "jewelry-choker-chain", label: "Chain Choker", dimension: "jewelry", description: "Thin metal-chain choker", promptHint: "wearing a thin metal-chain choker tight around the throat" , adultOnly: true },
   { id: "jewelry-stud-earrings", label: "Stud Earrings", dimension: "jewelry", description: "Small simple studs", promptHint: "wearing small simple stud earrings" },
   { id: "jewelry-hoop-earrings", label: "Hoop Earrings", dimension: "jewelry", description: "Gold or silver hoops", promptHint: "wearing gold or silver hoop earrings" },
   { id: "jewelry-ear-cuff", label: "Ear Cuff", dimension: "jewelry", description: "Sculptural cuff climbing the cartilage", promptHint: "wearing a sculptural ear cuff climbing the cartilage of one ear" },
   { id: "jewelry-septum-ring", label: "Septum Ring", dimension: "jewelry", description: "Septum nose ring", promptHint: "wearing a septum nose ring through the center of the nose" },
-  { id: "jewelry-body-chain", label: "Body Chain", dimension: "jewelry", description: "Thin metallic chain across torso", promptHint: "wearing a thin metallic body chain draped across the torso" },
+  { id: "jewelry-body-chain", label: "Body Chain", dimension: "jewelry", description: "Thin metallic chain across torso", promptHint: "wearing a thin metallic body chain draped across the torso" , adultOnly: true },
 
   // -------------------- Nails --------------------
   { id: "nails-polished",     label: "Polished",     dimension: "nails", description: "Clear or nude polished nails", promptHint: "with polished nude nails", term: "polished nude nails" },
@@ -263,10 +282,10 @@ export const STYLINGS: ReadonlyArray<Styling> = [
   { id: "fabric-chiffon",  label: "Chiffon",  dimension: "fabric", description: "Sheer flowing chiffon",         promptHint: "wearing sheer chiffon with a lightweight floating drape and soft translucent layers" },
   { id: "fabric-fur",      label: "Fur",      dimension: "fabric", description: "Thick plush fur",               promptHint: "wearing thick plush fur with long dense strands and natural variation", term: "fur garment" },
   { id: "fabric-sequins",  label: "Sequins",  dimension: "fabric", description: "Sparkling sequin fabric",       promptHint: "wearing sparkling sequined fabric catching light with countless tiny reflective facets" },
-  { id: "fabric-latex",    label: "Latex",    dimension: "fabric", description: "Glossy latex",                  promptHint: "wearing glossy latex with a high-shine liquid look clinging to the body" },
+  { id: "fabric-latex",    label: "Latex",    dimension: "fabric", description: "Glossy latex",                  promptHint: "wearing glossy latex with a high-shine liquid look clinging to the body" , adultOnly: true },
 
   // -------------------- Outfit (single-pick complete look — overrides individual pieces) --------------------
-  { id: "outfit-school-uniform",   label: "School Uniform",   dimension: "outfit", description: "Classic school uniform set",        promptHint: "dressed in a classic school uniform — collared blouse, pleated skirt and knee-high socks" },
+  { id: "outfit-school-uniform",   label: "School Uniform",   dimension: "outfit", description: "Classic school uniform set",        promptHint: "dressed in a classic school uniform — collared blouse, pleated skirt and knee-high socks" , adultOnly: true },
   { id: "outfit-business-suit",    label: "Business Suit",    dimension: "outfit", description: "Tailored two-piece business suit",  promptHint: "dressed in a sharp tailored two-piece business suit with a crisp shirt underneath" },
   { id: "outfit-tuxedo",           label: "Tuxedo",           dimension: "outfit", description: "Black-tie tuxedo",                  promptHint: "dressed in a black tuxedo with satin lapels and a bow tie" },
   { id: "outfit-evening-gown",     label: "Evening Gown",     dimension: "outfit", description: "Floor-length formal gown",          promptHint: "dressed in a floor-length evening gown with a fitted bodice and a flowing skirt" },
@@ -280,9 +299,9 @@ export const STYLINGS: ReadonlyArray<Styling> = [
   { id: "outfit-athleisure",       label: "Athleisure Set",   dimension: "outfit", description: "Matching athleisure top and bottom", promptHint: "dressed in a matching athleisure set — a fitted top and leggings in the same tone" },
   { id: "outfit-tracksuit",        label: "Tracksuit",        dimension: "outfit", description: "Two-piece zip-front tracksuit",     promptHint: "dressed in a two-piece tracksuit — a zip-front jacket and matching joggers" },
   { id: "outfit-soccer-jersey",    label: "Soccer Jersey",    dimension: "outfit", description: "National-team football jersey with crest", promptHint: "wearing a national-team soccer jersey — team colors and trim with the team crest on the chest" },
-  { id: "outfit-bikini",           label: "Bikini",           dimension: "outfit", description: "Two-piece swimsuit",                promptHint: "in a two-piece bikini" },
-  { id: "outfit-one-piece-swim",   label: "One-Piece Swimsuit", dimension: "outfit", description: "Fitted one-piece swimsuit",       promptHint: "in a fitted one-piece swimsuit" },
-  { id: "outfit-lingerie",         label: "Lingerie Set",     dimension: "outfit", description: "Matching lingerie set",             promptHint: "in a matching lingerie set" },
+  { id: "outfit-bikini",           label: "Bikini",           dimension: "outfit", description: "Two-piece swimsuit",                promptHint: "in a two-piece bikini" , adultOnly: true },
+  { id: "outfit-one-piece-swim",   label: "One-Piece Swimsuit", dimension: "outfit", description: "Fitted one-piece swimsuit",       promptHint: "in a fitted one-piece swimsuit" , adultOnly: true },
+  { id: "outfit-lingerie",         label: "Lingerie Set",     dimension: "outfit", description: "Matching lingerie set",             promptHint: "in a matching lingerie set" , adultOnly: true },
   { id: "outfit-pajamas",          label: "Pajamas",          dimension: "outfit", description: "Soft cotton pajama set",            promptHint: "in a soft cotton pajama set — a button-up top and matching pants" },
   { id: "outfit-bathrobe",         label: "Bathrobe",         dimension: "outfit", description: "Plush terrycloth robe",             promptHint: "wrapped in a plush terrycloth bathrobe tied at the waist" },
   { id: "outfit-kimono",           label: "Kimono",           dimension: "outfit", description: "Traditional Japanese kimono",       promptHint: "dressed in a traditional Japanese kimono with an obi sash" },
@@ -316,14 +335,14 @@ export const STYLINGS: ReadonlyArray<Styling> = [
   { id: "top-polo",          label: "Polo Shirt",     dimension: "top", description: "Short-sleeve polo",              promptHint: "wearing a fitted polo shirt with a small ribbed collar and short sleeves" },
   { id: "top-tube-top",      label: "Tube Top",       dimension: "top", description: "Strapless tube top",             promptHint: "wearing a strapless tube top fitted across the chest" },
   { id: "top-camisole",      label: "Camisole",       dimension: "top", description: "Thin satin cami",                promptHint: "wearing a thin satin camisole with delicate spaghetti straps" },
-  { id: "top-corset",        label: "Corset",         dimension: "top", description: "Structured corset top",          promptHint: "wearing a structured corset top with boning and visible lacing" },
-  { id: "top-bra-top",       label: "Bra Top",        dimension: "top", description: "Bra-style top showing midriff", promptHint: "wearing a fitted bra-style top with the midriff exposed" },
+  { id: "top-corset",        label: "Corset",         dimension: "top", description: "Structured corset top",          promptHint: "wearing a structured corset top with boning and visible lacing" , adultOnly: true },
+  { id: "top-bra-top",       label: "Bra Top",        dimension: "top", description: "Bra-style top showing midriff", promptHint: "wearing a fitted bra-style top with the midriff exposed" , adultOnly: true },
   { id: "top-sports-bra",    label: "Sports Bra",     dimension: "top", description: "Athletic sports bra",            promptHint: "wearing a structured sports bra with athletic strapping" },
-  { id: "top-bikini-top",    label: "Bikini Top",     dimension: "top", description: "Triangle bikini top",            promptHint: "wearing a triangle bikini top tied behind the neck and back" },
+  { id: "top-bikini-top",    label: "Bikini Top",     dimension: "top", description: "Triangle bikini top",            promptHint: "wearing a triangle bikini top tied behind the neck and back" , adultOnly: true },
   { id: "top-bodysuit",      label: "Bodysuit",       dimension: "top", description: "Fitted one-piece torso garment", promptHint: "wearing a fitted bodysuit, a one-piece torso garment snapped at the inseam" },
   { id: "top-leotard",       label: "Leotard",        dimension: "top", description: "Dance-style fitted top with sleeves", promptHint: "wearing a dance-style leotard, a fitted one-piece top with sleeves" },
-  { id: "top-mesh-top",      label: "Mesh Top",       dimension: "top", description: "Sheer mesh fabric top",          promptHint: "wearing a sheer mesh top, the open-weave fabric letting skin show through" },
-  { id: "top-sheer-top",     label: "Sheer Top",      dimension: "top", description: "Translucent fabric top",          promptHint: "wearing a sheer translucent top with a soft drape, hinting at the silhouette underneath" },
+  { id: "top-mesh-top",      label: "Mesh Top",       dimension: "top", description: "Sheer mesh fabric top",          promptHint: "wearing a sheer mesh top, the open-weave fabric letting skin show through" , adultOnly: true },
+  { id: "top-sheer-top",     label: "Sheer Top",      dimension: "top", description: "Translucent fabric top",          promptHint: "wearing a sheer translucent top with a soft drape, hinting at the silhouette underneath" , adultOnly: true },
   { id: "top-bandeau",       label: "Bandeau",        dimension: "top", description: "Strapless tube top",              promptHint: "wearing a strapless bandeau top wrapped across the chest" },
 
   // -------------------- Bottom (lower-body garment) --------------------
@@ -366,11 +385,11 @@ export const STYLINGS: ReadonlyArray<Styling> = [
 
   // -------------------- Legwear (between bottom and footwear) --------------------
   { id: "legwear-bare",             label: "Bare Legs",        dimension: "legwear", description: "Bare legs, no hosiery",      promptHint: "with bare legs, no hosiery" },
-  { id: "legwear-sheer-tights",     label: "Sheer Tights",     dimension: "legwear", description: "Sheer nude pantyhose",       promptHint: "with sheer nude pantyhose" },
+  { id: "legwear-sheer-tights",     label: "Sheer Tights",     dimension: "legwear", description: "Sheer nude pantyhose",       promptHint: "with sheer nude pantyhose" , adultOnly: true },
   { id: "legwear-opaque-tights",    label: "Opaque Tights",    dimension: "legwear", description: "Solid opaque tights",        promptHint: "with opaque black tights covering the legs" },
-  { id: "legwear-fishnets",         label: "Fishnets",         dimension: "legwear", description: "Diamond-mesh fishnets",      promptHint: "with fishnet stockings, the skin showing through the diamond mesh", term: "fishnet stockings" },
-  { id: "legwear-thigh-highs",      label: "Thigh-High Stockings", dimension: "legwear", description: "Thigh-high stockings",   promptHint: "with thigh-high stockings stopping mid-thigh" },
-  { id: "legwear-lace-top-stockings", label: "Lace-Top Stockings", dimension: "legwear", description: "Lace-banded thigh-highs", promptHint: "with lace-topped thigh-high stockings cinched mid-thigh" },
+  { id: "legwear-fishnets",         label: "Fishnets",         dimension: "legwear", description: "Diamond-mesh fishnets",      promptHint: "with fishnet stockings, the skin showing through the diamond mesh", term: "fishnet stockings" , adultOnly: true },
+  { id: "legwear-thigh-highs",      label: "Thigh-High Stockings", dimension: "legwear", description: "Thigh-high stockings",   promptHint: "with thigh-high stockings stopping mid-thigh" , adultOnly: true },
+  { id: "legwear-lace-top-stockings", label: "Lace-Top Stockings", dimension: "legwear", description: "Lace-banded thigh-highs", promptHint: "with lace-topped thigh-high stockings cinched mid-thigh" , adultOnly: true },
   { id: "legwear-knee-highs",       label: "Knee-High Socks",  dimension: "legwear", description: "Knee-high socks",            promptHint: "with knee-high socks pulled up the calf" },
   { id: "legwear-crew-socks",       label: "Crew Socks",       dimension: "legwear", description: "Mid-calf crew socks",        promptHint: "with simple crew socks visible above the shoes" },
   { id: "legwear-ankle-socks",      label: "Ankle Socks",      dimension: "legwear", description: "Low-cut ankle socks",        promptHint: "with low-cut ankle socks barely showing above the shoes" },
@@ -385,7 +404,7 @@ export const STYLINGS: ReadonlyArray<Styling> = [
   { id: "footwear-platforms",       label: "Platform Shoes",   dimension: "footwear", description: "Tall platform soles",      promptHint: "in platform shoes with thick chunky soles" },
   { id: "footwear-ankle-boots",     label: "Ankle Boots",      dimension: "footwear", description: "Fitted ankle boots",       promptHint: "in fitted black ankle boots" },
   { id: "footwear-knee-boots",      label: "Knee-High Boots",  dimension: "footwear", description: "Tall knee-high boots",     promptHint: "in tall knee-high leather boots" },
-  { id: "footwear-thigh-high-boots", label: "Thigh-High Boots", dimension: "footwear", description: "Thigh-high boots",        promptHint: "in over-the-knee thigh-high leather boots" },
+  { id: "footwear-thigh-high-boots", label: "Thigh-High Boots", dimension: "footwear", description: "Thigh-high boots",        promptHint: "in over-the-knee thigh-high leather boots" , adultOnly: true },
   { id: "footwear-combat-boots",    label: "Combat Boots",     dimension: "footwear", description: "Laced combat boots",       promptHint: "in laced black combat boots with a chunky lugged sole" },
   { id: "footwear-chelsea-boots",   label: "Chelsea Boots",    dimension: "footwear", description: "Slip-on Chelsea boots",    promptHint: "in clean Chelsea boots with elastic side panels" },
   { id: "footwear-cowboy-boots",    label: "Cowboy Boots",     dimension: "footwear", description: "Pointed-toe cowboy boots", promptHint: "in pointed-toe cowboy boots with a stacked heel and decorative stitching" },
@@ -405,18 +424,18 @@ export const STYLINGS: ReadonlyArray<Styling> = [
 
   // -------------------- Wardrobe State (modifier — composes with any garment) --------------------
   { id: "state-oversized",     label: "Oversized",       dimension: "wardrobe-state", description: "Loose, oversized fit",      promptHint: "the clothing loose and oversized, draping freely well past the body", term: "oversized fit" },
-  { id: "state-fitted",        label: "Fitted",          dimension: "wardrobe-state", description: "Form-fitting silhouette",   promptHint: "the clothing fitted and form-conscious, hugging the contours of the body", term: "form-fitting clothing" },
-  { id: "state-cropped",       label: "Cropped",         dimension: "wardrobe-state", description: "Top cropped at midriff",    promptHint: "the top cropped above the midriff with the stomach visible", term: "cropped top" },
-  { id: "state-sheer",         label: "Sheer",           dimension: "wardrobe-state", description: "Translucent fabric",        promptHint: "the fabric translucent and sheer, hinting at the silhouette underneath", term: "sheer clothing" },
-  { id: "state-wet",           label: "Wet",             dimension: "wardrobe-state", description: "Soaked, water-clinging",    promptHint: "the clothing soaked and wet, the fabric clinging to the body and dripping water", term: "wet clothing" },
+  { id: "state-fitted",        label: "Fitted",          dimension: "wardrobe-state", description: "Form-fitting silhouette",   promptHint: "tailored, close-fitting clothing", term: "close-fitting clothing" , adultOnly: true },
+  { id: "state-cropped",       label: "Cropped",         dimension: "wardrobe-state", description: "Top cropped at midriff",    promptHint: "the top cropped above the midriff with the stomach visible", term: "cropped top" , adultOnly: true },
+  { id: "state-sheer",         label: "Sheer",           dimension: "wardrobe-state", description: "Translucent fabric",        promptHint: "the fabric translucent and sheer, hinting at the silhouette underneath", term: "sheer clothing" , adultOnly: true },
+  { id: "state-wet",           label: "Wet",             dimension: "wardrobe-state", description: "Soaked, water-clinging",    promptHint: "the clothing soaked through and dripping", term: "soaked clothing" , adultOnly: true },
   { id: "state-ripped",        label: "Ripped",          dimension: "wardrobe-state", description: "Torn and frayed",           promptHint: "the fabric torn and ripped at the seams, with frayed edges", term: "ripped clothing" },
   { id: "state-distressed",    label: "Distressed",      dimension: "wardrobe-state", description: "Worn, faded, weathered",    promptHint: "the clothing distressed and weathered, with faded color and worn-down edges", term: "distressed clothing" },
   { id: "state-vintage",       label: "Vintage",         dimension: "wardrobe-state", description: "Worn, retro character",     promptHint: "the clothing carrying vintage character — softened color, broken-in fit, retro silhouette", term: "vintage clothing" },
   { id: "state-tucked-in",     label: "Tucked In",       dimension: "wardrobe-state", description: "Top tucked into bottom",    promptHint: "the top neatly tucked into the bottom", term: "top tucked in" },
   { id: "state-half-tucked",   label: "Half-Tucked",     dimension: "wardrobe-state", description: "Front-tucked, back loose",  promptHint: "the top half-tucked — front neatly tucked in, back hanging loose", term: "top half-tucked" },
-  { id: "state-off-shoulder",  label: "Off-Shoulder",    dimension: "wardrobe-state", description: "Slipped off one shoulder",  promptHint: "the top slipped off one shoulder, baring the skin and collarbone", term: "off-the-shoulder top" },
-  { id: "state-halter-neck",   label: "Halter Neck",     dimension: "wardrobe-state", description: "Straps tied behind the neck", promptHint: "the top cut as a halter — straps tied behind the neck, shoulders and upper back bare", term: "halter neckline" },
-  { id: "state-plunging-neck", label: "Plunging Neckline", dimension: "wardrobe-state", description: "Deep plunging V neckline",  promptHint: "the neckline cut in a deep plunging V" },
+  { id: "state-off-shoulder",  label: "Off-Shoulder",    dimension: "wardrobe-state", description: "Slipped off one shoulder",  promptHint: "the top slipped off one shoulder, baring the skin and collarbone", term: "off-the-shoulder top" , adultOnly: true },
+  { id: "state-halter-neck",   label: "Halter Neck",     dimension: "wardrobe-state", description: "Straps tied behind the neck", promptHint: "the top cut as a halter — straps tied behind the neck, shoulders and upper back bare", term: "halter neckline" , adultOnly: true },
+  { id: "state-plunging-neck", label: "Plunging Neckline", dimension: "wardrobe-state", description: "Deep plunging V neckline",  promptHint: "the neckline cut in a deep plunging V" , adultOnly: true },
   { id: "state-unbuttoned",    label: "Unbuttoned",      dimension: "wardrobe-state", description: "Open / unbuttoned",         promptHint: "the outerwear hanging open and unbuttoned, falling loose at the sides", term: "worn open and unbuttoned" },
   { id: "state-rolled-sleeves", label: "Rolled Sleeves", dimension: "wardrobe-state", description: "Sleeves rolled up forearm", promptHint: "the sleeves rolled up to the forearm", term: "rolled-up sleeves" },
   { id: "state-layered",       label: "Layered",         dimension: "wardrobe-state", description: "Multiple stacked layers",   promptHint: "the outfit composed of multiple stacked layers, each piece visible at the edges", term: "layered outfit" },
@@ -570,7 +589,7 @@ const stylingById = new Map<string, Styling>(STYLINGS.map((s) => [s.id, s]))
 
 export function getStyling(id: string | undefined | null): Styling | undefined {
   if (!id) return undefined
-  return stylingById.get(id)
+  return overlayEntry("styling", id, stylingById.get(id))
 }
 
 export function getStylingLabel(id: string | undefined | null, fallback?: string): string {
@@ -623,6 +642,49 @@ function collectStylingFragments(
     ? lipStateRaw.includes("lip-state-bold-red")
     : lipStateRaw === "lip-state-bold-red"
 
+  // W1-a (Layer 1): the subject fold passes person + styling as ONE flat bag,
+  // so the age is readable here; drop adultOnly garments for a minor. The
+  // drop is checked on the ENTRY the collector itself resolves for that id
+  // (`getStyling`, the same lookup `fragmentFor` already reads through), not
+  // a separately-sourced id set. A separate styling node carries no age and
+  // is left alone (Layer 2 — the backend policy — covers that path).
+  const floored = isMinorAge(data as { age?: string; customAge?: number; type?: string })
+  const emit = floored ? (id: string) => (getStyling(id)?.adultOnly === true ? "" : fragmentFor(id)) : fragmentFor
+
+  // W1-b (spec 2026-09-01 §3.3): three ids say "cropped" — the Person
+  // catalog's `feature-midriff-visible` and this catalog's `top-crop-top` and
+  // `state-cropped`. Stacked they read as three separate statements about a
+  // bare stomach, which is one of the compounds the safety classifiers flag.
+  // Same mechanism and same caveat as the bold-lips dedupe above: the subject
+  // fold hands BOTH builders one flat bag, so the person pick is readable
+  // here; a separate styling node carries no `distinctiveFeature` and this
+  // no-ops. Person leads the fold order, so the person clause wins; with no
+  // person clause the garment wins over the modifier.
+  const featureRaw = (data as Record<string, unknown>).distinctiveFeature
+  const midriffPicked = Array.isArray(featureRaw)
+    ? featureRaw.includes("feature-midriff-visible")
+    : featureRaw === "feature-midriff-visible"
+  // Gate on pick-minus-floor (`midriffPicked && !floored`), which equals EMISSION
+  // unless an overlay pack drops the entry — the same rule the midriff+navel fold
+  // uses (`fragmentFor(id) !== ""` inside `emitIndependentFragments`).
+  // `feature-midriff-visible` is `adultOnly`, so for a minor the person
+  // collector drops it; suppressing the styling twins as well would leave a
+  // minor who picked midriff AND crop-top with NO cropped clause at all.
+  // `floored` is the local computed just above from the same shared bag, so
+  // the two collectors cannot disagree.
+  const midriffAlready = midriffPicked && !floored
+  const cropTopPicked = (data as Record<string, unknown>).top === "top-crop-top"
+  // `top` is single-pick (always a bare string), but `wardrobeState` is
+  // declared `string | ReadonlyArray<string>` AND the subject-fold door
+  // (`normalizeSubjectFields`) unwraps a lone array pick down to a bare
+  // string — so a single "state-cropped" selection, the common case, arrives
+  // here as a plain string, not an array. The suppression must therefore be
+  // checked at BOTH emission sites below (the `typeof raw === "string"`
+  // branch and the `Array.isArray(raw)` branch), not just the array one.
+  const croppedSuppressed = (id: string): boolean =>
+    (id === "top-crop-top" && midriffAlready) ||
+    (id === "state-cropped" && (midriffAlready || cropTopPicked))
+
   for (const dimension of STYLING_DIMENSION_ORDER) {
     const field = STYLING_FIELD_BY_DIMENSION[dimension]
     const raw = data[field]
@@ -630,12 +692,14 @@ function collectStylingFragments(
     // jewelry / wardrobe-state / hair-state are multi-pick (string | string[]);
     // emit each id's fragment independently and let the comma-join compose.
     if (typeof raw === "string" && raw.length > 0) {
-      const fragment = fragmentFor(raw)
+      if (croppedSuppressed(raw)) continue
+      const fragment = emit(raw)
       if (fragment) out.push(fragment)
     } else if (Array.isArray(raw)) {
       for (const item of raw) {
         if (typeof item !== "string" || item.length === 0) continue
-        const fragment = fragmentFor(item)
+        if (croppedSuppressed(item)) continue
+        const fragment = emit(item)
         if (fragment) out.push(fragment)
       }
     }

package/src/subject-registry.ts

@@ -80,7 +80,7 @@ import {
 } from "./styling.js"
 import { buildHeldPropHints } from "./held-prop.js"
 import { buildMaterialHints } from "./materials.js"
-import { getAnimalPromptHint, getAnimalTerm } from "@nodaro/shared"
+import { curatedAnimalPromptHint, curatedAnimalTerm } from "./shared-catalog-overlay.js"
 
 /** Which generation stages fold a dimension (mirrors `DirectionSurface`). */
 export type SubjectSurface = "image" | "video" | "both"
@@ -200,7 +200,7 @@ export const SUBJECT_FIELDS = [
   { key: "styling", kind: "group", surface: "both", render: viaFragmentBuilder(buildStylingHints) },
   { key: "heldProp", kind: "ids", surface: "both", maxPicks: 2, render: viaListBuilder(buildHeldPropHints) },
   { key: "material", kind: "ids", surface: "both", maxPicks: 2, render: viaStringBuilder(buildMaterialHints) },
-  { key: "animal", kind: "ids", surface: "both", maxPicks: 1, render: perId(getAnimalPromptHint, getAnimalTerm) },
+  { key: "animal", kind: "ids", surface: "both", maxPicks: 1, render: perId(curatedAnimalPromptHint, curatedAnimalTerm) },
 ] as const satisfies ReadonlyArray<SubjectFieldSpec>
 
 export type SubjectFieldRow = (typeof SUBJECT_FIELDS)[number]

package/src/temporal.ts

@@ -16,6 +16,7 @@
  */
 
 import { resolveTerm, type PickerHintMode } from "./term.js"
+import { overlayEntry } from "./catalog-overlay.js"
 
 export type TemporalCategory = "speed" | "freeze" | "direction" | "shutter"
 
@@ -83,7 +84,7 @@ const temporalById = new Map<string, Temporal>(TEMPORALS.map((t) => [t.id, t]))
 
 export function getTemporal(id: string | undefined | null): Temporal | undefined {
   if (!id) return undefined
-  return temporalById.get(id)
+  return overlayEntry("temporal", id, temporalById.get(id))
 }
 
 export function getTemporalLabel(id: string | undefined | null, fallback?: string): string {

package/src/transitions.ts

@@ -13,6 +13,7 @@
  */
 
 import { resolveTerm, type PickerHintMode } from "./term.js"
+import { overlayEntry } from "./catalog-overlay.js"
 
 export type TransitionCategory =
   | "standard"
@@ -284,7 +285,7 @@ const transitionById = new Map<string, Transition>(
 
 export function getTransition(id: string | undefined | null): Transition | undefined {
   if (!id) return undefined
-  return transitionById.get(id)
+  return overlayEntry("transitions", id, transitionById.get(id))
 }
 
 export function getTransitionLabel(id: string | undefined | null, fallback?: string): string {