@nodaro/prompts 1.15.0 → 1.16.0

package/src/__tests__/person-exposure-hints.test.ts

@@ -14,15 +14,15 @@ describe("exposure hint collapsing", () => {
     const hints = buildPersonHints({
       distinctiveFeature: ["feature-midriff-visible", "feature-navel-visible"],
     } as never)
-    const exposure = hints.filter((h) => /midriff|navel|stomach/i.test(h))
-    expect(exposure).toEqual(["wearing a cropped style, midriff and navel visible"])
+    const exposure = hints.filter((h) => /cropped hemline|navel|stomach/i.test(h))
+    expect(exposure).toEqual(["with a cropped hemline and the navel showing"])
   })
 
   it("each alone keeps its own (softened, garment-language) hint", () => {
     const midriffOnly = buildPersonHints({
       distinctiveFeature: ["feature-midriff-visible"],
     } as never)
-    expect(midriffOnly).toContain("wearing a cropped style with the midriff visible")
+    expect(midriffOnly).toContain("with a cropped hemline")
     expect(midriffOnly.join(" ")).not.toMatch(/bare stomach/i)
 
     const navelOnly = buildPersonHints({
@@ -40,7 +40,7 @@ describe("exposure hint collapsing", () => {
         "feature-freckles",
       ],
     } as never)
-    expect(hints.filter((h) => /midriff/i.test(h))).toHaveLength(1)
+    expect(hints.filter((h) => /cropped hemline/i.test(h))).toHaveLength(1)
     expect(hints.length).toBeGreaterThan(1)
   })
 })
@@ -59,3 +59,58 @@ describe("bold-lips cross-catalog dedupe", () => {
     expect(hints.join(" ")).toMatch(/bold lips/i)
   })
 })
+
+describe("cropped-clause de-stack across the person↔styling boundary (W1-b)", () => {
+  it("the midriff person clause suppresses BOTH styling cropped twins on the shared bag", () => {
+    const hints = buildStylingHints({
+      distinctiveFeature: ["feature-midriff-visible"],
+      top: "top-crop-top",
+      wardrobeState: ["state-cropped"],
+    } as never)
+    const joined = hints.join(", ")
+    expect(joined).not.toMatch(/cropped top|cropped above the midriff/i)
+  })
+
+  it("without the person clause, the garment wins and the modifier yields", () => {
+    const hints = buildStylingHints({
+      top: "top-crop-top",
+      wardrobeState: ["state-cropped"],
+    } as never)
+    const joined = hints.join(", ")
+    expect(joined).toMatch(/wearing a cropped top that ends above the midriff/i)
+    expect(joined).not.toMatch(/the top cropped above the midriff with the stomach visible/i)
+  })
+
+  it("a MINOR who picks midriff + crop-top still gets exactly one cropped clause", () => {
+    // The person clause is dropped by the floor (feature-midriff-visible is
+    // adultOnly), so the styling twin must NOT be suppressed — otherwise the
+    // floor silently deletes a garment detail instead of a body detail.
+    const hints = buildStylingHints({
+      age: "age-child",
+      distinctiveFeature: ["feature-midriff-visible"],
+      top: "top-crop-top",
+    } as never)
+    expect(hints.join(", ")).toMatch(/wearing a cropped top that ends above the midriff/i)
+  })
+
+  it("either styling id alone is untouched (no person clause, no twin)", () => {
+    expect(buildStylingHints({ wardrobeState: ["state-cropped"] } as never).join(", "))
+      .toMatch(/the top cropped above the midriff/i)
+    expect(buildStylingHints({ top: "top-crop-top" } as never).join(", "))
+      .toMatch(/wearing a cropped top/i)
+  })
+
+  it("de-stacks a BARE-STRING wardrobeState too, not just the array form", () => {
+    // `wardrobeState` is a single-pick-or-multi field (string | string[]), and
+    // `normalizeSubjectFields` unwraps a lone array pick to a bare string
+    // before the styling collector ever sees it — the single-pick case is the
+    // common one, not an edge case, so the suppression must not be array-only.
+    const hints = buildStylingHints({
+      distinctiveFeature: "feature-midriff-visible",
+      top: "top-crop-top",
+      wardrobeState: "state-cropped",
+    } as never)
+    const joined = hints.join(", ")
+    expect(joined).not.toMatch(/cropped top|cropped above the midriff/i)
+  })
+})

package/src/__tests__/retired-hint-strings.test.ts

