@nodaro/prompts 1.2.1 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodaro/prompts",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "description": "Nodaro's prompt-engineering layer — person/picker catalogs with prompt hints, identity-lock clauses, entity prompt builders, brand presets, and prompt/reference assembly shared by the Nodaro platform and SDK.",
   "type": "module",
   "license": "FSL-1.1-Apache-2.0",

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

@@ -0,0 +1,61 @@
+import { describe, it, expect } from "vitest"
+import { buildPersonHints } from "../person.js"
+import { buildStylingHints } from "../styling.js"
+
+/**
+ * Content-rejection hardening (app_reports batch, 2026-07-18): skin-exposure
+ * and lipstick clauses COMPOUND in providers' output-safety classifiers when
+ * the analyzer fills several overlapping dimensions from one photo. These
+ * tests pin the two de-stacking rules.
+ */
+
+describe("exposure hint collapsing", () => {
+  it("midriff + navel together fold into ONE neutral clause", () => {
+    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"])
+  })
+
+  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.join(" ")).not.toMatch(/bare stomach/i)
+
+    const navelOnly = buildPersonHints({
+      distinctiveFeature: ["feature-navel-visible"],
+    } as never)
+    expect(navelOnly).toContain("with the navel visible")
+    expect(navelOnly.join(" ")).not.toMatch(/bare stomach/i)
+  })
+
+  it("other distinctive features still emit alongside the collapsed pair", () => {
+    const hints = buildPersonHints({
+      distinctiveFeature: [
+        "feature-midriff-visible",
+        "feature-navel-visible",
+        "feature-freckles",
+      ],
+    } as never)
+    expect(hints.filter((h) => /midriff/i.test(h))).toHaveLength(1)
+    expect(hints.length).toBeGreaterThan(1)
+  })
+})
+
+describe("bold-lips cross-catalog dedupe", () => {
+  it("skips makeup-bold-lips when the shared map already carries lip-state-bold-red", () => {
+    const hints = buildStylingHints({
+      makeup: "makeup-bold-lips",
+      lipState: ["lip-state-bold-red"],
+    } as never)
+    expect(hints.join(" ")).not.toMatch(/bold lips/i)
+  })
+
+  it("keeps makeup-bold-lips without the person clause (separate-node consumers)", () => {
+    const hints = buildStylingHints({ makeup: "makeup-bold-lips" } as never)
+    expect(hints.join(" ")).toMatch(/bold lips/i)
+  })
+})

package/src/person.ts

