@nodaro/prompts 1.3.0 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodaro/prompts",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "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/__tests__/seedance-2-inputs.test.ts

@@ -171,3 +171,25 @@ describe("resolveSeedance2Inputs", () => {
     }
   })
 })
+
+describe("promptBindsFirstFrame suffix suppression (overlap colon-position finding)", () => {
+  it("suppresses the trailing sentence when the prompt already binds the first frame", () => {
+    const r = resolveSeedance2Inputs({
+      prompt: "extend @video_1 as follows:use @image_1 as the first frame, it is the last keyframe of @video_1\nbeats",
+      firstFrameUrl: "https://r2/anchor.jpg",
+      refVideoUrls: ["https://r2/ref.mp4"],
+    })
+    expect(r.promptSuffix).toBe("")
+    expect(r.referenceImageUrls).toEqual(["https://r2/anchor.jpg"]) // image still rides
+  })
+
+  it("keeps the sentence for plain prompts and for first+last frame pairs", () => {
+    const plain = resolveSeedance2Inputs({ prompt: "a cat", firstFrameUrl: "https://r2/a.jpg", refVideoUrls: ["https://r2/v.mp4"] })
+    expect(plain.promptSuffix).toContain("opening (first) frame")
+    const both = resolveSeedance2Inputs({
+      prompt: "use @image_1 as the first frame, it is the last keyframe of @video_1",
+      firstFrameUrl: "https://r2/a.jpg", lastFrameUrl: "https://r2/b.jpg", refVideoUrls: ["https://r2/v.mp4"],
+    })
+    expect(both.promptSuffix).toContain("closing (last) frame") // pair sentence kept — last frame has no in-prompt binding
+  })
+})

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/seedance-2-inputs.ts

@@ -4,6 +4,9 @@ import { REF_BINDING } from "./video-reference-resolver.js"
 export type Seedance2Mode = "first-frame" | "first-last-frame" | "reference"
 
 export interface Seedance2InputsArgs {
+  /** The generation prompt — used ONLY to detect an existing first-frame
+   *  binding and suppress the duplicate trailing sentence. */
+  prompt?: string
   firstFrameUrl?: string
   lastFrameUrl?: string
   refImageUrls?: readonly string[]
@@ -37,6 +40,19 @@ const cleanList = (xs?: readonly string[]): string[] =>
  * reference_image_urls (after the user's own images, so their @Image ordinals do
  * not shift) and named in a doctrine-compliant prompt suffix.
  */
+/** True when the prompt ALREADY binds an image as the first/opening frame —
+ *  e.g. the gvp overlap transport's colon-position directive ("use @image_1
+ *  as the first frame, it is the last keyframe of @video_1"). Field finding
+ *  (2026-07-20): the first-frame directive only works adjacent to the extend
+ *  colon; a duplicate sentence at the END of the prompt (this resolver's
+ *  default position) dilutes it back into coin-flip behavior — so when the
+ *  prompt carries its own binding, the suffix is suppressed (the frame image
+ *  itself still rides the reference list). */
+export function promptBindsFirstFrame(prompt: string | undefined): boolean {
+  if (!prompt) return false
+  return /@image_\d+\s+as\s+the\s+(first|opening)\s*(\(first\))?\s*frame/i.test(prompt)
+}
+
 export function resolveSeedance2Inputs(args: Seedance2InputsArgs): Seedance2InputsResult {
   const firstFrameUrl = clean(args.firstFrameUrl)
   const lastFrameUrl = clean(args.lastFrameUrl)
@@ -76,7 +92,10 @@ export function resolveSeedance2Inputs(args: Seedance2InputsArgs): Seedance2Inpu
   if (lastFrameUrl) { referenceImageUrls.push(lastFrameUrl); lastOrdinal = referenceImageUrls.length }
 
   let promptSuffix = ""
-  if (firstOrdinal > 0 && lastOrdinal > 0) {
+  const suppressFrameSentence = promptBindsFirstFrame(args.prompt)
+  if (suppressFrameSentence && firstOrdinal > 0 && lastOrdinal === 0) {
+    // The prompt already binds the first frame at its own (working) position.
+  } else if (firstOrdinal > 0 && lastOrdinal > 0) {
     // Combined sentence — REF_BINDING.frame() emits a single-frame sentence, so use
     // REF_BINDING.ordinal() for each ordinal inline to keep the combined wording AND
     // route both ordinals through the single swap-point.

package/src/styling.ts

@@ -568,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) {