@nodaro/shared 2.12.2 → 2.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodaro/shared",
-  "version": "2.12.2",
+  "version": "2.14.0",
   "description": "Shared types, model catalog, wire contracts, and structural vocabularies for the Nodaro platform and SDK.",
   "type": "module",
   "license": "Apache-2.0",

package/src/__tests__/node-preset-extract.test.ts

@@ -4,6 +4,7 @@ import {
   extractPresetData,
   PRESET_EXCLUDED_KEYS,
   PRESET_APPLY_CLEAR_KEYS,
+  presetApplyClearKeys,
   presetDataMatches,
 } from "../node-preset-extract.js"
 
@@ -164,3 +165,61 @@ describe("presetDataMatches", () => {
     expect(presetDataMatches({ prompt: "a" }, {})).toBe(true)
   })
 })
+
+describe("presetApplyClearKeys", () => {
+  const staticKeys = [...PRESET_APPLY_CLEAR_KEYS]
+  const hasAffixes = (keys: readonly string[]) =>
+    keys.includes("promptPrefix") && keys.includes("promptSuffix")
+
+  it("always includes every static clear key, whatever the preset ships", () => {
+    for (const data of [
+      {},
+      { prompt: "a cat" },
+      { promptPrefix: "Cinematic 35mm still of" },
+      { promptSuffix: ", golden hour" },
+      { prompt: "a cat", promptPrefix: "PRE", promptSuffix: "POST" },
+      { provider: "flux", aspectRatio: "16:9" },
+    ]) {
+      const keys = presetApplyClearKeys(data)
+      for (const k of staticKeys) expect(keys, `${k} missing for ${JSON.stringify(data)}`).toContain(k)
+    }
+  })
+
+  it("owns no prompt content -> does NOT clear the affixes (settings-only preset)", () => {
+    expect(hasAffixes(presetApplyClearKeys({}))).toBe(false)
+    expect(hasAffixes(presetApplyClearKeys({ provider: "flux", seed: 3 }))).toBe(false)
+    // exactly the static set, nothing added
+    expect([...presetApplyClearKeys({ provider: "flux" })].sort()).toEqual([...staticKeys].sort())
+  })
+
+  it("ships `prompt` -> clears BOTH affixes (the stale-prefix hazard)", () => {
+    expect(hasAffixes(presetApplyClearKeys({ prompt: "a cat" }))).toBe(true)
+  })
+
+  it("ships an affix -> clears both affixes (the other one is then re-set by the spread)", () => {
+    expect(hasAffixes(presetApplyClearKeys({ promptPrefix: "PRE" }))).toBe(true)
+    expect(hasAffixes(presetApplyClearKeys({ promptSuffix: "POST" }))).toBe(true)
+  })
+
+  it("ships prompt AND affixes -> clears both affixes", () => {
+    expect(hasAffixes(presetApplyClearKeys({ prompt: "a cat", promptPrefix: "PRE", promptSuffix: "POST" }))).toBe(true)
+  })
+
+  it("never lists `prompt` itself — it is overwritten only when the preset ships it", () => {
+    for (const data of [{}, { prompt: "a cat" }, { promptPrefix: "PRE" }]) {
+      expect(presetApplyClearKeys(data)).not.toContain("prompt")
+    }
+  })
+
+  it("treats an explicit `undefined` value as NOT owning prompt content", () => {
+    expect(hasAffixes(presetApplyClearKeys({ prompt: undefined }))).toBe(false)
+    expect(hasAffixes(presetApplyClearKeys({ promptPrefix: undefined }))).toBe(false)
+  })
+
+  it("does not mutate PRESET_APPLY_CLEAR_KEYS", () => {
+    presetApplyClearKeys({ prompt: "a cat" })
+    expect([...PRESET_APPLY_CLEAR_KEYS].sort()).toEqual([...staticKeys].sort())
+    expect(PRESET_APPLY_CLEAR_KEYS).not.toContain("promptPrefix")
+    expect(PRESET_APPLY_CLEAR_KEYS).not.toContain("promptSuffix")
+  })
+})

package/src/__tests__/prompt-affixes.test.ts

@@ -0,0 +1,32 @@
+import { describe, it, expect } from "vitest"
+import { PROMPT_PREFIX_KEY, PROMPT_SUFFIX_KEY, readPromptAffixes } from "../prompt-affixes.js"
+
+describe("prompt-affixes keys", () => {
+  it("names the node-data keys", () => {
+    expect(PROMPT_PREFIX_KEY).toBe("promptPrefix")
+    expect(PROMPT_SUFFIX_KEY).toBe("promptSuffix")
+  })
+})
+
+describe("readPromptAffixes", () => {
+  it("returns both affixes when set", () =>
+    expect(readPromptAffixes({ promptPrefix: "PRE", promptSuffix: "POST" })).toEqual({ prefix: "PRE", suffix: "POST" }))
+  it("omits blank / non-string values", () =>
+    expect(readPromptAffixes({ promptPrefix: "   ", promptSuffix: 42 })).toEqual({}))
+  it("omits absent keys", () => expect(readPromptAffixes({ prompt: "x" })).toEqual({}))
+  it("keeps internal/trailing whitespace of a non-blank affix verbatim", () =>
+    expect(readPromptAffixes({ promptPrefix: "RULES:\n\n" })).toEqual({ prefix: "RULES:\n\n" }))
+})
+
+/**
+ * Presets capture the affixes for free: `extractPresetData` strips only
+ * PRESET_EXCLUDED_KEYS + EXECUTION_DATA_KEYS, and the affix keys are in
+ * neither. This test pins that contract so a future addition to either
+ * exclusion set can't silently drop pre/post text from saved presets.
+ */
+import { extractPresetData } from "../node-preset-extract.js"
+describe("presets capture prompt affixes", () => {
+  it("extractPresetData keeps promptPrefix/promptSuffix", () =>
+    expect(extractPresetData({ prompt: "p", promptPrefix: "PRE", promptSuffix: "POST", label: "x", executionStatus: "running" }))
+      .toEqual({ prompt: "p", promptPrefix: "PRE", promptSuffix: "POST" }))
+})

