@nodaro/prompts 1.27.0 → 1.29.0

package/src/picker-catalogs.ts

@@ -124,13 +124,41 @@ export interface PickerOption {
   /**
    * Transitions only: present (`true`) on a row whose mechanism is a CUT, so
    * it takes no duration and no intensity — see `Transition.instant` /
-   * `isInstantTransition`. A consumer that only reads this wire catalog
-   * (Studio builds the transition Duration lever from
-   * `getPickerCatalog("transition")`) hides those levers for such a row. Carried from the base catalog; a row a catalog pack ADDS has
-   * it only when the pack's own option says so, and absent means "has a
-   * duration" — the safe reading, since the composer then behaves as before.
+   * `isInstantTransition`. A consumer that only reads this catalog (Studio
+   * builds the transition levers from `getPickerCatalog("transition")`) hides
+   * those levers for such a row. Carried from the base catalog; a row a
+   * catalog pack ADDS has it only when the pack's own option says so, and
+   * absent means "has a duration" — the safe reading, since the composer then
+   * behaves as before. On this in-memory catalog only: the wire projection
+   * (`projectPickerCatalog`) does not carry it.
    */
   readonly instant?: true
+  /**
+   * Transitions only: present (`true`) on a CUT that a `blendsCut` duration
+   * turns into a BLENDED CUT — see `Transition.blendable` /
+   * `isBlendableTransition`. Always beside `instant`. A consumer offers such a
+   * row's Duration as a Blend lever (hard cut, or one of the `blendsCut`
+   * steps of the catalog's `duration` dimension). Carried like `instant`, and
+   * like it on this in-memory catalog only.
+   */
+  readonly blendable?: true
+  /**
+   * Transition `duration` dimension only: present (`true`) on the step that
+   * blends a `blendable` cut (`short`) — see `TransitionTimingOption.blendsCut`
+   * / `blendedCutClause`. On this in-memory catalog only.
+   */
+  readonly blendsCut?: true
+  /**
+   * PER-OPTION PARAMETERS — extra node-data fields that apply only while THIS
+   * option is picked, each with its own rows (Transitions: a wipe's
+   * `wipeDirection`; see `Transition.options`). Same shape as the catalog's
+   * `dimensions`, but scoped to the row that declares them: a consumer shows
+   * the control while the row is picked and stores the chosen row id under
+   * `field` beside the pick. The `auto` row leads each list and means "send
+   * nothing"; a row's `promptHint` is the phrase it writes into the option's
+   * description, not a clause of its own. Absent on every other option.
+   */
+  readonly params?: readonly PickerDimension[]
   /** Only present if the source catalog entry already carries a data icon/emoji/thumbnail field. */
   readonly icon?: string
 }
