@nodaro/shared 1.19.0 → 1.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodaro/shared",
-  "version": "1.19.0",
+  "version": "1.21.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__/video-analysis.test.ts

@@ -5,8 +5,9 @@ import {
   renderAnalyzedScene, isOversizedScene, aspectRatioFromDims,
   entitySlotSchema, analyzedSceneSchema,
   rewriteSceneBindings, dropUnknownBindings,
+  rewriteSpeakerSlots, dropUnknownSpeakers,
   VIDEO_ANALYSIS_MAX_VARIATIONS, VIDEO_ANALYSIS_VARIATION_SLUGS, VIDEO_ANALYSIS_DEFAULT_VARIATION,
-  type EntitySlot,
+  type EntitySlot, type AudioLayer,
 } from "../video-analysis.js"
 
 const slot: EntitySlot = { slotId: "hero", label: "Protagonist", source: "wired-character", role: "person", description: "tan man, mustache, black tee" }
@@ -148,6 +149,73 @@ describe("binding rewrite helpers (merge consumes — spec §4)", () => {
   })
 })
 
+describe("speech attribution (speakerSlot)", () => {
+  const speech = (content: string, over: Partial<AudioLayer> = {}): AudioLayer => ({ mode: "speech", content, ...over })
+
+  it("rides on speech layers and survives a window round-trip", () => {
+    const parsed = windowAnalysisSchema.parse({
+      slots: [slot],
+      scenes: [{ ...baseScene, audio: [speech("As a kid…", { voice: "male, warm", speakerSlot: "hero" })] }],
+    })
+    expect(parsed.scenes[0]!.audio[0]!.speakerSlot).toBe("hero")
+  })
+
+  it("is NOT refined against mode — a mis-tagged music layer must not fail the whole roll", () => {
+    // The window schema IS the enforced decode grammar. Rejecting here would
+    // throw away every scene in a window over one stray field; the sanitizer
+    // below strips it instead.
+    expect(windowAnalysisSchema.safeParse({
+      slots: [slot],
+      scenes: [{ ...baseScene, audio: [{ mode: "music", content: "synth bed", speakerSlot: "hero" }] }],
+    }).success).toBe(true)
+  })
+
+  it("rewriteSpeakerSlots follows a slot through cross-window unification", () => {
+    // Slot unification renames the loser id and rewrites {slot:…} tokens and
+    // variation bindings; attribution has to move with them or it dangles.
+    const audio = [speech("hi", { speakerSlot: "man-2" }), speech("ho", { speakerSlot: "other" })]
+    expect(rewriteSpeakerSlots(audio, { "man-2": "hero" }).map((a) => a.speakerSlot)).toEqual(["hero", "other"])
+  })
+
+  it("rewriteSpeakerSlots is copy-on-write when no layer names a renamed slot", () => {
+    const audio = [speech("hi", { speakerSlot: "hero" }), { mode: "music" as const, content: "bed" }]
+    expect(rewriteSpeakerSlots(audio, { ghost: "other" })).toBe(audio)
+  })
+
+  it("dropUnknownSpeakers strips attribution to a slot that no longer exists", () => {
+    const r = dropUnknownSpeakers([speech("hi", { speakerSlot: "ghost" })], new Set(["hero"]))
+    expect(r.audio[0]).not.toHaveProperty("speakerSlot")
+    expect(r.dropped).toEqual(["ghost"])
+  })
+
+  it("dropUnknownSpeakers strips attribution from music/sfx — nobody is speaking", () => {
+    const r = dropUnknownSpeakers(
+      [{ mode: "sfx", content: "door slam", speakerSlot: "hero" }],
+      new Set(["hero"]),
+    )
+    expect(r.audio[0]).not.toHaveProperty("speakerSlot")
+    expect(r.dropped).toEqual(["hero"])
+  })
+
+  it("dropUnknownSpeakers keeps a valid speaker and every other layer field", () => {
+    const audio = [speech("As a kid…", { voice: "male, warm", speakerSlot: "hero" })]
+    const r = dropUnknownSpeakers(audio, new Set(["hero"]))
+    expect(r.audio).toBe(audio)          // copy-on-write: untouched input returned as-is
+    expect(r.dropped).toEqual([])
+  })
+
+  it("attribution alone must NOT keep a slot alive — that is the phantom narrator", () => {
+    // A slot referenced only as a speaker is a voice with no body (doctrine §5).
+    // deriveSlotRefs reads {slot:…} tokens from `visual` ONLY, so an
+    // attribution-only slot stays invisible to the reference sweep and gets
+    // dropped — then dropUnknownSpeakers removes the dangling attribution.
+    expect(deriveSlotRefs("a lunar plain, no one in frame")).toEqual([])
+    const r = dropUnknownSpeakers([speech("that's me!", { speakerSlot: "creator" })], new Set())
+    expect(r.audio[0]).not.toHaveProperty("speakerSlot")
+    expect(r.dropped).toEqual(["creator"])
+  })
+})
+
 describe("misc", () => {
   it("isOversizedScene flags > 8s only", () => {
     expect(isOversizedScene(0, 8)).toBe(false)

package/src/model-catalog.ts

@@ -1812,14 +1812,14 @@ const VIDEO_MODELS: Record<string, ModelCatalogEntry> = {
     family: "Nodaro",
     label: "Video Analysis (Fast — legacy)",
     series: "Video Analysis",
-    description: "Legacy fast-tier analysis model (pre-2026-07). Kept so stored raw-model configs keep running and pricing unchanged; new fast-tier runs use the current fast model.",
+    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: 3, note: "10-min ceiling (no duration given)" },
-      { identifier: "video-analysis:gemini-3-flash:60s", credits: 1 },
-      { identifier: "video-analysis:gemini-3-flash:180s", credits: 1 },
-      { identifier: "video-analysis:gemini-3-flash:360s", credits: 2 },
-      { identifier: "video-analysis:gemini-3-flash:600s", credits: 3, note: "10-min ceiling" },
+      { identifier: "video-analysis:gemini-3-flash", credits: 9, note: "10-min ceiling (no duration given)" },
+      { identifier: "video-analysis:gemini-3-flash:60s", credits: 2 },
+      { identifier: "video-analysis:gemini-3-flash:180s", credits: 3 },
+      { identifier: "video-analysis:gemini-3-flash:360s", credits: 6 },
+      { identifier: "video-analysis:gemini-3-flash:600s", credits: 9, note: "10-min ceiling" },
     ],
   },
   "gemini-3.6-flash-video-analysis": {
@@ -1832,11 +1832,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: 9, note: "10-min ceiling (no duration given)" },
-      { identifier: "video-analysis:gemini-3.6-flash:60s", credits: 2 },
-      { identifier: "video-analysis:gemini-3.6-flash:180s", credits: 2 },
-      { identifier: "video-analysis:gemini-3.6-flash:360s", credits: 5 },
-      { identifier: "video-analysis:gemini-3.6-flash:600s", credits: 9, note: "10-min ceiling" },
+      { identifier: "video-analysis:gemini-3.6-flash", credits: 25, note: "10-min ceiling (no duration given)" },
+      { identifier: "video-analysis:gemini-3.6-flash:60s", credits: 5 },
+      { identifier: "video-analysis:gemini-3.6-flash:180s", credits: 6 },
+      { identifier: "video-analysis:gemini-3.6-flash:360s", credits: 15 },
+      { identifier: "video-analysis:gemini-3.6-flash:600s", credits: 25, note: "10-min ceiling" },
     ],
   },
   "gemini-3.1-pro-video-analysis": {
@@ -1849,11 +1849,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: 11, note: "10-min ceiling (no duration given)" },
-      { identifier: "video-analysis:gemini-3.1-pro:60s", credits: 2 },
-      { identifier: "video-analysis:gemini-3.1-pro:180s", credits: 3 },
-      { identifier: "video-analysis:gemini-3.1-pro:360s", credits: 7 },
-      { identifier: "video-analysis:gemini-3.1-pro:600s", credits: 11, note: "10-min ceiling" },
+      { identifier: "video-analysis:gemini-3.1-pro", credits: 33, note: "10-min ceiling (no duration given)" },
+      { identifier: "video-analysis:gemini-3.1-pro:60s", credits: 6 },
+      { identifier: "video-analysis:gemini-3.1-pro:180s", credits: 8 },
+      { identifier: "video-analysis:gemini-3.1-pro:360s", credits: 20 },
+      { identifier: "video-analysis:gemini-3.1-pro:600s", credits: 33, note: "10-min ceiling" },
     ],
   },
   // Both mixed tiers are variants of the same advanced multi-engine analysis
