davinci-resolve-mcp 2.150.0 → 2.152.0

package/CHANGELOG.md

@@ -2,6 +2,45 @@
 
 Release history for the DaVinci Resolve MCP Server. The latest release is summarized in the root README; older entries live here to keep the README focused.
 
+## What's New in v2.152.0 — AAF dissolves conform at last, and AAF fades join the family
+
+### Fixed
+
+- **No AAF dissolve could ever conform through `assemble_from_interchange`**:
+  an AAF Transition consumes record time, so the walker (correctly) emits the
+  incoming clip overlapping the outgoing — and the bridge's overlap gate
+  threw on exactly that shape. A reconciliation pre-pass now trims the
+  outgoing's tail to the overlap start; the boundary shift then re-extends it
+  to the cut point, which is the AAF notional-cut (`CutPoint`) semantics
+  exactly. Render-verified: the dissolve blends through the 181.8 midpoint
+  fingerprint.
+
+### Added
+
+- **AAF fades**: the walker synthesizes BL pseudo-events at filler-adjacent
+  and sequence-edge Transitions, completing fade parity across all four
+  formats (EDL v2.150, OTIO/XMEML v2.151, AAF now). The head-transition
+  "clamp" case is reinterpreted as what it is — a fade-in from black.
+  Full triple render-verified: fade-in 18→123, dissolve-to-white through the
+  midpoint, fade-out 230→21.
+- A pyaaf2-authored AAF fixture test exercises the real walker end to end
+  (no stubs), skipped only where pyaaf2 is unavailable.
+
+## What's New in v2.151.0 — fade parity: OTIO and XMEML fades author too
+
+### Added
+
+- **OTIO and XMEML fades route through the black machinery** shipped for EDL
+  BL legs in v2.150.0. OTIO: a Transition adjacent to a Gap (or the track
+  edge) is a fade — gap-then-Transition-then-Clip fades in, Transition-then-
+  Gap (or Transition as the last child) fades out. XMEML: an edge
+  transitionitem whose span has no outgoing clip fades in, no incoming clip
+  fades out. All synthesize BL pseudo-events; the bridge materializes a
+  zero-length black leg to cover its side of the span whenever the boundary
+  shift alone won't grow it (empty track renders black, so the growth is
+  render-neutral). Live OTIO render: fade-in luma ramps 18→123, the centered
+  fade-out 124→18 — identical geometry from all three parsers.
+
 ## What's New in v2.150.0 — fades conform: BL legs author, and Resolve's own EDL importer drops them
 
 ### Added

package/README.md

@@ -2,7 +2,7 @@
 
 English | [简体中文](README.zh-CN.md)
 