@@ -186,6 +214,22 @@ interface BaseCatalogEntry {
   readonly adultOnly?: true
   /** Transitions: see `Transition.instant`. Propagated into the flattened option as `instant: true`. */
   readonly instant?: boolean
+  /** Transitions: see `Transition.blendable`. Propagated into the flattened option as `blendable: true`. */
+  readonly blendable?: boolean
+  /** Transition durations: see `TransitionTimingOption.blendsCut`. Propagated as `blendsCut: true`. */
+  readonly blendsCut?: boolean
+  /** Transitions: see `Transition.options`. Propagated as the option's `params`. */
+  readonly options?: ReadonlyArray<{
+    readonly field: string
+    readonly label: string
+    readonly choices: ReadonlyArray<{
+      readonly id: string
+      readonly label: string
+      readonly description: string
+      readonly phrase: string
+      readonly term: string
+    }>
+  }>
 }
 
 /**
@@ -215,6 +259,21 @@ function toOptions<T extends BaseCatalogEntry>(
     if (categoryField) opt.category = e[categoryField] as unknown as string
     if (e.adultOnly) opt.adultOnly = true
     if (e.instant) opt.instant = true
+    if (e.blendable) opt.blendable = true
+    if (e.blendsCut) opt.blendsCut = true
+    if (e.options?.length) {
+      opt.params = e.options.map((o) => ({
+        field: o.field,
+        label: o.label,
+        options: o.choices.map((c) => ({
+          id: c.id,
+          label: c.label,
+          description: c.description,
+          promptHint: c.phrase,
+          term: c.term,
+        })),
+      }))
+    }
     return opt as PickerOption
   })
 }
@@ -975,8 +1034,25 @@ export type ProjectedPickerCatalog = ProjectedCatalog
 function projectOption(o: PickerOption, detail: PickerCatalogDetail, imageUrl?: string): ProjectedPickerOption {
   // `term` rides at BOTH detail levels: a thin client renders `label` and
   // injects `term`, so compact must carry it — it is what makes compact hint
-  // mode possible without a second round-trip for the full payload. So does
-  // `imageUrl` (display data), present only when the option has a picture.
+  // mode possible without a second round-trip for the full payload.
+  const projected = projectOptionFields(o, detail, imageUrl)
+  // Per-option params (a wipe's direction) ride at both detail levels too: an
+  // id-only client needs the rows to offer the control at all.
+  return o.params
+    ? {
+        ...projected,
+        params: o.params.map((d) => ({
+          field: d.field,
+          label: d.label,
+          options: d.options.map((p) => projectOption(p, detail)),
+        })),
+      }
+    : projected
+}
+
+function projectOptionFields(o: PickerOption, detail: PickerCatalogDetail, imageUrl?: string): ProjectedPickerOption {
+  // `imageUrl` (display data) rides at both detail levels too, present only
+  // when the option has a picture.
   const extras = { ...(o.motion ? { motion: o.motion } : {}), ...(imageUrl ? { imageUrl } : {}) }
   return detail === "full"
     ? {

package/src/prompt-builder.ts

@@ -4,6 +4,7 @@
  * provider-aware prompt truncation (default 5000 chars), and reference image filtering by model support.
  */
 
+import { joinSentences } from "./hint-join.js"
 import { resolveTemplate, applyTemplate } from "./prompt-templates.js"
 import { NATIVE_NEGATIVE_PROMPT_MODELS, MODELS_WITH_REFERENCE_IMAGE_SUPPORT, imageReferenceLimit, getMaxImagePromptChars, getMaxNegativePromptChars } from "@nodaro/shared"
 import { getStylePromptHint, isDeniedStyleId } from "./style.js"
@@ -60,7 +61,7 @@ function composeIdentityDescPart(
   if (c) parts.push(c)
   const e = elementInjection?.trim()
   if (e) parts.push(e)
-  return parts.length > 0 ? `${subject} — ${parts.join(". ")}` : subject
+  return parts.length > 0 ? `${subject} — ${joinSentences(parts)}` : subject
 }
 
 /**

package/src/prompt-hint-join.ts

@@ -22,7 +22,11 @@
  * Never mutates its inputs.
  */
 
-/** The measured separator between the user's prompt and each folded hint. */
+/** The measured separator between the user's prompt and each folded hint.
+ *  Pieces that already end a sentence are followed by a single space instead
+ *  (`joinSentences`), so this is the longest separator a join can add. */
+import { joinSentences } from "./hint-join.js"
+
 export const PROMPT_HINT_SEPARATOR = ". "
 
 /**
@@ -35,5 +39,7 @@ export const PROMPT_HINT_SEPARATOR = ". "
  */
 export function joinPromptHints(userPrompt: string, hints: readonly string[]): string {
   if (hints.length === 0) return userPrompt
-  return [userPrompt.trim(), ...hints].filter((p) => p.length > 0).join(PROMPT_HINT_SEPARATOR)
+  // Sentence-aware: a prompt or hint that already ends a sentence is followed
+  // by a space, not by PROMPT_HINT_SEPARATOR (which made "watermark.. hint").
+  return joinSentences([userPrompt.trim(), ...hints])
 }

package/src/prompt-style-section.ts

@@ -45,7 +45,8 @@
  * section is written flush-left rather than relying on that collapse to be
  * harmless.
  */