@@ -1869,11 +1869,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: 14, note: "10-min ceiling (no duration given)" },
-      { identifier: "video-analysis:mixed:60s", credits: 3 },
-      { identifier: "video-analysis:mixed:180s", credits: 4 },
-      { identifier: "video-analysis:mixed:360s", credits: 9 },
-      { identifier: "video-analysis:mixed:600s", credits: 14, note: "10-min ceiling" },
+      { identifier: "video-analysis:mixed", credits: 57, note: "10-min ceiling (no duration given)" },
+      { identifier: "video-analysis:mixed:60s", credits: 10 },
+      { identifier: "video-analysis:mixed:180s", credits: 13 },
+      { identifier: "video-analysis:mixed:360s", credits: 35 },
+      { identifier: "video-analysis:mixed:600s", credits: 57, note: "10-min ceiling" },
     ],
   },
 }

package/src/video-analysis-pricing.ts

@@ -47,27 +47,27 @@ export const VIDEO_ANALYSIS_WINDOW = { LEN: WINDOW_LEN, STRIDE: WINDOW_STRIDE, O
  */
 export const VIDEO_ANALYSIS_BUCKET_CREDITS: Record<string, number> = {
   // Legacy fast-tier model (pre-2026-07) — kept for stored raw-id configs.
-  "video-analysis:gemini-3-flash:60s": 1,
-  "video-analysis:gemini-3-flash:180s": 1,
-  "video-analysis:gemini-3-flash:360s": 2,
-  "video-analysis:gemini-3-flash:600s": 3,
+  "video-analysis:gemini-3-flash:60s": 2,
+  "video-analysis:gemini-3-flash:180s": 3,
+  "video-analysis:gemini-3-flash:360s": 6,
+  "video-analysis:gemini-3-flash:600s": 9,
   // Current fast tier — regenerated from the private formula for its backing
   // model; higher than the legacy fast schedule but still ≤ pro per bucket.
-  "video-analysis:gemini-3.6-flash:60s": 2,
-  "video-analysis:gemini-3.6-flash:180s": 2,
-  "video-analysis:gemini-3.6-flash:360s": 5,
-  "video-analysis:gemini-3.6-flash:600s": 9,
-  "video-analysis:gemini-3.1-pro:60s": 2,
-  "video-analysis:gemini-3.1-pro:180s": 3,
-  "video-analysis:gemini-3.1-pro:360s": 7,
-  "video-analysis:gemini-3.1-pro:600s": 11,
+  "video-analysis:gemini-3.6-flash:60s": 5,
+  "video-analysis:gemini-3.6-flash:180s": 6,
+  "video-analysis:gemini-3.6-flash:360s": 15,
+  "video-analysis:gemini-3.6-flash:600s": 25,
+  "video-analysis:gemini-3.1-pro:60s": 6,
+  "video-analysis:gemini-3.1-pro:180s": 8,
+  "video-analysis:gemini-3.1-pro:360s": 20,
+  "video-analysis:gemini-3.1-pro:600s": 33,
   // Mixed tiers (`mixed` + `mixed-fast`) share ONE credit family — they are
   // variants of the same engine plan (plan internals live in the private
   // analysis plugin). Admin-tunable via model_pricing like every other row.
-  "video-analysis:mixed:60s": 3,
-  "video-analysis:mixed:180s": 4,
-  "video-analysis:mixed:360s": 9,
-  "video-analysis:mixed:600s": 14,
+  "video-analysis:mixed:60s": 10,
+  "video-analysis:mixed:180s": 13,
+  "video-analysis:mixed:360s": 35,
+  "video-analysis:mixed:600s": 57,
 }
 
 /**

package/src/video-analysis.ts

@@ -78,6 +78,27 @@ const audioLayerSchema = z.object({
   mode: z.enum(["speech", "music", "sfx"]),
   content: z.string().min(1),
   voice: z.string().optional(),
+  /**
+   * SPEECH ONLY — `slotId` of the on-screen speaker saying these words.
+   *
+   * `voice` casts a voice ("male, proud triumphant shouting"); this says WHO it
+   * belongs to, so a recreation can route the line to the right character
+   * instead of guessing. Usually one person speaks per scene and the guess is
+   * right, which is exactly why the cases with two speakers over one cut fail
+   * silently without this field.
+   *
+   * Optional by design and deliberately NOT refined against `mode` here: the
+   * window schema is the enforced decode grammar, and rejecting a whole roll
+   * because the model tagged a music layer would be a hair-trigger failure. A
+   * speaker on a non-speech layer, or one naming a slot that no longer exists,
+   * is stripped structurally by `dropUnknownSpeakers` — the same
+   * unwrap/drop/sweep philosophy the slot-token and binding channels use.
+   *
+   * An unseen narrator gets NO speaker: a voice with no body is never a slot
+   * (doctrine §5), so attribution here would resurrect the phantom-entity
+   * defect that `stripOrphanSlots` exists to kill.
+   */
+  speakerSlot: z.string().optional(),
 })
 export type AudioLayer = z.infer<typeof audioLayerSchema>
 