-[![Version](https://img.shields.io/badge/version-2.150.0-blue.svg)](https://github.com/samuelgursky/davinci-resolve-mcp/releases)
+[![Version](https://img.shields.io/badge/version-2.152.0-blue.svg)](https://github.com/samuelgursky/davinci-resolve-mcp/releases)
 [![npm](https://img.shields.io/npm/v/davinci-resolve-mcp.svg?label=npm&color=CB3837)](https://www.npmjs.com/package/davinci-resolve-mcp)
 [![API Coverage](https://img.shields.io/badge/API%20Coverage-100%25-brightgreen.svg)](docs/reference/api-coverage.md)
 [![Tools](https://img.shields.io/badge/MCP%20Tools-36%20(353%20full)-blue.svg)](#server-modes)

package/README.zh-CN.md

@@ -2,7 +2,7 @@
 
 [English](README.md) | 简体中文
 
-[![Version](https://img.shields.io/badge/version-2.150.0-blue.svg)](https://github.com/samuelgursky/davinci-resolve-mcp/releases)
+[![Version](https://img.shields.io/badge/version-2.152.0-blue.svg)](https://github.com/samuelgursky/davinci-resolve-mcp/releases)
 [![npm](https://img.shields.io/npm/v/davinci-resolve-mcp.svg?label=npm&color=CB3837)](https://www.npmjs.com/package/davinci-resolve-mcp)
 [![API Coverage](https://img.shields.io/badge/API%20Coverage-100%25-brightgreen.svg)](docs/reference/api-coverage.md)
 [![Tools](https://img.shields.io/badge/MCP%20Tools-36%20(353%20full)-blue.svg)](#服务器模式)
@@ -12,7 +12,7 @@
 [![Python](https://img.shields.io/badge/python-3.10+-green.svg)](https://www.python.org/downloads/)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
-> 本翻译对应 v2.150.0 版 README。如与英文原版有出入，以 [英文原版](README.md) 为准。
+> 本翻译对应 v2.152.0 版 README。如与英文原版有出入，以 [英文原版](README.md) 为准。
 
 一个 Model Context Protocol (MCP) 服务器，让 AI 助手通过官方脚本 API 控制 DaVinci Resolve Studio（达芬奇）。它提供完整的 API 覆盖，外加带护栏的工作流助手，涵盖剪辑、媒体池整理、渲染设置、审阅标记、调色、Fusion、Fairlight、项目生命周期任务、扩展开发，以及不碰源媒体的媒体分析。
 

package/install.py

@@ -37,7 +37,7 @@ from src.utils.update_check import (
 
 # ─── Version ──────────────────────────────────────────────────────────────────
 
-VERSION = "2.150.0"
+VERSION = "2.152.0"
 # Only hard floor: mcp[cli] requires Python 3.10+. There is no upper bound —
 # Resolve's scripting bridge loads into newer interpreters on recent builds
 # (Python 3.14 verified against Resolve Studio 20.3.2). Older Resolve builds

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "davinci-resolve-mcp",
-  "version": "2.150.0",
+  "version": "2.152.0",
   "description": "NPM bootstrapper for the DaVinci Resolve MCP Server.",
   "license": "MIT",
   "author": "Samuel Gursky <samgursky@gmail.com>",

package/resolve-advanced/server/aaf_probe.py

@@ -1161,6 +1161,21 @@ def _walk_components(sequence, *, track, fps, rec, state, depth, transition=None
     """
     start = rec
     pending_transition = transition
+    # Sequence start counts as black: a Transition with Filler (or nothing)
+    # on one side is a FADE. Synthesize zero-length BL pseudo-events so the
+    # bridge's black machinery (E91-E93) authors a real clip-to-generator
+    # dissolve — Resolve renders empty track as black, and the bridge grows
+    # the BL leg to cover its side of the overlap.
+    at_black = True
+
+    def _emit_bl(rec_pos, trans):
+        state["events"].append({
+            "index": state["idx"], "track": track, "source": "BL",
+            "srcIn": 0, "srcOut": 0, "recIn": rec_pos, "recOut": rec_pos,
+            "speed": 100, "reverse": False, "transition": trans, "fps": fps,
+        })
+        state["idx"] += 1
+
     components = getattr(sequence, "components", None)
     if components is None:
         components = [sequence]
@@ -1190,15 +1205,29 @@ def _walk_components(sequence, *, track, fps, rec, state, depth, transition=None
                 # be a worse lie than the malformed AAF that produced it.
                 rec = max(start, rec - duration)
                 continue
+            if pending_transition is not None and cls in ("Filler", "ScopeReference"):
+                # Transition then Filler = fade-OUT into black: the fade
+                # attaches to a synthetic BL leg at the overlap start.
+                _emit_bl(rec, pending_transition)
+                pending_transition = None
+            elif pending_transition is not None and at_black:
+                # Filler (or sequence start) then Transition then clip =
+                # fade-IN from black: zero-length BL predecessor at the
+                # overlap start; the bridge's boundary shift grows it.
+                _emit_bl(rec, None)
             rec += _walk_segment(
                 comp, track=track, fps=fps, rec=rec, state=state, depth=depth, transition=pending_transition
             )
             pending_transition = None
+            at_black = cls in ("Filler", "ScopeReference")
         except Exception:
             # Never let one bad component abort the whole sequence — but say so.
             _note_unhandled(state, cls)
             pending_transition = None
             continue
+    if pending_transition is not None:
+        # Transition as the LAST component = fade-out to the sequence end.
+        _emit_bl(rec, pending_transition)
     return rec - start
 
 

package/resolve-advanced/server/author-interchange.mjs

@@ -313,9 +313,14 @@ export function eventsToAssembleSpec(events, opts = {}) {
         d += d % 2;
         let pre = Math.floor(d / 2);
         if (e.transition.alignment === 'start') pre = 0;
+        else if (e.transition.inOffset != null) pre = Math.min(d, Math.max(0, toTl(e.transition.inOffset, e.fps)));
+        else if (e.transition.recStart != null) {
+          const spanStartAbs = ORIGIN + (toTl(e.transition.recStart, e.fps) - minRec);
+          pre = Math.min(d, Math.max(0, recIn - spanStartAbs));
+        }
         transitionCandidates.push({
           atFrame: recIn, durationFrames: d, track: vTrackEarly, pre,
-          explicitSpan: e.transition.alignment != null,
+          explicitSpan: e.transition.alignment != null || e.transition.inOffset != null || e.transition.recStart != null,
           index: e.index, type: e.transition.type, rawDuration: e.transition.duration,
           source: e.source, srcIn: Infinity, incomingCutRef: el, cutPoint: e.transition.cutPoint,
         });
@@ -438,6 +443,29 @@ export function eventsToAssembleSpec(events, opts = {}) {
     if (!perSource.has(e.source)) perSource.set(e.source, []);
     perSource.get(e.source).push(cut);
   }
+  // AAF overlap reconciliation (E93): an AAF Transition CONSUMES record time
+  // — the incoming component starts `duration` frames before the outgoing
+  // ends, so the walker legitimately emits OVERLAPPING events with the
+  // transition on the incoming (alignment 'start' at the overlap start).
+  // Trim the outgoing's tail to the overlap start before the overlap gates:
+  // the boundary-shift below then re-extends it to the cut point, which is
+  // exactly the AAF notional-cut semantics (CutPoint, centered by default).
+  // Without this the overlap gate threw and NO AAF dissolve could conform.
+  const reconcileAafOverlap = (cands, pls) => {
+    for (const c of cands) {
+      if (!c.explicitSpan || c.pre !== 0) continue;
+      const prev = pls.find((pl) => pl.track === c.track && pl.start < c.atFrame && pl.end > c.atFrame && pl.end - c.atFrame <= c.durationFrames);
+      if (!prev) continue;
+      const o = prev.end - c.atFrame;
+      if (prev.durationFrames <= o) continue; // degenerate: leave for the drop paths
+      prev.end -= o;
+      prev.durationFrames -= o;
+      prev.cutRef.durationFrames -= o;
+    }
+  };
+  reconcileAafOverlap(transitionCandidates, placements);
+  reconcileAafOverlap(audioTransCandidates, audioPlacements);
+
   audioPlacements.sort((a, b) => a.start - b.start);
   const audByTrack = new Map();
   for (const pl of audioPlacements) {
@@ -508,6 +536,19 @@ export function eventsToAssembleSpec(events, opts = {}) {
     // FULL-duration outgoing tail.
     const pre = c.pre ?? c.durationFrames / 2;
     const post = c.durationFrames - pre;
+    // OTIO/XMEML fades (E92): a zero-length BL leg MATERIALIZES to cover its
+    // side of the span whenever the boundary shift alone won't grow it —
+    // empty track renders black, so growth beyond the picture is
+    // render-neutral, and placeTransition needs a physical item on each side
+    // of the junction. (The CMX pre===0 form grows through the shift below.)
+    if (isBL(prev.source) && prev.cutRef.durationFrames === 0 && pre > 0) {
+      prev.cutRef.startFrame -= pre;
+      prev.cutRef.durationFrames += pre;
+      prev.start -= pre;
+    }
+    if (isBL(c.source) && c.incomingCutRef.durationFrames === 0 && post > 0) {
+      c.incomingCutRef.durationFrames += post;
+    }
     // A BL side has infinite handles: a Solid Color generator extends freely
     // in both directions (srcIn is already Infinity on BL candidates).
     const bHandle = c.srcIn >= pre;

package/resolve-advanced/server/editorial.mjs

@@ -162,13 +162,31 @@ export function parseOTIO(otio, opts = {}) {
     // field so the bridge can author it (type strings like SMPTE_Dissolve
     // map through the same style table as XMEML effectids).
     let pendingTransition = null;
+    // Track start counts as black: a Transition with a Gap (or nothing) on
+    // one side is a FADE. It routes through the same BL machinery as EDL BL
+    // dissolves (E91/E92): a synthetic zero-length BL event materializes the
+    // black side, and the bridge authors a real clip↔generator dissolve —
+    // empty track renders black anyway, so the growth is render-neutral.
+    let atBlack = true;
+    const lastRate = () => opts.fps || 24;
     for (const child of track.children || []) {
       const schema = child.OTIO_SCHEMA || '';
       const dur = (child.source_range && child.source_range.duration && child.source_range.duration.value) || 0;
       const rate = (child.source_range && child.source_range.duration && child.source_range.duration.rate) || opts.fps || 24;
       if (schema.startsWith('Gap')) {
+        if (pendingTransition) {
+          // Transition then Gap = fade-out into black: attach it to a
+          // synthetic BL leg at the junction (the bridge grows it forward).
+          events.push(evt({
+            index: idx++, track: kind, source: 'BL',
+            recIn: rec, recOut: rec, transition: pendingTransition, fps: lastRate(),
+          }));
+          pendingTransition = null;
+        } else {
+          pendingTransition = null; // a mid-timeline gap breaks a junction
+        }
         rec += dur;
-        pendingTransition = null; // a gap breaks the junction
+        atBlack = true;
         continue;
       }
       if (schema.startsWith('Transition')) {
@@ -180,6 +198,15 @@ export function parseOTIO(otio, opts = {}) {
         continue;
       }
       if (schema.startsWith('Clip')) {
+        if (pendingTransition && atBlack) {
+          // Gap (or track start) then Transition then Clip = fade-IN from
+          // black — the CMX zero-length-BL form, grown by the bridge.
+          events.push(evt({
+            index: idx++, track: kind, source: 'BL',
+            recIn: rec, recOut: rec, fps: rate,
+          }));
+        }
+        atBlack = false;
         const startVal = (child.source_range && child.source_range.start_time && child.source_range.start_time.value) || 0;
         // Retime via a LinearTimeWarp effect (time_scalar).
         let speed = 100,
@@ -220,6 +247,13 @@ export function parseOTIO(otio, opts = {}) {
         rec += dur;
       }
     }
+    if (pendingTransition) {
+      // Transition as the LAST child = fade-out to the end of the track.
+      events.push(evt({
+        index: idx++, track: kind, source: 'BL',
+        recIn: rec, recOut: rec, transition: pendingTransition, fps: lastRate(),
+      }));
+    }
   }
   return events;
 }
@@ -289,7 +323,28 @@ export function parseXMEMLEvents(xml, opts = {}) {
         // recStart carries the transitionitem's EXPLICIT record span start
         // (sequence-relative) so the bridge reproduces the editor's actual
         // alignment instead of assuming centered.
-        if (incoming) incoming.transition = { type: String(effectId), duration: e2 - s, recStart: s };
+        if (incoming) {
+          incoming.transition = { type: String(effectId), duration: e2 - s, recStart: s };
+          // No clip ENDS inside the span → nothing precedes: a fade-IN from
+          // black. Synthesize the zero-length BL leg (E91/E92) so the bridge
+          // authors a real black-to-picture dissolve instead of dropping it.
+          const outgoing = events.slice(before).find((ev) => ev.track === label && ev !== incoming && ev.recOut > s - 1 && ev.recOut <= e2);
+          if (!outgoing) {
+            events.push(evt({ index: idx++, track: label, source: 'BL', recIn: incoming.recIn, recOut: incoming.recIn, fps: seqRate }));
+          }
+        } else {
+          // No clip STARTS inside the span: a fade-OUT into black past the
+          // last clip. Attach the transition to a synthetic BL leg at the
+          // outgoing clip's end (the bridge grows it forward).
+          const outgoing = events.slice(before).find((ev) => ev.track === label && ev.recOut > s - 1 && ev.recOut <= e2);
+          if (outgoing) {
+            events.push(evt({
+              index: idx++, track: label, source: 'BL',
+              recIn: outgoing.recOut, recOut: outgoing.recOut,
+              transition: { type: String(effectId), duration: e2 - s, recStart: s }, fps: seqRate,
+            }));
+          }
+        }
       }
     });
     const atracks = media.audio && media.audio.track ? (Array.isArray(media.audio.track) ? media.audio.track : [media.audio.track]) : [];

package/resolve-advanced/server/tools/drt.mjs

@@ -153,7 +153,7 @@ function requirePathArg(args, key, action) {
 export const drtTool = {
   name: 'drt',
   description:
-    'DaVinci Resolve Timeline (.drt) operations — offline, no Resolve required. Actions: assemble_from_interchange (EDL/OTIO/XML/AAF + sourceMap → IMPORTABLE RENDERING native .drt in one call; retimes AUTHOR — constant speed fwd/rev AND zero-speed freezes (EDL M2 000.0; render-proven frozen); cross-dissolves are AUTHORED when the cut abuts with handles both sides (render-verified on 19), else dropped with reason; EDL BL fades AUTHOR too — BL legs become Solid Color generators and the fade a real clip-to-generator dissolve, luma-ramp render-verified, while Resolve\'s OWN EDL importer drops BL dissolves silently; ledger in `conform`), assemble (spec → IMPORTABLE native-schema .drt via template-spliced real structures; pass targetAppVersion e.g. \'19.1\' for pre-21 hosts), parse, list_sequences (enumerate the timelines inside a .drp/.drt → [{id,name,eventCount,index}] to drive a "which sequence?" picker), author, validate, inject_into_drp, extract_from_drp (pull one SeqContainer out as a .drt — feed the .drt to the Python davinci-resolve MCP timeline.import_timeline_checked, or use timeline.import_from_drp to do both), downgrade (stamp <ProjectVersion> down so an OLDER Resolve will import a .drt/.drp from a newer one — pass targetAppVersion like "19.1.3" or targetProjectVersion).',
+    'DaVinci Resolve Timeline (.drt) operations — offline, no Resolve required. Actions: assemble_from_interchange (EDL/OTIO/XML/AAF + sourceMap → IMPORTABLE RENDERING native .drt in one call; retimes AUTHOR — constant speed fwd/rev AND zero-speed freezes (EDL M2 000.0; render-proven frozen); cross-dissolves are AUTHORED when the cut abuts with handles both sides (render-verified on 19), else dropped with reason; fades AUTHOR across ALL FOUR formats (EDL BL legs, OTIO gap-adjacent Transitions, XMEML edge transitionitems, AAF filler-adjacent Transitions) and AAF overlap-consuming dissolves reconcile+author (CutPoint honored; before E93 they threw at the overlap gate) — BL legs become Solid Color generators and the fade a real clip-to-generator dissolve, luma-ramp render-verified, while Resolve\'s OWN EDL importer drops BL dissolves silently; ledger in `conform`), assemble (spec → IMPORTABLE native-schema .drt via template-spliced real structures; pass targetAppVersion e.g. \'19.1\' for pre-21 hosts), parse, list_sequences (enumerate the timelines inside a .drp/.drt → [{id,name,eventCount,index}] to drive a "which sequence?" picker), author, validate, inject_into_drp, extract_from_drp (pull one SeqContainer out as a .drt — feed the .drt to the Python davinci-resolve MCP timeline.import_timeline_checked, or use timeline.import_from_drp to do both), downgrade (stamp <ProjectVersion> down so an OLDER Resolve will import a .drt/.drp from a newer one — pass targetAppVersion like "19.1.3" or targetProjectVersion).',
   async handler({ action, args }) {
     if (action === 'parse') {
       const p = parseSchema.parse(requirePathArg(args, 'drtPath', 'parse'));

package/src/granular/common.py

@@ -87,7 +87,7 @@ if not logging.getLogger().handlers:
         handlers=[logging.StreamHandler()],
     )
 
-VERSION = "2.150.0"
+VERSION = "2.152.0"
 logger = logging.getLogger("davinci-resolve-mcp")
 logger.info(f"Starting DaVinci Resolve MCP Server v{VERSION}")
 logger.info(f"Detected platform: {get_platform()}")

package/src/server.py

@@ -11,7 +11,7 @@ Usage:
     python src/server.py --full       # Start the 353-tool granular server instead
 """
 
-VERSION = "2.150.0"
+VERSION = "2.152.0"
 
 import base64
 import os