-import { joinPromptHints, PROMPT_HINT_SEPARATOR } from "./prompt-hint-join.js"
+import { joinPromptHints } from "./prompt-hint-join.js"
+import { joinSentences } from "./hint-join.js"
 import {
   renderDirectionHintClauses,
   type DirectionFamily,
@@ -173,10 +174,7 @@ export function partitionStyleClauses(
  */
 export function styleSectionFromClauses(clauses: readonly SlottedPromptClause[]): string {
   const line = (slot: PromptClauseSlot) =>
-    clauses
-      .filter((c) => c.slot === slot)
-      .map((c) => c.text)
-      .join(PROMPT_HINT_SEPARATOR)
+    joinSentences(clauses.filter((c) => c.slot === slot).map((c) => c.text))
   const lines = [line("film"), line("scene")].filter((l) => l.length > 0)
   return lines.length === 0 ? "" : `${STYLE_SECTION_HEADER}\n${lines.join("\n")}`
 }

package/src/resolve-prompt.ts

@@ -1,5 +1,6 @@
 import { resolveNodeRefs, readPromptAffixes, type PromptAffixes } from "@nodaro/shared"
 import { SOCIAL_POST_NODE_TYPES } from "@nodaro/shared"
+import { joinSentences } from "./hint-join.js"
 
 export interface ResolvePromptArgs {
   override?: string
@@ -72,7 +73,8 @@ export function applyPromptAffixes(
  *  override (list fan-out) > first present typed candidate > wired > "".
  *  "present" = non-empty after trim. {Label} refs are resolved on the chosen
  *  branch via the shared resolveNodeRefs. With `appendWired`, the chosen base
- *  AND the wired value are both emitted (joined ". "). Affixes wrap the result. */
+ *  AND the wired value are both emitted, joined as sentences (`joinSentences`:
+ *  ". ", or a space after one that already ends). Affixes wrap the result. */
 export function resolvePrompt({ override, typed = [], wired, refMap, appendWired, affixes }: ResolvePromptArgs): string {
   return applyPromptAffixes(resolveCore({ override, typed, wired, refMap, appendWired }), affixes, refMap)
 }
@@ -83,7 +85,7 @@ function resolveCore({ override, typed = [], wired, refMap, appendWired }: Omit<
   // so per-item fan-out prompts are unchanged.
   if (appendWired && !present(override)) {
     const base = typed.find(present)
-    return [base, wired].filter(present).map((s) => rr(s, refMap)).join(". ")
+    return joinSentences([base, wired].filter(present).map((s) => rr(s, refMap)))
   }
   if (present(override)) return rr(override, refMap)
   for (const t of typed) if (present(t)) return rr(t, refMap)
@@ -92,13 +94,13 @@ function resolveCore({ override, typed = [], wired, refMap, appendWired }: Omit<
 }
 
 /** Compose a final NEGATIVE prompt from a TYPED base + a WIRED (connected
- *  negative-handle) value: both are emitted, joined ". " (mirrors `appendWired`
+ *  negative-handle) value: both are emitted, joined as sentences (`joinSentences`, mirrors `appendWired`
  *  for the positive prompt). Pure join — the caller resolves `{label}` refs on
  *  the typed value first, and the wired value is already a resolved output that
  *  the input-resolver has filtered (referenced / Inject-Negative-off dropped).
  *  Generate-image / generate-video only; empty parts are dropped. */
 export function composeNegative(typed?: string, wired?: string): string {
-  return [typed, wired].filter(present).join(". ")
+  return joinSentences([typed, wired])
 }
 
 /** Ordered typed-candidate fields per node type — the precedence source of
@@ -184,3 +186,19 @@ export function computeLlmChatFields(
     systemPrompt: resolvePrompt({ typed: [data.systemPrompt as string | undefined], wired: wiredSystemPrompt, refMap }),
   }
 }
+
+/** generate-script's topic. Both engines call this, so a wired Text node reads
+ *  the same on a single-node run and a server run.
+ *
+ *  Precedence is override (a list fan-out item) > wired > `data.prompt`. Wired
+ *  comes BEFORE the typed field, the reverse of `computeNodePrompt`, because
+ *  `data.prompt` has no editor: the panel's text field is the style guide. A
+ *  value there was written by the old connect-time `{Label}` auto-fill or by an
+ *  agent, and it is kept only as the fallback that saved workflows rely on. */
+export function computeScriptTopic(
+  data: Record<string, unknown>,
+  { override, wired, refMap }: Omit<ComputeNodePromptArgs, "appendWired">,
+): string {
+  const core = [override, wired, data.prompt as string | undefined].find(present)
+  return applyPromptAffixes(core === undefined ? "" : rr(core, refMap), readPromptAffixes(data), refMap)
+}