@@ -0,0 +1,68 @@
+import { describe, it, expect } from "vitest"
+import { getAdultOnlyHintStrings, RETIRED_ADULT_ONLY_HINT_STRINGS } from "../age-floor.js"
+
+/**
+ * W1-b (spec 2026-09-01 §3.3) rewords 17 catalog hints that W1-a (PR 2) had
+ * flagged `adultOnly`. The backend `minor-age-floor` policy strips sentences
+ * by STRING, so a rewording silently narrows the floor for every consumer
+ * still on the pre-rephrase `@nodaro/prompts` — including person.nodaro.ai,
+ * whose client-assembled `seedPrompt` is precisely how the 2026-07-30 P0
+ * prompts carried `state-fitted`'s clause to the provider.
+ *
+ * The retired strings therefore stay in the strip set forever. A retired
+ * string can only over-strip, and only for a subject already judged a minor.
+ */
+describe("retired adult-only wording stays inside the floor", () => {
+  it("every retired string is still returned by getAdultOnlyHintStrings()", () => {
+    const live = new Set(getAdultOnlyHintStrings())
+    const missing = RETIRED_ADULT_ONLY_HINT_STRINGS.filter((s) => !live.has(s.toLowerCase()))
+    expect(missing, "retired strings dropped out of the floor").toEqual([])
+  })
+
+  it("the 2026-07-30 incident clause is in the set by name", () => {
+    expect(getAdultOnlyHintStrings()).toContain(
+      "the clothing fitted and form-conscious, hugging the contours of the body",
+    )
+    expect(getAdultOnlyHintStrings()).toContain("wearing a cropped style, midriff and navel visible")
+    expect(getAdultOnlyHintStrings()).toContain("with lips slightly parted, taking a soft breath")
+  })
+
+  it("the NEW wording is a live needle too — the floor tracks the rephrase forward", () => {
+    // The derivation makes this true by construction, but nothing else states
+    // it: a future edit that drops a hint under the `length >= 8` filter, or
+    // an entry quietly losing `adultOnly`, would narrow the floor silently.
+    // (Green only after Task 5; see that task's Step 7 run set.)
+    const strings = getAdultOnlyHintStrings()
+    expect(strings).toContain("tailored, close-fitting clothing")
+    expect(strings).toContain("with a cropped hemline")
+  })
+
+  it("no bare derived TERM leaked into the needle set (the promptHint-only contract)", () => {
+    const strings = getAdultOnlyHintStrings()
+    for (const t of ["lounging", "cropped top", "school uniform", "lying down", "wet clothing", "bare shoulders"]) {
+      expect(strings, `term "${t}" must never be a needle`).not.toContain(t)
+    }
+  })
+
+  it("every retired string is lower-case and long enough to survive the length filter", () => {
+    for (const s of RETIRED_ADULT_ONLY_HINT_STRINGS) {
+      expect(s, s).toBe(s.toLowerCase())
+      expect(s.length, s).toBeGreaterThanOrEqual(8)
+    }
+  })
+
+  it("the set covers all 15 flagged rephrased entries plus the fold literal", () => {
+    // 15 flagged promptHints (the 14 flagged person/styling entries plus the
+    // pose twin) + the hard-coded fold literal = 16. `promptHint`s only —
+    // never terms. A change to the count must be a deliberate edit here, not
+    // a silent drift.
+    expect(RETIRED_ADULT_ONLY_HINT_STRINGS.length).toBe(16)
+  })
+
+  it("the list is longest-first, matching getAdultOnlyHintStrings' contract", () => {
+    const strings = getAdultOnlyHintStrings()
+    for (let i = 1; i < strings.length; i++) {
+      expect(strings[i - 1].length).toBeGreaterThanOrEqual(strings[i].length)
+    }
+  })
+})

package/src/__tests__/subject-registry.test.ts