@@ -202,6 +223,50 @@ export function dropUnknownBindings(
   return { kept: Object.keys(kept).length > 0 ? kept : undefined, dropped }
 }
 
+/**
+ * Rewrite speech attribution after cross-window slot unification — the
+ * `rewriteSceneBindings` counterpart for the `audio` channel. Slot unification
+ * renames a loser id to its survivor and rewrites `{slot:…}` tokens and
+ * variation bindings; an un-rewritten `speakerSlot` would be left pointing at an
+ * id that no longer exists. Copy-on-write: returns the input array untouched
+ * when no layer names a renamed slot.
+ */
+export function rewriteSpeakerSlots(audio: AudioLayer[], slotRenames: Record<string, string>): AudioLayer[] {
+  if (!audio.some((a) => a.speakerSlot !== undefined && slotRenames[a.speakerSlot])) return audio
+  return audio.map((a) => {
+    const to = a.speakerSlot !== undefined ? slotRenames[a.speakerSlot] : undefined
+    return to ? { ...a, speakerSlot: to } : a
+  })
+}
+
+/**
+ * Strip attribution that no scene can honour — the `dropUnknownBindings` mirror
+ * for the `audio` channel. Two cases, both model sloppiness rather than errors
+ * worth failing a roll over:
+ *   - a `speakerSlot` on a `music`/`sfx` layer (nobody is speaking)
+ *   - a `speakerSlot` naming a slot that is not in the final list
+ *
+ * MUST run AFTER the orphan-slot sweep, and attribution must NEVER count as a
+ * slot reference for that sweep: a slot reachable only as a speaker is a voice
+ * with no body — precisely the invented-narrator entity doctrine §5 forbids. The
+ * two passes compose to remove both the phantom slot and the dangling
+ * attribution pointing at it.
+ */
+export function dropUnknownSpeakers(
+  audio: AudioLayer[],
+  validSlotIds: Set<string>,
+): { audio: AudioLayer[]; dropped: string[] } {
+  const dropped: string[] = []
+  const out = audio.map((a) => {
+    if (a.speakerSlot === undefined) return a
+    if (a.mode === "speech" && validSlotIds.has(a.speakerSlot)) return a
+    dropped.push(a.speakerSlot)
+    const { speakerSlot: _drop, ...rest } = a
+    return rest
+  })
+  return { audio: dropped.length > 0 ? out : audio, dropped }
+}
+
 /** Substitute {slot:x}: castMap binding wins, else the slot's description, else literal id. */
 export function renderAnalyzedScene(scene: { visual: string }, slots: EntitySlot[], castMap?: Record<string, string>): string {
   const byId = new Map(slots.map((s) => [s.slotId, s]))