package/src/__tests__/video-analysis-catalog-sync.test.ts

@@ -160,9 +160,11 @@ describe("bare video-analysis node-type credit id", () => {
     // trued up every tier's judge/refine terms), 355 wrote 2068: the
     // recast shot-craft Stage-1 doctrine (transitions + on-screen text, three
     // required wire fields) grew the analyser's system prompt, moving the
-    // plugin's token pin 8_203 -> 8_482, and 356 wrote 2071: Stage 1.3 grew
-    // that prompt again, moving the pin 8_482 -> 8_706.
-    expect(ceiling).toBe(2071)
+    // plugin's token pin 8_203 -> 8_482, 356 wrote 2071: Stage 1.3 grew
+    // that prompt again, moving the pin 8_482 -> 8_706, and 357 wrote 2076:
+    // the transition vocabulary v2 doctrine (twelve named values; absent =
+    // nothing asserted) grew it once more, moving the pin 8_706 -> 9_082.
+    expect(ceiling).toBe(2076)
   })
 
   it("the bare id still bounds the default tier at the ceiling bucket", () => {

package/src/__tests__/video-analysis-pricing.test.ts

@@ -178,12 +178,12 @@ describe("video-audit-pricing", () => {
   })
 
   it("videoAuditCreditsForBucket: table lookup by resolved bucket + family, snapping a raw duration onto the ladder", () => {
-    expect(videoAuditCreditsForBucket(60, false)).toBe(214)
-    expect(videoAuditCreditsForBucket(60, true)).toBe(394)
+    expect(videoAuditCreditsForBucket(60, false)).toBe(215)
+    expect(videoAuditCreditsForBucket(60, true)).toBe(396)
     expect(videoAuditCreditsForBucket(180, false)).toBe(290)
-    expect(videoAuditCreditsForBucket(360, false)).toBe(661)
-    expect(videoAuditCreditsForBucket(600, false)).toBe(1070)
-    expect(videoAuditCreditsForBucket(600, true)).toBe(1917)
+    expect(videoAuditCreditsForBucket(360, false)).toBe(663)
+    expect(videoAuditCreditsForBucket(600, false)).toBe(1073)
+    expect(videoAuditCreditsForBucket(600, true)).toBe(1921)
     // Not just exact ladder values — a raw duration snaps up to its bucket.
     expect(videoAuditCreditsForBucket(70, false)).toBe(VIDEO_AUDIT_BUCKET_CREDITS["video-audit:180s"])
     expect(videoAuditCreditsForBucket(9999, true)).toBe(VIDEO_AUDIT_BUCKET_CREDITS["video-audit:auto:600s"])
@@ -224,8 +224,8 @@ describe("video-audit-pricing", () => {
     // 600s bucket here, same convention as VIDEO_ANALYSIS_BUCKET_CREDITS).
     expect(Object.keys(VIDEO_AUDIT_BUCKET_CREDITS)).toHaveLength(8)
     // Bare-id values quoted in the task/catalog must equal each family's 600s ceiling.
-    expect(VIDEO_AUDIT_BUCKET_CREDITS["video-audit:600s"]).toBe(1070)
-    expect(VIDEO_AUDIT_BUCKET_CREDITS["video-audit:auto:600s"]).toBe(1917)
+    expect(VIDEO_AUDIT_BUCKET_CREDITS["video-audit:600s"]).toBe(1073)
+    expect(VIDEO_AUDIT_BUCKET_CREDITS["video-audit:auto:600s"]).toBe(1921)
   })
 
   it("auto family = base family + the gemini-3-flash (legacy fast tier) row at the same bucket, exactly — single-source, never hand-added", () => {

package/src/__tests__/video-analysis-shot-craft.test.ts

@@ -8,10 +8,16 @@ const scene = { startSec: 0, endSec: 4, label: "hook", shotType: "Wide", camera:
 const slot = { slotId: "a", label: "A", source: "wired-character", role: "person", description: "d" }
 
 describe("shot-craft fields (keys only)", () => {
-  it("adds a text-kind vocabulary and a clip transition-in vocabulary without widening the transition enum", () => {
+  it("adds a text-kind vocabulary and a clip transition-in vocabulary; the transition enum is v2 (rev 1.5)", () => {
     expect(VIDEO_ANALYSIS_TEXT_KINDS).toEqual(["title", "caption", "lower-third", "subtitle", "logo", "other"])
     expect(VIDEO_ANALYSIS_CLIP_TRANSITIONS_IN).toEqual(["fade"])
-    expect(VIDEO_ANALYSIS_TRANSITIONS).toEqual(["cut", "fade", "dissolve", "wipe", "whip"])
+    // Stage 1 shipped "keys only, no enum widened" (a lagging client rejects an
+    // unknown VALUE). Rev 1.5 (2026-08-30) widens it on purpose — sequenced
+    // behind the client bump — so this pin now tracks the v2 vocabulary.
+    expect(VIDEO_ANALYSIS_TRANSITIONS).toEqual([
+      "cut", "fade", "dissolve", "wipe", "whip",
+      "zoom", "slide", "white-flash", "digital-glitch", "morph", "match", "jump",
+    ])
   })
   it("window and result accept transitionIn at the CLIP level and onScreenTextKind on a scene", () => {
     const w = windowAnalysisSchema.parse({ transitionIn: "fade", slots: [slot], scenes: [{ ...scene, onScreenText: "HELLO", onScreenTextKind: "title", transitionOut: "cut" }] })

package/src/__tests__/video-analysis.test.ts

@@ -275,6 +275,18 @@ describe("cinematography fields (angle / speed / onScreenText / look)", () => {
     }
   })
 
+  it("vocabulary v2 carries the twelve common edits, and the wire neutral is not a member", () => {
+    // rev 1.5 Appendix F: absent = nothing asserted; `none` is wire-local to the
+    // analyser's roll schema and must never reach the canonical enum.
+    expect([...VIDEO_ANALYSIS_TRANSITIONS]).toEqual([
+      "cut", "fade", "dissolve", "wipe", "whip",
+      "zoom", "slide", "white-flash", "digital-glitch", "morph", "match", "jump",
+    ])
+    expect(VIDEO_ANALYSIS_TRANSITIONS).not.toContain("none" as never)
+    expect(windowAnalysisSchema.safeParse({ slots: [slot], scenes: [{ ...baseScene, transitionOut: "none" }] }).success).toBe(false)
+    expect(windowAnalysisSchema.safeParse({ slots: [slot], scenes: [{ ...baseScene }] }).success).toBe(true)
+  })
+
   it("marks the viewpoints where no face is visible — auto-cast reads this", () => {
     // A reference frame shot from behind cannot cast a face, however well framed.
     expect([...VIDEO_ANALYSIS_FACELESS_ANGLES].sort()).toEqual(["from-behind", "over-the-shoulder"])

package/src/catalog-projection.ts

@@ -44,5 +44,8 @@ export interface ProjectedCatalog {
   options?: ProjectedCatalogOption[]
   /** multi-dim catalogs. */
   fields?: readonly string[]
+  /** Per-field option lists. Multi-dim catalogs always carry these; a
+   *  single-dim catalog carries them when it has secondary parameter
+   *  fields beside its main picker (transition position/duration/intensity). */
   dimensions?: ProjectedCatalogDimension[]
 }

package/src/extra-refs.ts

@@ -38,6 +38,13 @@ import type { ConnectedReference } from "./types.js"
  *  the backend (which sees node data as `Record<string, unknown>`) can pass
  *  raw JSON through `expandExtraRefsToConnectedReferences`. */
 export interface ExtraRefInput {
+  /**
+   * Stable id of this extra reference, when the row has one. What a
+   * `{ref:<id>}` token in the prompt names; passed through to the shared video
+   * resolver's slot map by both the canvas and the orchestrator. Absent → the
+   * row still numbers normally but cannot be addressed by id.
+   */
+  readonly id?: string
   readonly url?: string
   readonly description?: string
   readonly characterSlug?: string

package/src/i18n/composition-effects.ar.ts

@@ -1,6 +1,7 @@
 import type { LocaleCatalogMap } from "./types.js"
 
 const map: LocaleCatalogMap = {
+  "none": { label: "بدون", description: "بدون تأثير تركيبي" },
   "bursting-through-frame": { label: "اختراق الإطار", description: "تمزق ورقي ثلاثي الأبعاد يكسر الإطار" },
   "breaking-out-of-frame": { label: "الخروج من الإطار", description: "طرف يمتد خارج حدود اللوحة" },
   "pixel-disintegration": { label: "تفكك بكسلي", description: "الموضوع يتحلل إلى جسيمات" },
@@ -14,7 +15,6 @@ const map: LocaleCatalogMap = {
   "floating-fragments": { label: "شظايا عائمة", description: "أجزاء من الجسم تنجرف بعيدا" },
   "silhouette-outline": { label: "ظل خارجي", description: "ظل أسود نقي على خلفية مسطحة" },
   "exploding-particles": { label: "جسيمات منفجرة", description: "الخط الخارجي يتطاير إلى جسيمات" },
-  "3x3-grid-collage": { label: "كولاج شبكة 3×3", description: "مونتاج تسع وضعيات على ورقة اتصال" },
 
   "matte-painting": { label: "رسم Matte", description: "خلفية مرسومة بـ Matte مدمجة مع Live Action" },
   "double-exposure": { label: "تعريض مزدوج", description: "تعريضان فوتوغرافيان متراكبان مدمجان" },

package/src/i18n/composition-effects.de.ts

@@ -1,6 +1,7 @@
 import type { LocaleCatalogMap } from "./types.js"
 
 const map: LocaleCatalogMap = {
+  "none": { label: "Keiner", description: "Kein Kompositionseffekt" },
   "bursting-through-frame": { label: "Durch den Rahmen brechen", description: "3D-Papierriss durchbricht den Rahmen" },
   "breaking-out-of-frame": { label: "Aus dem Rahmen ausbrechen", description: "Glied erstreckt sich über den Bildrand" },
   "pixel-disintegration": { label: "Pixel-Zerfall", description: "Motiv löst sich in Partikel auf" },
@@ -14,7 +15,6 @@ const map: LocaleCatalogMap = {
   "floating-fragments": { label: "Schwebende Fragmente", description: "Körper schwebt teilweise davon" },
   "silhouette-outline": { label: "Silhouetten-Umriss", description: "Saubere schwarze Silhouette auf flachem Hintergrund" },
   "exploding-particles": { label: "Explodierende Partikel", description: "Umriss zerstreut sich in Partikel" },
-  "3x3-grid-collage": { label: "3x3-Raster-Collage", description: "Kontaktbogen mit 9 Posen-Montage" },
   "matte-painting": { label: "Matte Painting", description: "Kompositiertes Matte-Painting-Hintergrund mit Live-Action verbunden" },
   "double-exposure": { label: "Doppelbelichtung", description: "Zwei geschichtete fotografische Belichtungen verschmolzen" },
   "multiple-exposure": { label: "Mehrfachbelichtung", description: "Drei oder mehr übereinander gestapelte Belichtungen" },

package/src/i18n/composition-effects.es.ts

@@ -1,6 +1,7 @@
 import type { LocaleCatalogMap } from "./types.js"
 
 const map: LocaleCatalogMap = {
+  "none": { label: "Ninguno", description: "Sin efecto de composición" },
   "bursting-through-frame": { label: "Atravesando el Marco", description: "Rasgado de papel 3D rompiendo el marco" },
   "breaking-out-of-frame": { label: "Rompiendo el Marco", description: "Extremidad se extiende más allá del borde del lienzo" },
   "pixel-disintegration": { label: "Desintegración de Píxeles", description: "Sujeto disolviéndose en partículas" },
@@ -14,7 +15,6 @@ const map: LocaleCatalogMap = {
   "floating-fragments": { label: "Fragmentos Flotantes", description: "Cuerpo derivando parcialmente" },
   "silhouette-outline": { label: "Silueta Contorno", description: "Silueta negra limpia sobre fondo plano" },
   "exploding-particles": { label: "Partículas Explotando", description: "Contorno disipándose en partículas" },
-  "3x3-grid-collage": { label: "Collage en Cuadrícula 3x3", description: "Montaje tipo hoja de contactos de 9 poses" },
 
   // -------------------- Round 2 --------------------
   "matte-painting": { label: "Matte Painting", description: "Fondo de matte painting compuesto y mezclado con acción real" },

package/src/i18n/composition-effects.fr.ts

@@ -1,6 +1,7 @@
 import type { LocaleCatalogMap } from "./types.js"
 
 const map: LocaleCatalogMap = {
+  "none": { label: "Aucun", description: "Aucun effet de composition" },
   "bursting-through-frame": { label: "Surgissant à travers le cadre", description: "Déchirure de papier 3D brisant le cadre" },
   "breaking-out-of-frame": { label: "Sortant du cadre", description: "Membre s'étendant au-delà de la bordure du tableau" },
   "pixel-disintegration": { label: "Désintégration en pixels", description: "Sujet se dissolvant en particules" },
@@ -14,7 +15,6 @@ const map: LocaleCatalogMap = {
   "floating-fragments": { label: "Fragments flottants", description: "Corps se dispersant partiellement" },
   "silhouette-outline": { label: "Silhouette en contour", description: "Silhouette noire nette sur fond uni" },
   "exploding-particles": { label: "Particules explosives", description: "Contour se dispersant en particules" },
-  "3x3-grid-collage": { label: "Collage en grille 3x3", description: "Montage planche-contact de 9 poses" },
   "matte-painting": { label: "Matte painting", description: "Fond peint en matte painting fondu avec prise de vue réelle" },
   "double-exposure": { label: "Double exposition", description: "Deux expositions photographiques superposées et fondues" },
   "multiple-exposure": { label: "Exposition multiple", description: "Trois expositions ou plus empilées" },

package/src/i18n/composition-effects.he.ts

@@ -1,6 +1,7 @@
 import type { LocaleCatalogMap } from "./types.js"
 
 const map: LocaleCatalogMap = {
+  "none": { label: "ללא", description: "ללא אפקט קומפוזיציה" },
   "bursting-through-frame": { label: "פורץ דרך הפריים", description: "קריעת נייר תלת-ממדית הפורצת את הפריים" },
   "breaking-out-of-frame": { label: "פורץ מחוץ לפריים", description: "גף נמתח מעבר לגבול הקנבס" },
   "pixel-disintegration": { label: "פירוק לפיקסלים", description: "סובייקט מתפרק לחלקיקים" },
@@ -14,7 +15,6 @@ const map: LocaleCatalogMap = {
   "floating-fragments": { label: "שברים מרחפים", description: "גוף נסחף חלקית" },
   "silhouette-outline": { label: "מתאר צללית", description: "צללית שחורה נקייה על רקע שטוח" },
   "exploding-particles": { label: "חלקיקים מתפוצצים", description: "מתאר מתפזר לחלקיקים" },
-  "3x3-grid-collage": { label: "קולאז' רשת 3x3", description: "מונטז' של 9 פוזות בסגנון contact sheet" },
   "matte-painting": { label: "Matte Painting", description: "רקע matte-painting מורכב מעורב עם צילום חי" },
   "double-exposure": { label: "חשיפה כפולה", description: "שתי חשיפות צילום שכבתיות מוזגות" },
   "multiple-exposure": { label: "חשיפה מרובה", description: "שלוש חשיפות או יותר מוערמות" },

package/src/i18n/composition-effects.hi.ts

@@ -1,6 +1,7 @@
 import type { LocaleCatalogMap } from "./types.js"
 
 const map: LocaleCatalogMap = {
+  "none": { label: "कोई नहीं", description: "कोई composition effect नहीं" },
   "bursting-through-frame": { label: "Frame से बाहर निकलता हुआ", description: "Frame को तोड़ता 3D paper-tear" },
   "breaking-out-of-frame": { label: "Frame से बाहर निकलना", description: "अंग canvas की सीमा से बाहर निकलता है" },
   "pixel-disintegration": { label: "Pixel Disintegration", description: "Subject कणों में घुलता हुआ" },
@@ -14,7 +15,6 @@ const map: LocaleCatalogMap = {
   "floating-fragments": { label: "तैरते टुकड़े", description: "बदन आंशिक रूप से दूर बहता हुआ" },
   "silhouette-outline": { label: "Silhouette की रेखा", description: "Flat BG पर साफ़ काला silhouette" },
   "exploding-particles": { label: "विस्फोटक कण", description: "रेखा कणों में बिखर रही है" },
-  "3x3-grid-collage": { label: "3x3 Grid Collage", description: "Contact-sheet 9-pose montage" },
 
   // -------------------- Round 2 --------------------
   "matte-painting": { label: "Matte Painting", description: "Live action के साथ blended composite matte-painted background" },

package/src/i18n/composition-effects.ja.ts

@@ -1,6 +1,7 @@
 import type { LocaleCatalogMap } from "./types.js"
 
 const map: LocaleCatalogMap = {
+  "none": { label: "なし", description: "構図エフェクトなし" },
   "bursting-through-frame": { label: "フレームを突き破る", description: "フレームを破る3D紙破り効果" },
   "breaking-out-of-frame": { label: "フレームから飛び出す", description: "手足がキャンバスの境界を越える" },
   "pixel-disintegration": { label: "ピクセル崩壊", description: "粒子に溶け込む被写体" },
@@ -14,7 +15,6 @@ const map: LocaleCatalogMap = {
   "floating-fragments": { label: "浮かぶ断片", description: "体が部分的に漂い去る" },
   "silhouette-outline": { label: "シルエットの輪郭", description: "フラットな背景上の真っ黒なシルエット" },
   "exploding-particles": { label: "爆発する粒子", description: "粒子に飛散する輪郭" },
-  "3x3-grid-collage": { label: "3×3グリッド・コラージュ", description: "コンタクトシート風の9ポーズモンタージュ" },
 
   // Additional composition effects
   "matte-painting": { label: "マットペインティング", description: "実写と合成されたマットペイントの背景" },

package/src/i18n/composition-effects.ko.ts

@@ -1,6 +1,7 @@
 import type { LocaleCatalogMap } from "./types.js"
 
 const map: LocaleCatalogMap = {
+  "none": { label: "없음", description: "구도 효과 없음" },
   "bursting-through-frame": { label: "프레임을 뚫고 나오기", description: "프레임을 찢고 나오는 3D 페이퍼-티어 효과입니다" },
   "breaking-out-of-frame": { label: "프레임 밖으로 나오기", description: "사지가 캔버스 경계 너머로 뻗어 나옵니다" },
   "pixel-disintegration": { label: "픽셀 디스인테그레이션", description: "피사체가 입자로 분해되어 흩어집니다" },
@@ -14,7 +15,6 @@ const map: LocaleCatalogMap = {
   "floating-fragments": { label: "플로팅 프래그먼츠", description: "몸이 부분적으로 떠다니며 흩어집니다" },
   "silhouette-outline": { label: "실루엣 아웃라인", description: "평면 배경 위의 깔끔한 검은 실루엣입니다" },
   "exploding-particles": { label: "익스플로딩 파티클", description: "윤곽이 입자로 흩뿌려집니다" },
-  "3x3-grid-collage": { label: "3x3 그리드 콜라주", description: "9 포즈 콘택트 시트 몽타주입니다" },
 
   // Additional composition effects
   "matte-painting": { label: "매트 페인팅", description: "라이브 액션과 합성된 매트 페인팅 배경입니다" },

package/src/i18n/composition-effects.pt-BR.ts

@@ -1,6 +1,7 @@
 import type { LocaleCatalogMap } from "./types.js"
 
 const map: LocaleCatalogMap = {
+  "none": { label: "Nenhum", description: "Sem efeito de composição" },
   "bursting-through-frame": { label: "Rompendo o Quadro", description: "Rasgo de papel 3D quebrando o quadro" },
   "breaking-out-of-frame": { label: "Saindo do Quadro", description: "Membro se estende além da borda do quadro" },
   "pixel-disintegration": { label: "Desintegração em Pixels", description: "Sujeito se dissolvendo em partículas" },
@@ -14,7 +15,6 @@ const map: LocaleCatalogMap = {
   "floating-fragments": { label: "Fragmentos Flutuando", description: "Corpo se afastando parcialmente em pedaços" },
   "silhouette-outline": { label: "Contorno em Silhueta", description: "Silhueta preta limpa sobre fundo plano" },
   "exploding-particles": { label: "Partículas Explodindo", description: "Contorno se desfazendo em partículas" },
-  "3x3-grid-collage": { label: "Colagem em Grade 3x3", description: "Folha-contato com 9 poses" },
   "matte-painting": { label: "Matte Painting", description: "Fundo composto em matte painting integrado a captação real" },
   "double-exposure": { label: "Dupla Exposição", description: "Duas exposições fotográficas sobrepostas e fundidas" },
   "multiple-exposure": { label: "Múltipla Exposição", description: "Três ou mais exposições empilhadas" },

package/src/i18n/composition-effects.ru.ts

@@ -1,6 +1,7 @@
 import type { LocaleCatalogMap } from "./types.js"
 
 const map: LocaleCatalogMap = {
+  "none": { label: "Нет", description: "Без композиционного эффекта" },
   "bursting-through-frame": {
     label: "Прорыв сквозь рамку",
     description: "3D-эффект разорванной бумаги, ломающий рамку",
@@ -53,10 +54,6 @@ const map: LocaleCatalogMap = {
     label: "Взрыв частиц",
     description: "Контур разлетается на частицы",
   },
-  "3x3-grid-collage": {
-    label: "Коллаж 3×3",
-    description: "Контактный лист из 9 поз",
-  },
   "matte-painting": {
     label: "Маттовая живопись",
     description: "Композитный нарисованный матовый фон, смешанный с живой съёмкой",

package/src/i18n/composition-effects.zh-CN.ts

@@ -1,6 +1,7 @@
 import type { LocaleCatalogMap } from "./types.js"
 
 const map: LocaleCatalogMap = {
+  "none": { label: "无", description: "无构图效果" },
   "bursting-through-frame":   { label: "撕纸破框",       description: "3D 撕纸效果冲破画框" },
   "breaking-out-of-frame":    { label: "破出画框",       description: "肢体伸出画布边缘" },
   "pixel-disintegration":     { label: "像素崩解",       description: "主体崩解为颗粒" },
@@ -14,7 +15,6 @@ const map: LocaleCatalogMap = {
   "floating-fragments":       { label: "漂浮碎片",       description: "身体部分飘散远去" },
   "silhouette-outline":       { label: "剪影轮廓",       description: "纯色背景上的干净黑剪影" },
   "exploding-particles":      { label: "粒子爆裂",       description: "轮廓向外炸成颗粒" },
-  "3x3-grid-collage":         { label: "3x3 网格拼贴",   description: "9 格姿势接触印样拼贴" },
   "matte-painting":           { label: "接景绘画",       description: "接景背景与实拍画面合成" },
   "double-exposure":          { label: "二次曝光",       description: "两层摄影曝光叠合" },
   "multiple-exposure":        { label: "多重曝光",       description: "三次或更多次曝光叠合" },

package/src/index.ts

@@ -912,7 +912,9 @@ export {
   describeNodeAdjustments,
 } from "./normalize-node-params.js"
 export type { NodeParamAdjustment, NormalizedNodes } from "./normalize-node-params.js"
-export { extractPresetData, PRESET_EXCLUDED_KEYS, PRESET_APPLY_CLEAR_KEYS, presetDataMatches } from "./node-preset-extract.js"
+export { extractPresetData, PRESET_EXCLUDED_KEYS, PRESET_APPLY_CLEAR_KEYS, presetApplyClearKeys, presetDataMatches } from "./node-preset-extract.js"
+export { PROMPT_PREFIX_KEY, PROMPT_SUFFIX_KEY, readPromptAffixes } from "./prompt-affixes.js"
+export type { PromptAffixFields, PromptAffixes } from "./prompt-affixes.js"
 
 // --- Factory prompt-snippets (reusable inline prompt fragments) ---
 

package/src/model-catalog.ts

@@ -1971,11 +1971,11 @@ const VIDEO_MODELS: Record<string, ModelCatalogEntry> = {
     description: "Legacy fast-tier analysis model (pre-2026-07). Kept so stored raw-model configs keep running and keep pricing under their own identifier; new fast-tier runs use the current fast model.",
     useCases: ["video-analysis", "shot-list", "fast"],
     pricing: [
-      { identifier: "video-analysis:gemini-3-flash", credits: 847, note: "10-min ceiling (no duration given)" },
-      { identifier: "video-analysis:gemini-3-flash:60s", credits: 180 },
+      { identifier: "video-analysis:gemini-3-flash", credits: 848, note: "10-min ceiling (no duration given)" },
+      { identifier: "video-analysis:gemini-3-flash:60s", credits: 181 },
       { identifier: "video-analysis:gemini-3-flash:180s", credits: 185 },
       { identifier: "video-analysis:gemini-3-flash:360s", credits: 515 },
-      { identifier: "video-analysis:gemini-3-flash:600s", credits: 847, note: "10-min ceiling" },
+      { identifier: "video-analysis:gemini-3-flash:600s", credits: 848, note: "10-min ceiling" },
     ],
   },
   "gemini-3.6-flash-video-analysis": {
@@ -1988,11 +1988,11 @@ const VIDEO_MODELS: Record<string, ModelCatalogEntry> = {
     description: "Analyze a video into a structured shot list (scenes, camera, audio) — fast, economy tier. Billed per duration bucket.",
     useCases: ["video-analysis", "shot-list", "fast"],
     pricing: [
-      { identifier: "video-analysis:gemini-3.6-flash", credits: 990, note: "10-min ceiling (no duration given)" },
+      { identifier: "video-analysis:gemini-3.6-flash", credits: 992, note: "10-min ceiling (no duration given)" },
       { identifier: "video-analysis:gemini-3.6-flash:60s", credits: 204 },
-      { identifier: "video-analysis:gemini-3.6-flash:180s", credits: 218 },
-      { identifier: "video-analysis:gemini-3.6-flash:360s", credits: 600 },
-      { identifier: "video-analysis:gemini-3.6-flash:600s", credits: 990, note: "10-min ceiling" },
+      { identifier: "video-analysis:gemini-3.6-flash:180s", credits: 219 },
+      { identifier: "video-analysis:gemini-3.6-flash:360s", credits: 602 },
+      { identifier: "video-analysis:gemini-3.6-flash:600s", credits: 992, note: "10-min ceiling" },
     ],
   },
   "gemini-3.1-pro-video-analysis": {
@@ -2005,11 +2005,11 @@ const VIDEO_MODELS: Record<string, ModelCatalogEntry> = {
     description: "Analyze a video into a structured shot list (scenes, camera, audio) — higher-fidelity, default tier. Billed per duration bucket.",
     useCases: ["video-analysis", "shot-list", "cinematic"],
     pricing: [
-      { identifier: "video-analysis:gemini-3.1-pro", credits: 1053, note: "10-min ceiling (no duration given)" },
+      { identifier: "video-analysis:gemini-3.1-pro", credits: 1056, note: "10-min ceiling (no duration given)" },
       { identifier: "video-analysis:gemini-3.1-pro:60s", credits: 216 },
       { identifier: "video-analysis:gemini-3.1-pro:180s", credits: 232 },
-      { identifier: "video-analysis:gemini-3.1-pro:360s", credits: 639 },
-      { identifier: "video-analysis:gemini-3.1-pro:600s", credits: 1053, note: "10-min ceiling" },
+      { identifier: "video-analysis:gemini-3.1-pro:360s", credits: 640 },
+      { identifier: "video-analysis:gemini-3.1-pro:600s", credits: 1056, note: "10-min ceiling" },
     ],
   },
   // Both mixed tiers are variants of the same advanced multi-engine analysis
@@ -2025,11 +2025,11 @@ const VIDEO_MODELS: Record<string, ModelCatalogEntry> = {
     description: "Our most advanced analysis tier — multiple analysis engines combined into one result for maximum completeness and accuracy. Billed per duration bucket.",
     useCases: ["video-analysis", "shot-list", "premium", "most-complete"],
     pricing: [
-      { identifier: "video-analysis:mixed", credits: 1174, note: "10-min ceiling (no duration given)" },
-      { identifier: "video-analysis:mixed:60s", credits: 269 },
-      { identifier: "video-analysis:mixed:180s", credits: 290 },
-      { identifier: "video-analysis:mixed:360s", credits: 727 },
-      { identifier: "video-analysis:mixed:600s", credits: 1174, note: "10-min ceiling" },
+      { identifier: "video-analysis:mixed", credits: 1177, note: "10-min ceiling (no duration given)" },
+      { identifier: "video-analysis:mixed:60s", credits: 270 },
+      { identifier: "video-analysis:mixed:180s", credits: 291 },
+      { identifier: "video-analysis:mixed:360s", credits: 729 },
+      { identifier: "video-analysis:mixed:600s", credits: 1177, note: "10-min ceiling" },
     ],
   },
   // SMART — the accuracy tier. Since the 2026-08-03 hybrid re-plan it is a
@@ -2047,11 +2047,11 @@ const VIDEO_MODELS: Record<string, ModelCatalogEntry> = {
     description: "Highest-accuracy analysis — a hybrid pass that blends a native skeleton read with several donor analysis rolls, then always refines the merged result to find shot boundaries and identify the cast by appearance. Best choice when the shot list will drive regeneration. Billed per duration bucket.",
     useCases: ["video-analysis", "shot-list", "premium", "most-accurate"],
     pricing: [
-      { identifier: "video-analysis:smart", credits: 2071, note: "10-min ceiling (no duration given)" },
-      { identifier: "video-analysis:smart:60s", credits: 412 },
-      { identifier: "video-analysis:smart:180s", credits: 502 },
-      { identifier: "video-analysis:smart:360s", credits: 1264 },
-      { identifier: "video-analysis:smart:600s", credits: 2071, note: "10-min ceiling" },
+      { identifier: "video-analysis:smart", credits: 2076, note: "10-min ceiling (no duration given)" },
+      { identifier: "video-analysis:smart:60s", credits: 413 },
+      { identifier: "video-analysis:smart:180s", credits: 503 },
+      { identifier: "video-analysis:smart:360s", credits: 1267 },
+      { identifier: "video-analysis:smart:600s", credits: 2076, note: "10-min ceiling" },
     ],
   },
   // ── AI Audit (`video-audit`) ── a SEPARATE node from video-analysis (own
@@ -2075,11 +2075,11 @@ const VIDEO_MODELS: Record<string, ModelCatalogEntry> = {
     description: "Re-watches a clip against a wired analysis, applies video-verified corrections under guards, and returns a disclosed report of what changed. Billed per duration bucket.",
     useCases: ["video-audit", "qa", "shot-list", "verification"],
     pricing: [
-      { identifier: "video-audit", credits: 1070, note: "10-min ceiling (no duration given)" },
-      { identifier: "video-audit:60s", credits: 214 },
+      { identifier: "video-audit", credits: 1073, note: "10-min ceiling (no duration given)" },
+      { identifier: "video-audit:60s", credits: 215 },
       { identifier: "video-audit:180s", credits: 290 },
-      { identifier: "video-audit:360s", credits: 661 },
-      { identifier: "video-audit:600s", credits: 1070, note: "10-min ceiling" },
+      { identifier: "video-audit:360s", credits: 663 },
+      { identifier: "video-audit:600s", credits: 1073, note: "10-min ceiling" },
     ],
   },
   "video-audit-auto": {
@@ -2091,11 +2091,11 @@ const VIDEO_MODELS: Record<string, ModelCatalogEntry> = {
     description: "Same video-verified audit as AI Audit, but auto-runs a fast analysis first when none is wired in, then applies corrections under guards and returns a disclosed report. Billed per duration bucket.",
     useCases: ["video-audit", "qa", "shot-list", "verification", "auto-analysis"],
     pricing: [
-      { identifier: "video-audit:auto", credits: 1917, note: "10-min ceiling (no duration given)" },
-      { identifier: "video-audit:auto:60s", credits: 394 },
+      { identifier: "video-audit:auto", credits: 1921, note: "10-min ceiling (no duration given)" },
+      { identifier: "video-audit:auto:60s", credits: 396 },
       { identifier: "video-audit:auto:180s", credits: 475 },
-      { identifier: "video-audit:auto:360s", credits: 1176 },
-      { identifier: "video-audit:auto:600s", credits: 1917, note: "10-min ceiling" },
+      { identifier: "video-audit:auto:360s", credits: 1178 },
+      { identifier: "video-audit:auto:600s", credits: 1921, note: "10-min ceiling" },
     ],
   },
 }

package/src/node-preset-extract.ts

@@ -1,5 +1,6 @@
 import { EXECUTION_DATA_KEYS } from "./node-runtime-keys.js"
 import { COMPOSER_PLAN_FIELDS } from "./model-constants.js"
+import { PROMPT_PREFIX_KEY, PROMPT_SUFFIX_KEY } from "./prompt-affixes.js"
 
 /**
  * Generated-plan state on composer nodes that a preset must NEITHER capture NOR
@@ -26,6 +27,43 @@ import { COMPOSER_PLAN_FIELDS } from "./model-constants.js"
  */
 export const PRESET_APPLY_CLEAR_KEYS: readonly string[] = [...COMPOSER_PLAN_FIELDS, "lottieUrl"]
 
+/**
+ * The three keys that carry a preset's PROMPT CONTENT: the prompt itself plus the pre/post text
+ * wrapped around it at run time. A preset "owns prompt content" iff its data defines any of them.
+ */
+const PROMPT_CONTENT_KEYS: readonly string[] = ["prompt", PROMPT_PREFIX_KEY, PROMPT_SUFFIX_KEY]
+
+/**
+ * The keys applying THIS preset must clear on the node: always `PRESET_APPLY_CLEAR_KEYS`, plus
+ * `promptPrefix` / `promptSuffix` when the preset owns prompt content. The dropdown spreads
+ * `{ ...clearPatch, ...preset.data }`, so the preset's own affixes (if any) land back on top of
+ * the clear — the clear only decides what happens to the keys the preset does NOT set.
+ *
+ * The hazard this closes: with a STATIC clear set the affixes are named by no patch, so applying
+ * preset B (which ships only `prompt`) over a node carrying preset A's `promptPrefix` leaves A's
+ * prefix in place, silently wrapping B's prompt. The node then runs text no preset ever authored,
+ * and nothing in the UI attributes it — the prefix lives in a collapsed settings section.
+ *
+ * The rule is ASYMMETRIC on purpose, because the two directions have opposite promises:
+ *  - A preset that owns prompt content is authoring the whole prompt, affixes included, so any
+ *    leftover affix from a previous preset is stale — clear both.
+ *  - A settings-only preset (provider / aspect ratio / seed …) promises to touch nothing about the
+ *    prompt, so it leaves prompt AND affixes exactly as the user has them.
+ *  - `prompt` is NEVER cleared, only overwritten when the preset ships it. That is the feature's
+ *    core promise: apply a preset that ships only affixes and your typed prompt is kept, wrapped.
+ *
+ * Pure; `PRESET_APPLY_CLEAR_KEYS` itself stays a fixed set (it is also spread into
+ * `PRESET_EXCLUDED_KEYS`, and affixes must remain capture-INCLUDED for presets to ship them).
+ */
+export function presetApplyClearKeys(
+  presetData: Readonly<Record<string, unknown>>,
+): readonly string[] {
+  const ownsPromptContent = PROMPT_CONTENT_KEYS.some((k) => presetData[k] !== undefined)
+  return ownsPromptContent
+    ? [...PRESET_APPLY_CLEAR_KEYS, PROMPT_PREFIX_KEY, PROMPT_SUFFIX_KEY]
+    : PRESET_APPLY_CLEAR_KEYS
+}
+
 /**
  * Config fields that are intentionally NOT part of a preset, because they are not portable
  * configuration — they identify the node on the canvas, wire it into one specific graph, or point