@@ -218,7 +218,7 @@ describe("renderSubjectHints — the flat-bag behaviors", () => {
       { distinctiveFeature: ["feature-midriff-visible", "feature-navel-visible"] },
       IMAGE,
     )
-    expect(out).toEqual(["wearing a cropped style, midriff and navel visible"])
+    expect(out).toEqual(["with a cropped hemline and the navel showing"])
   })
 
   it("de-duplicates an exact repeated clause, first occurrence winning", () => {

package/src/__tests__/w1b-rephrase.test.ts

@@ -0,0 +1,119 @@
+import { describe, it, expect } from "vitest"
+import { PEOPLE } from "../person.js"
+import { STYLINGS } from "../styling.js"
+import { POSES } from "../pose.js"
+import { PICKER_CATALOGS } from "../picker-catalogs.js"
+import { RETIRED_ADULT_ONLY_HINT_STRINGS } from "../age-floor.js"
+
+/**
+ * W1-b — spec 2026-09-01-app-reports-triage-design.md §3.3, wording approved
+ * by §10 decisions 1 and 6.
+ *
+ * 12 adult `generate-character` prompts were refused by the provider's safety
+ * filter because stacked picker fragments read as sexualized. The principle:
+ * describe the garment or the look, not exposed skin; drop
+ * "wet / sheen / exposed / bare / hugging / soft breath"; keep the attribute
+ * renderable.
+ *
+ * SCOPE RULING, LATER RESOLVED (replay-harness verdict, internal validation
+ * results, 2026-09-02): the go/no-go criterion initially failed for TWO
+ * entries — `eye-state-half-lidded` and `feature-collarbone-visible`
+ * rendered their attribute 0/10 and 0/22 times under either wording, so
+ * their approved rewording could not be validated at the time and both
+ * shipped byte-identical in the original W1-b PR. A follow-up replay on
+ * staging found wordings that DO render, approved 2026-09-03. Both are now
+ * included in PERSON_EXPECTED below with BOTH `promptHint` and `term`
+ * reworded, like every other entry — the compact-mode term is not left
+ * carrying the old wording.
+ *
+ * This file pins BOTH fields of every reworded entry — `promptHint` (verbose
+ * mode) and `term` (compact mode) — because a rephrase that touched only one
+ * of them would leave the old wording reachable through the other. The last
+ * test is the ratchet: no retired string may reappear anywhere in the
+ * catalog corpus.
+ */
+
+interface Expected {
+  readonly id: string
+  readonly promptHint: string
+  readonly term: string
+}
+
+const PERSON_EXPECTED: ReadonlyArray<Expected> = [
+  { id: "bust-very-full", promptHint: "a fuller bust", term: "fuller bust" },
+  { id: "silhouette-hourglass", promptHint: "an hourglass figure", term: "hourglass figure" },
+  { id: "waist-defined", promptHint: "a defined waistline", term: "defined waistline" },
+  { id: "lip-state-glossy", promptHint: "with a glossy lip finish", term: "glossy lips" },
+  { id: "lip-state-parted", promptHint: "with lips relaxed and slightly open, as if mid-sentence", term: "lips slightly open" },
+  { id: "lip-state-bitten", promptHint: "lightly biting the lower lip", term: "biting lower lip" },
+  { id: "eye-state-staring-camera", promptHint: "looking directly into the camera", term: "direct gaze to camera" },
+  { id: "eye-state-half-lidded", promptHint: "with drowsy, partly closed eyes, the lids sitting low over the iris", term: "drowsy, partly closed eyes" },
+  { id: "texture-dewy", promptHint: "with dewy, luminous skin", term: "dewy skin" },
+  { id: "texture-glistening", promptHint: "with a light glistening sheen on the skin", term: "glistening sheen" },
+  { id: "texture-baby-soft", promptHint: "with soft, fine-pored skin", term: "soft fine-pored skin" },
+  { id: "texture-shower-fresh-wet", promptHint: "with fresh, water-dappled skin as if just out of the shower", term: "water-dappled skin" },
+  { id: "feature-bare-shoulders", promptHint: "with the shoulders uncovered", term: "shoulders uncovered" },
+  { id: "feature-collarbone-visible", promptHint: "with an open neckline that leaves the collarbones uncovered", term: "open neckline, collarbones uncovered" },
+  { id: "feature-midriff-visible", promptHint: "with a cropped hemline", term: "cropped hemline" },
+]
+
+const STYLING_EXPECTED: ReadonlyArray<Expected> = [
+  { id: "state-fitted", promptHint: "tailored, close-fitting clothing", term: "close-fitting clothing" },
+  { id: "state-wet", promptHint: "the clothing soaked through and dripping", term: "soaked clothing" },
+]
+
+const POSE_EXPECTED: ReadonlyArray<Expected> = [
+  { id: "biting-lip", promptHint: "lightly biting the lower lip, a subtle playful expression", term: "biting lower lip" },
+]
+
+function check(catalog: ReadonlyArray<{ id: string; promptHint: string; term?: string }>, expected: ReadonlyArray<Expected>) {
+  for (const want of expected) {
+    const entry = catalog.find((e) => e.id === want.id)
+    expect(entry, `missing entry ${want.id}`).toBeDefined()
+    expect(entry!.promptHint, `${want.id}.promptHint`).toBe(want.promptHint)
+    expect(entry!.term, `${want.id}.term (authored, not label-derived)`).toBe(want.term)
+  }
+}
+
+describe("W1-b rephrase — the 17 reworded entries plus the pose twin", () => {
+  it("person entries carry the approved promptHint and term", () => {
+    check(PEOPLE, PERSON_EXPECTED)
+  })
+
+  it("eye-state-half-lidded and feature-collarbone-visible keep adultOnly through the rework", () => {
+    const halfLidded = PEOPLE.find((e) => e.id === "eye-state-half-lidded")
+    expect(halfLidded?.adultOnly).toBe(true)
+
+    const collarbone = PEOPLE.find((e) => e.id === "feature-collarbone-visible")
+    expect(collarbone?.adultOnly).toBe(true)
+  })
+
+  it("styling entries carry the approved promptHint and term", () => {
+    check(STYLINGS, STYLING_EXPECTED)
+  })
+
+  it("the pose twin of lip-state-bitten is reworded to match", () => {
+    check(POSES, POSE_EXPECTED)
+  })
+
+  it("all 18 ids are covered — the count is deliberate, not incidental", () => {
+    expect(PERSON_EXPECTED.length + STYLING_EXPECTED.length + POSE_EXPECTED.length).toBe(18)
+  })
+
+  it("RATCHET: no retired string survives anywhere in the catalog corpus", () => {
+    const offenders: string[] = []
+    for (const cat of PICKER_CATALOGS) {
+      const options = [...(cat.options ?? []), ...(cat.dimensions ?? []).flatMap((d) => d.options)]
+      for (const o of options) {
+        for (const retired of RETIRED_ADULT_ONLY_HINT_STRINGS) {
+          // The fold literal is not an entry field; it is pinned separately in
+          // person-exposure-hints.test.ts.
+          if (o.promptHint === retired || o.term === retired) {
+            offenders.push(`${cat.catalogId} • ${o.id} • "${retired}"`)
+          }
+        }
+      }
+    }
+    expect(offenders, `retired wording is still live:\n${offenders.join("\n")}`).toEqual([])
+  })
+})

package/src/age-floor.ts

@@ -65,10 +65,73 @@ export function getAdultOnlyIds(): ReadonlySet<string> {
   return new Set(getAdultOnlyEntries().map((e) => e.id))
 }
 
+/**
+ * The pre-rework `promptHint` of every `adultOnly` entry the spec
+ * (2026-09-01-app-reports-triage-design §3.3) listed for rewording — including
+ * `eye-state-half-lidded` and `feature-collarbone-visible`, which the W1-b
+ * harness initially left byte-identical (0/10 and 0/22 render rate under
+ * either wording) and a 2026-09-03 replay then found renderable wordings for
+ * — plus the hard-coded midriff+navel fold clause. These strings are permanently part of the strip
+ * set: a consumer that has not bumped `@nodaro/prompts` still emits them, and
+ * the client-assembled `seedPrompt` path is exactly how the 2026-07-30
+ * minor-age prompts reached a provider. Retiring can only ever cause an EXTRA
+ * strip, and only for a subject `isMinorAge` has already judged a minor — so
+ * the list only grows, never shrinks.
+ *
+ * `promptHint` ONLY, for the same reason `getAdultOnlyHintStrings` gives:
+ * `term` is short display vocabulary and the composed-catalog projection
+ * back-fills a derived `term` for every option, so terms collide with benign
+ * everyday text. Assembled prompts and client seedPrompts are built from
+ * hints, never from terms. The three W1-b entries that are NOT flagged —
+ * `texture-dewy`, `texture-baby-soft`, `eye-state-staring-camera` (spec
+ * §3.3's "deliberately not flagged" list) — are absent: their old wording
+ * never belonged to the floor.
+ *
+ * 15 flagged hints + the fold literal = 16.
+ */
+export const RETIRED_ADULT_ONLY_HINT_STRINGS: ReadonlyArray<string> = [
+  // bust-very-full
+  "very full bust",
+  // silhouette-hourglass
+  "hourglass silhouette",
+  // waist-defined
+  "defined waist",
+  // lip-state-glossy
+  "with high-shine glossy wet-look lips",
+  // lip-state-parted
+  "with lips slightly parted, taking a soft breath",
+  // lip-state-bitten
+  "playfully biting the lower lip",
+  // eye-state-half-lidded
+  "with heavy half-lidded sleepy eyes",
+  // texture-glistening
+  "with glistening skin, sweat or oil catching the light",
+  // texture-shower-fresh-wet
+  "with just-out-of-the-shower wet skin, water beading on the surface and rolling in slow droplets down the curves of the body",
+  // feature-bare-shoulders
+  "with bare shoulders exposed, the line of the collarbone and shoulder muscles uncovered",
+  // feature-collarbone-visible
+  "with a prominent collarbone clearly defined and catching the light",
+  // feature-midriff-visible
+  "wearing a cropped style with the midriff visible",
+  // state-fitted — the 2026-07-30 incident clause
+  "the clothing fitted and form-conscious, hugging the contours of the body",
+  // state-wet
+  "the clothing soaked and wet, the fabric clinging to the body and dripping water",
+  // pose `biting-lip` (the lip-state-bitten twin)
+  "biting the lower lip with a subtle playful expression",
+  // the hard-coded midriff+navel fold in emitIndependentFragments — not any
+  // entry's hint, so retiring it ADDS a needle for a clause that really is
+  // emitted verbatim.
+  "wearing a cropped style, midriff and navel visible",
+]
+
 /** Every full prompt-hint string a flagged entry can inject, lower-cased,
  *  longest first — the backend policy strips text that contains any of them
  *  (Layer 2), which is how flagged wording arriving inside free text (a
- *  client-assembled seedPrompt) is caught.
+ *  client-assembled seedPrompt) is caught. Seeded with
+ *  `RETIRED_ADULT_ONLY_HINT_STRINGS` so a catalog rewording can never narrow
+ *  the strip set for a consumer still shipping the pre-rephrase wording.
  *
  *  `promptHint` ONLY, deliberately — `term` is analyzer/UI vocabulary
  *  (compact-mode display), and `picker-catalogs.ts`'s composed-catalog
@@ -81,7 +144,7 @@ export function getAdultOnlyIds(): ReadonlySet<string> {
  *  can actually arrive verbatim in free text — terms don't need to be (and
  *  must not be) swept here. */
 export function getAdultOnlyHintStrings(): ReadonlyArray<string> {
-  const out = new Set<string>()
+  const out = new Set<string>(RETIRED_ADULT_ONLY_HINT_STRINGS)
   for (const e of getAdultOnlyEntries()) {
     if (e.promptHint) out.add(e.promptHint.toLowerCase())
   }

package/src/person.ts

@@ -437,10 +437,10 @@ export const PEOPLE: ReadonlyArray<Person> = [
   { id: "bust-small",     label: "Small",     dimension: "bust", description: "Small bust",     promptHint: "small bust", term: "small bust" , adultOnly: true },
   { id: "bust-average",   label: "Average",   dimension: "bust", description: "Average bust",   promptHint: "" },
   { id: "bust-full",      label: "Full",      dimension: "bust", description: "Full bust",      promptHint: "full bust", term: "full bust" , adultOnly: true },
-  { id: "bust-very-full", label: "Very Full", dimension: "bust", description: "Very full bust", promptHint: "very full bust", term: "very full bust" , adultOnly: true },
+  { id: "bust-very-full", label: "Very Full", dimension: "bust", description: "Very full bust", promptHint: "a fuller bust", term: "fuller bust" , adultOnly: true },
 
   // ----- Waist -----
-  { id: "waist-defined",  label: "Defined",  dimension: "waist", description: "Defined, cinched waist",    promptHint: "defined waist", term: "defined waist" , adultOnly: true },
+  { id: "waist-defined",  label: "Defined",  dimension: "waist", description: "Defined, cinched waist",    promptHint: "a defined waistline", term: "defined waistline" , adultOnly: true },
   { id: "waist-average",  label: "Average",  dimension: "waist", description: "Average waist",             promptHint: "" },
   { id: "waist-straight", label: "Straight", dimension: "waist", description: "Straight, undefined waist", promptHint: "straight waistline", term: "straight waistline" , adultOnly: true },
 
@@ -450,7 +450,7 @@ export const PEOPLE: ReadonlyArray<Person> = [
   { id: "hips-wide",     label: "Wide",     dimension: "hips", description: "Wide hips",     promptHint: "wide hips", term: "wide hips" , adultOnly: true },
 
   // ----- Silhouette (overall body shape; optional, no neutral) -----
-  { id: "silhouette-hourglass",   label: "Hourglass",         dimension: "silhouette", description: "Balanced bust + hips, defined waist", promptHint: "hourglass silhouette", term: "hourglass silhouette" , adultOnly: true },
+  { id: "silhouette-hourglass",   label: "Hourglass",         dimension: "silhouette", description: "Balanced bust + hips, defined waist", promptHint: "an hourglass figure", term: "hourglass figure" , adultOnly: true },
   { id: "silhouette-rectangular", label: "Rectangular",       dimension: "silhouette", description: "Straight up-and-down silhouette",      promptHint: "rectangular silhouette", term: "rectangular silhouette" },
   { id: "silhouette-pear",        label: "Pear",              dimension: "silhouette", description: "Hips wider than shoulders",            promptHint: "pear-shaped silhouette", term: "pear-shaped silhouette" , adultOnly: true },
   { id: "silhouette-inverted",    label: "Inverted Triangle", dimension: "silhouette", description: "Broad shoulders, narrow hips",         promptHint: "inverted-triangle silhouette", term: "inverted-triangle silhouette" },
@@ -553,11 +553,11 @@ export const PEOPLE: ReadonlyArray<Person> = [
 
   // -------------------- Lip State (what the lips are doing / wearing) --------------------
   { id: "lip-state-chapped",   label: "Chapped",   dimension: "lip-state", description: "Cracked, dry, weather-worn lips", promptHint: "with chapped, cracked, weather-worn dry lips", term: "chapped dry lips" },
-  { id: "lip-state-glossy",    label: "Glossy",    dimension: "lip-state", description: "High-shine, wet-look lips",       promptHint: "with high-shine glossy wet-look lips", term: "glossy wet-look lips" , adultOnly: true },
+  { id: "lip-state-glossy",    label: "Glossy",    dimension: "lip-state", description: "High-shine, wet-look lips",       promptHint: "with a glossy lip finish", term: "glossy lips" , adultOnly: true },
   { id: "lip-state-bare",      label: "Bare",      dimension: "lip-state", description: "Natural, untreated, no makeup",   promptHint: "with bare, natural, untreated lips", term: "bare natural lips" },
   { id: "lip-state-bold-red",  label: "Bold Red",  dimension: "lip-state", description: "Saturated red lipstick statement", promptHint: "with a bold, saturated red lipstick statement", term: "bold red lipstick" },
-  { id: "lip-state-bitten",    label: "Bitten",    dimension: "lip-state", description: "Slight playful lip-bite, lower lip caught", promptHint: "playfully biting the lower lip", term: "biting the lower lip" , adultOnly: true },
-  { id: "lip-state-parted",    label: "Parted",    dimension: "lip-state", description: "Lips slightly parted, breath of air", promptHint: "with lips slightly parted, taking a soft breath", term: "lips slightly parted" , adultOnly: true },
+  { id: "lip-state-bitten",    label: "Bitten",    dimension: "lip-state", description: "Slight playful lip-bite, lower lip caught", promptHint: "lightly biting the lower lip", term: "biting lower lip" , adultOnly: true },
+  { id: "lip-state-parted",    label: "Parted",    dimension: "lip-state", description: "Lips slightly parted, breath of air", promptHint: "with lips relaxed and slightly open, as if mid-sentence", term: "lips slightly open" , adultOnly: true },
   { id: "lip-state-pursed",    label: "Pursed",    dimension: "lip-state", description: "Lips pressed and pushed forward", promptHint: "with lips pursed, pressed and pushed forward", term: "pursed lips" },
   { id: "lip-state-bold-black", label: "Bold Black", dimension: "lip-state", description: "Saturated black lipstick statement (goth / avant-garde)", promptHint: "with a bold, saturated black lipstick statement, goth / avant-garde", term: "bold black lipstick" },
   { id: "lip-state-burgundy",   label: "Burgundy",   dimension: "lip-state", description: "Deep wine-red lipstick", promptHint: "with deep wine-red burgundy lipstick", term: "burgundy lipstick" },
@@ -676,9 +676,9 @@ export const PEOPLE: ReadonlyArray<Person> = [
 
   // -------------------- Eye State (what the eyes are doing / where they look) --------------------
   { id: "eye-state-closed",         label: "Closed",            dimension: "eye-state", description: "Eyes fully closed, peaceful",       promptHint: "with eyes fully closed in a peaceful expression", term: "eyes fully closed" },
-  { id: "eye-state-half-lidded",    label: "Half-lidded",       dimension: "eye-state", description: "Heavy-lidded sleepy gaze",          promptHint: "with heavy half-lidded sleepy eyes", term: "half-lidded sleepy eyes" , adultOnly: true },
+  { id: "eye-state-half-lidded",    label: "Half-lidded",       dimension: "eye-state", description: "Heavy-lidded sleepy gaze",          promptHint: "with drowsy, partly closed eyes, the lids sitting low over the iris", term: "drowsy, partly closed eyes" , adultOnly: true },
   { id: "eye-state-wide-eyed",      label: "Wide-eyed",         dimension: "eye-state", description: "Eyes wide open, alert / surprised", promptHint: "with eyes wide open, alert and surprised" },
-  { id: "eye-state-staring-camera", label: "Staring at Camera", dimension: "eye-state", description: "Direct unbroken eye contact with the lens", promptHint: "staring directly at the camera with unbroken eye contact" },
+  { id: "eye-state-staring-camera", label: "Staring at Camera", dimension: "eye-state", description: "Direct unbroken eye contact with the lens", promptHint: "looking directly into the camera", term: "direct gaze to camera" },
   { id: "eye-state-gazing-away",    label: "Gazing Away",       dimension: "eye-state", description: "Looking off-camera, contemplative", promptHint: "gazing off-camera with a contemplative expression", term: "gazing off-camera" },
   { id: "eye-state-gazing-up",      label: "Gazing Up",         dimension: "eye-state", description: "Eyes raised toward something above", promptHint: "with eyes gazing upward toward something above" },
   { id: "eye-state-gazing-down",    label: "Gazing Down",       dimension: "eye-state", description: "Eyes downcast",                     promptHint: "with eyes downcast, gazing softly downward" },
@@ -697,8 +697,8 @@ export const PEOPLE: ReadonlyArray<Person> = [
   { id: "texture-smooth",     label: "Smooth",      dimension: "skin-texture", description: "Flawless, silky smooth skin", promptHint: "with flawless, silky smooth skin", term: "flawless smooth skin" },
   { id: "texture-wrinkled",   label: "Wrinkled",    dimension: "skin-texture", description: "Aged, deeply lined skin",     promptHint: "with deep wrinkles and aged skin texture", term: "deeply wrinkled aged skin" },
   { id: "texture-goosebumps", label: "Goosebumps",  dimension: "skin-texture", description: "Raised goosebumps on skin",   promptHint: "with goosebumps raised on the skin" },
-  { id: "texture-dewy",       label: "Dewy",        dimension: "skin-texture", description: "Glowing, dewy fresh skin",    promptHint: "with dewy, glowing skin and a fresh sheen", term: "dewy glowing skin" },
-  { id: "texture-glistening", label: "Glistening",  dimension: "skin-texture", description: "Sweat or oil sheen",          promptHint: "with glistening skin, sweat or oil catching the light", term: "glistening skin" , adultOnly: true },
+  { id: "texture-dewy",       label: "Dewy",        dimension: "skin-texture", description: "Glowing, dewy fresh skin",    promptHint: "with dewy, luminous skin", term: "dewy skin" },
+  { id: "texture-glistening", label: "Glistening",  dimension: "skin-texture", description: "Sweat or oil sheen",          promptHint: "with a light glistening sheen on the skin", term: "glistening sheen" , adultOnly: true },
   { id: "texture-weathered",  label: "Weathered",   dimension: "skin-texture", description: "Sun-aged rough skin",         promptHint: "with weathered, sun-worn rough skin", term: "weathered sun-worn skin" },
   { id: "texture-porcelain",  label: "Porcelain",   dimension: "skin-texture", description: "Flawless near-translucent porcelain", promptHint: "with flawless, near-translucent porcelain skin", term: "porcelain skin" },
   { id: "texture-sun-kissed", label: "Sun-kissed",  dimension: "skin-texture", description: "Warm tan with healthy glow",  promptHint: "with sun-kissed skin, warmly tanned with a healthy glow", term: "sun-kissed skin" },
@@ -710,8 +710,8 @@ export const PEOPLE: ReadonlyArray<Person> = [
   { id: "texture-oily",       label: "Oily / Shiny", dimension: "skin-texture", description: "Slight oil sheen on T-zone", promptHint: "with a slight oily sheen across the T-zone", term: "oily shiny skin" , adultOnly: true },
   { id: "texture-matte",      label: "Matte",       dimension: "skin-texture", description: "Poreless matte finish",       promptHint: "with a poreless, matte skin finish", term: "matte skin finish" },
   { id: "texture-blemished",  label: "Blemished",   dimension: "skin-texture", description: "Visible blemishes, real-skin imperfections", promptHint: "with visible blemishes and natural real-skin imperfections", term: "blemished skin" },
-  { id: "texture-baby-soft",  label: "Baby-soft",   dimension: "skin-texture", description: "Smooth, fine-pored youthful skin", promptHint: "with baby-soft, fine-pored, youthful smooth skin", term: "baby-soft skin" },
-  { id: "texture-shower-fresh-wet", label: "Shower-Fresh Wet", dimension: "skin-texture", description: "Just-out-of-shower wet skin with water beads", promptHint: "with just-out-of-the-shower wet skin, water beading on the surface and rolling in slow droplets down the curves of the body", term: "shower-fresh wet skin" , adultOnly: true },
+  { id: "texture-baby-soft",  label: "Baby-soft",   dimension: "skin-texture", description: "Smooth, fine-pored youthful skin", promptHint: "with soft, fine-pored skin", term: "soft fine-pored skin" },
+  { id: "texture-shower-fresh-wet", label: "Shower-Fresh Wet", dimension: "skin-texture", description: "Just-out-of-shower wet skin with water beads", promptHint: "with fresh, water-dappled skin as if just out of the shower", term: "water-dappled skin" , adultOnly: true },
   { id: "texture-acne-scarred", label: "Acne-scarred", dimension: "skin-texture", description: "Visible acne scarring (distinct from blemished — healed scar pattern)", promptHint: "with visible acne scarring, healed pitted-skin texture and uneven surface from past breakouts", term: "acne-scarred skin" },
 
   // -------------------- Distinctive Features --------------------
@@ -741,9 +741,9 @@ export const PEOPLE: ReadonlyArray<Person> = [
   { id: "feature-ear-piercings", label: "Ear Piercings", dimension: "distinctive-features", description: "Multiple stacked ear piercings (cartilage, helix, conch)", promptHint: "with multiple stacked ear piercings — cartilage, helix, and conch", term: "multiple stacked ear piercings" },
   { id: "feature-lip-piercing", label: "Lip Piercing", dimension: "distinctive-features", description: "Lip ring / labret stud", promptHint: "with a lip piercing, a small ring or labret stud at the lip" },
   { id: "feature-nostril-piercing", label: "Nostril Piercing", dimension: "distinctive-features", description: "Single nostril stud or ring", promptHint: "with a single nostril piercing, a small stud or ring at the nostril" },
-  { id: "feature-bare-shoulders", label: "Bare Shoulders", dimension: "distinctive-features", description: "Bare shoulders exposed", promptHint: "with bare shoulders exposed, the line of the collarbone and shoulder muscles uncovered" , adultOnly: true },
-  { id: "feature-collarbone-visible", label: "Collarbone Visible", dimension: "distinctive-features", description: "Prominent collarbone catching light", promptHint: "with a prominent collarbone clearly defined and catching the light", term: "visible collarbone" , adultOnly: true },
-  { id: "feature-midriff-visible", label: "Midriff Visible", dimension: "distinctive-features", description: "Exposed midriff between top and bottom", promptHint: "wearing a cropped style with the midriff visible", term: "visible midriff" , adultOnly: true },
+  { id: "feature-bare-shoulders", label: "Bare Shoulders", dimension: "distinctive-features", description: "Bare shoulders exposed", promptHint: "with the shoulders uncovered", term: "shoulders uncovered" , adultOnly: true },
+  { id: "feature-collarbone-visible", label: "Collarbone Visible", dimension: "distinctive-features", description: "Prominent collarbone catching light", promptHint: "with an open neckline that leaves the collarbones uncovered", term: "open neckline, collarbones uncovered" , adultOnly: true },
+  { id: "feature-midriff-visible", label: "Midriff Visible", dimension: "distinctive-features", description: "Exposed midriff between top and bottom", promptHint: "with a cropped hemline", term: "cropped hemline" , adultOnly: true },
   { id: "feature-navel-visible", label: "Navel Visible", dimension: "distinctive-features", description: "Visible navel on bare stomach", promptHint: "with the navel visible", term: "visible navel" , adultOnly: true },
   { id: "feature-elongated-neck", label: "Elongated Neck", dimension: "distinctive-features", description: "Long swan-like neck", promptHint: "with an elongated, swan-like neck, long and gracefully extended", term: "elongated swan-like neck" },
   { id: "feature-under-eye-circles", label: "Under-Eye Circles", dimension: "distinctive-features", description: "Subtle dark circles under the eyes (distinct from puffy eye-bags)", promptHint: "with subtle dark circles under the eyes", term: "dark under-eye circles" },
@@ -1333,7 +1333,8 @@ function emitIndependentFragments(value: unknown, fragmentFor: PersonFragmentFor
   // "midriff visible" + "navel visible" as separate clauses reads twice as
   // exposed as it is, and stacked with glamour hints it tips borderline draws
   // into content blocks (observed on kie-standard, 2026-07-18 app_reports).
-  // When both are picked, fold them into ONE neutral clause.
+  // When both are picked, fold them into ONE neutral clause
+  // ("with a cropped hemline and the navel showing").
   const midriff = ids.includes("feature-midriff-visible")
   const navel = ids.includes("feature-navel-visible")
   for (const id of ids) {
@@ -1342,7 +1343,7 @@ function emitIndependentFragments(value: unknown, fragmentFor: PersonFragmentFor
       // floored `fragmentFor` (see `emit` in collectPersonFragments) returns
       // "" for a flagged id, so gate the fold on that instead of hardcoding
       // the minor check here.
-      if (id === "feature-midriff-visible" && fragmentFor(id) !== "") out.push("wearing a cropped style, midriff and navel visible")
+      if (id === "feature-midriff-visible" && fragmentFor(id) !== "") out.push("with a cropped hemline and the navel showing")
       continue
     }
     const fragment = fragmentFor(id)

package/src/pose.ts

@@ -105,7 +105,7 @@ 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" , adultOnly: true },
+  { 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" },

package/src/styling.ts

@@ -424,10 +424,10 @@ 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" , adultOnly: true },
+  { 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 and wet, the fabric clinging to the body and dripping water", term: "wet 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" },
@@ -651,6 +651,40 @@ function collectStylingFragments(
   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]
@@ -658,11 +692,13 @@ 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) {
+      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
+        if (croppedSuppressed(item)) continue
         const fragment = emit(item)
         if (fragment) out.push(fragment)
       }