@@ -708,8 +708,8 @@ export const PEOPLE: ReadonlyArray<Person> = [
   { 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" },
   { 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" },
-  { id: "feature-midriff-visible", label: "Midriff Visible", dimension: "distinctive-features", description: "Exposed midriff between top and bottom", promptHint: "with the midriff exposed, a strip of bare stomach visible between the top and the bottom" },
-  { id: "feature-navel-visible", label: "Navel Visible", dimension: "distinctive-features", description: "Visible navel on bare stomach", promptHint: "with a visible navel on a bare stomach" },
+  { 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" },
+  { id: "feature-navel-visible", label: "Navel Visible", dimension: "distinctive-features", description: "Visible navel on bare stomach", promptHint: "with the navel visible" },
   { 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" },
   { 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" },
   { id: "feature-fangs",          label: "Fangs",            dimension: "distinctive-features", description: "Visible fangs (vampire / character archetype)", promptHint: "with visible fangs at the canines, character / vampire archetype" },
@@ -1242,7 +1242,18 @@ export function buildAgeHint(
 function emitIndependentHints(value: unknown): string[] {
   const ids = normalizePickIds(value)
   const out: string[] = []
+  // Skin-exposure clauses COMPOUND in providers' output-safety classifiers:
+  // "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.
+  const midriff = ids.includes("feature-midriff-visible")
+  const navel = ids.includes("feature-navel-visible")
   for (const id of ids) {
+    if (midriff && navel && (id === "feature-midriff-visible" || id === "feature-navel-visible")) {
+      if (id === "feature-midriff-visible") out.push("wearing a cropped style, midriff and navel visible")
+      continue
+    }
     const hint = getPersonPromptHint(id)
     if (hint) out.push(hint)
   }

package/src/styling.ts

@@ -100,6 +100,7 @@ export const STYLINGS: ReadonlyArray<Styling> = [
   { id: "headwear-bandana",      label: "Bandana",       dimension: "headwear", description: "Bandana tied around head", promptHint: "wearing a bandana tied around the head" },
   { id: "headwear-hood",         label: "Hood",          dimension: "headwear", description: "Hooded sweatshirt up",    promptHint: "with a hood pulled up over the head" },
   { id: "headwear-crown",        label: "Crown",         dimension: "headwear", description: "Royal or decorative crown", promptHint: "wearing a crown atop the head" },
+  { id: "headwear-nemes",        label: "Nemes Headdress", dimension: "headwear", description: "Striped pharaonic nemes with uraeus", promptHint: "wearing a striped pharaonic nemes headdress with a golden uraeus cobra at the brow" },
   { id: "headwear-helmet",       label: "Helmet",        dimension: "headwear", description: "Protective helmet",       promptHint: "wearing a helmet" },
   { id: "headwear-veil",         label: "Veil",          dimension: "headwear", description: "Veil draped over face/hair", promptHint: "wearing a veil draped over the head" },
   { id: "headwear-bucket-hat",   label: "Bucket Hat",    dimension: "headwear", description: "Soft-brimmed casual bucket hat", promptHint: "wearing a soft-brimmed casual bucket hat" },
@@ -218,6 +219,7 @@ export const STYLINGS: ReadonlyArray<Styling> = [
   { id: "face-paint-dramatic", label: "Dramatic Face Paint", dimension: "face-paint", description: "Bold artistic face paint",       promptHint: "with dramatic, artistic face paint covering portions of the face" },
   { id: "face-paint-costume",  label: "Costume Paint",     dimension: "face-paint", description: "Cosplay / theatrical paint",       promptHint: "with theatrical costume face paint" },
   { id: "face-paint-tribal",   label: "Tribal Markings",   dimension: "face-paint", description: "Tribal-inspired face markings",    promptHint: "with tribal-inspired face markings" },
+  { id: "face-paint-flag",     label: "Flag Face Paint",   dimension: "face-paint", description: "National flag painted on cheeks, sports-fan", promptHint: "with a national flag painted on the cheeks, sports-fan face paint" },
   { id: "face-paint-warpaint", label: "War Paint",         dimension: "face-paint", description: "Warrior war paint streaks",        promptHint: "with warrior war paint streaked across the face" },
 
   // -------------------- Fabric (clothing material) --------------------
@@ -248,12 +250,14 @@ export const STYLINGS: ReadonlyArray<Styling> = [
   { 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" },
   { id: "outfit-wedding-dress",    label: "Wedding Dress",    dimension: "outfit", description: "White wedding gown",                promptHint: "dressed in a white wedding gown with intricate lace detailing and a sweeping train" },
   { id: "outfit-cocktail-dress",   label: "Cocktail Dress",   dimension: "outfit", description: "Knee-length cocktail dress",        promptHint: "dressed in a sleek knee-length cocktail dress" },
+  { id: "outfit-sundress",         label: "Sundress / Maxi",  dimension: "outfit", description: "Flowy halter-neck sundress / patterned maxi", promptHint: "dressed in a flowy halter-neck sundress with a patterned maxi-length skirt" },
   { id: "outfit-lab-coat",         label: "Lab Coat",         dimension: "outfit", description: "White medical lab coat",            promptHint: "wearing a crisp white lab coat layered over the rest of the clothing" },
   { id: "outfit-scrubs",           label: "Medical Scrubs",   dimension: "outfit", description: "Solid-color medical scrubs",        promptHint: "dressed in solid-color medical scrubs — loose-fit top and matching drawstring pants" },
   { id: "outfit-military",         label: "Military Fatigues", dimension: "outfit", description: "Olive-drab military fatigues",     promptHint: "dressed in olive-drab military fatigues with utility pockets and a sturdy belt" },
   { id: "outfit-lifeguard",        label: "Lifeguard Outfit", dimension: "outfit", description: "Red lifeguard top and shorts",      promptHint: "dressed in a bright red lifeguard outfit — a fitted top and matching shorts" },
   { 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" },
@@ -273,6 +277,7 @@ export const STYLINGS: ReadonlyArray<Styling> = [
   { id: "outfit-pirate",           label: "Pirate",           dimension: "outfit", description: "Pirate costume: tricorn hat, sash, frilly shirt, boots", promptHint: "wearing a pirate costume — a tricorn hat, a frilly shirt with a sash at the waist, and tall leather boots" },
   { id: "outfit-fairy",            label: "Fairy",            dimension: "outfit", description: "Fantasy fairy: gauzy wings, flower crown, ethereal dress", promptHint: "wearing a fantasy fairy costume — gauzy translucent wings, a flower crown, and an ethereal flowing dress" },
   { id: "outfit-mermaid",          label: "Mermaid",          dimension: "outfit", description: "Fantasy mermaid: scaled tail/skirt, shell top, flowing hair", promptHint: "wearing a fantasy mermaid costume — a scaled tail or fitted scaled skirt, a shell top, and long flowing hair" },
+  { id: "outfit-pharaoh",          label: "Pharaoh Regalia",  dimension: "outfit", description: "Ancient Egyptian royalty: usekh collar, pectoral, pleated kilt", promptHint: "wearing ancient Egyptian pharaoh regalia — a broad beaded usekh collar, a jeweled falcon pectoral, and a pleated linen shendyt kilt with golden arm cuffs" },
 
   // -------------------- Top (upper-body garment) --------------------
   { id: "top-tshirt",        label: "T-Shirt",        dimension: "top", description: "Plain crewneck t-shirt",         promptHint: "wearing a fitted plain crewneck t-shirt with short sleeves" },
@@ -385,6 +390,8 @@ export const STYLINGS: ReadonlyArray<Styling> = [
   { id: "state-tucked-in",     label: "Tucked In",       dimension: "wardrobe-state", description: "Top tucked into bottom",    promptHint: "the top neatly tucked into the bottom" },
   { 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" },
   { 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" },
+  { 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" },
+  { 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-unbuttoned",    label: "Unbuttoned",      dimension: "wardrobe-state", description: "Open / unbuttoned",         promptHint: "the outerwear hanging open and unbuttoned, falling loose at the sides" },
   { id: "state-rolled-sleeves", label: "Rolled Sleeves", dimension: "wardrobe-state", description: "Sleeves rolled up forearm", promptHint: "the sleeves rolled up to the forearm" },
   { 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" },
@@ -561,9 +568,21 @@ export function buildStylingHints(
   const pre = typeof data.preText === "string" ? data.preText.trim() : ""
   if (pre) hints.push(pre)
 
+  // The Person catalog's `lip-state-bold-red` and this catalog's
+  // `makeup-bold-lips` say the same thing; consumers that fold BOTH pickers
+  // off one shared value map (person.nodaro.ai's subject fold) double the
+  // lipstick clause. When the shared map shows the person clause already
+  // covers it, skip the makeup twin. Separate-node consumers (platform
+  // workflows) don't carry `lipState` here, so this no-ops for them.
+  const lipStateRaw = (data as Record<string, unknown>).lipState
+  const boldRedAlready = Array.isArray(lipStateRaw)
+    ? lipStateRaw.includes("lip-state-bold-red")
+    : lipStateRaw === "lip-state-bold-red"
+
   for (const dimension of STYLING_DIMENSION_ORDER) {
     const field = STYLING_FIELD_BY_DIMENSION[dimension]
     const raw = data[field]
+    if (dimension === "makeup" && boldRedAlready && raw === "makeup-bold-lips") continue
     // jewelry / wardrobe-state / hair-state are multi-pick (string | string[]);
     // emit each id's hint independently and let the comma-join compose.
     if (typeof raw === "string" && raw.length > 0) {