davinci-resolve-mcp 2.166.0 → 2.167.0

package/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 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.167.0 — E109: flat AAF sound slots keep their lanes; AAF audio cross-fades render
+
+An Avid turnover carries dialog, music and effects as SEPARATE flat sound
+MobSlots. The AAF walker labelled every flat slot `A` (only `NestedScope`
+layers were numbered), so a dialog lane and a music bed collided on A1 and
+the bridge refused the whole turnover ("audio events overlap on audio track
+1 — one track cannot hold both"). The sound `Transition` between the dialog
+clips parsed fine; the lane collapse was the block.
+
+### Fixed
+
+- **Flat AAF slots number per media kind in slot order** (`A`, `A2`, `A3` …
+  / `V`, `V2` …). The first slot of a kind keeps the bare letter; `NestedScope`
+  layers keep their own layer numbering. Render-measured on 19.1.3.7: an AAF
+  with a dialog lane (−21 dBFS tone → 24f `MonoAudioDissolve` → −41 dBFS
+  tone) over a quiet music bed on its own slot conforms, imports, and renders
+  the cross-fade −26.0 → −29.3 → −32.5 → −37.5 → −41.6 dBFS across exactly its
+  window, with the second lane audibly present (−41.6 vs −47.1 for one lane).
+- **Channel legs still place once.** Resolve's own AAF export writes one slot
+  per audio channel with identical legs; the bridge's merge (and
+  `verify_roundtrip`'s dedupe) now key on source/range rather than the lane,
+  so channel legs of one clip merge while a different bed on its own lane
+  never does.
+
 ## What's New in v2.166.0 — E108: XMEML audio cross-fades conform and render
 
 The XMEML walker only looked at `<transitionitem>`s on VIDEO tracks, so an

package/README.md

@@ -2,7 +2,7 @@
 
 English | [简体中文](README.zh-CN.md)
 
-[![Version](https://img.shields.io/badge/version-2.166.0-blue.svg)](https://github.com/samuelgursky/davinci-resolve-mcp/releases)
+[![Version](https://img.shields.io/badge/version-2.167.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.166.0-blue.svg)](https://github.com/samuelgursky/davinci-resolve-mcp/releases)
+[![Version](https://img.shields.io/badge/version-2.167.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.166.0 版 README。如与英文原版有出入，以 [英文原版](README.md) 为准。
+> 本翻译对应 v2.167.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.166.0"
+VERSION = "2.167.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.166.0",
+  "version": "2.167.0",
   "description": "NPM bootstrapper for the DaVinci Resolve MCP Server.",
   "license": "MIT",
   "author": "Samuel Gursky <samgursky@gmail.com>",

package/resolve-advanced/README.md

@@ -201,8 +201,11 @@ plausible-looking short event list. Three limits are deliberate:
 - **Effect-only layers produce no events.** A layer wrapping `ScopeReference` (subtitle burns, blends,
   mattes) applies to what shows through from below and references no media of its own. OTIO materializes
   such layers as tracks of gaps, so its track count can exceed the number of layers with media.
-- **Only `NestedScope` layers are numbered.** Non-nested slots keep the flat `V`/`A` label, which is what
-  `editorial.mjs`'s `/^A\d*$/` audio-follows-video heuristic reads (`A`, `A2`, … all count as audio).
+- **Flat slots number per media kind in slot order** (`A`, `A2`, `A3` … / `V`, `V2` …): an Avid
+  turnover carries dialog, music and effects as SEPARATE flat sound MobSlots, and labelling them all
+  `A` stacked every bed onto one lane where the bridge refuses the overlap (measured, E109). The first
+  slot of a kind keeps the bare letter; `NestedScope` layers keep their own layer numbering. This is
+  what `editorial.mjs`'s `/^A\d*$/` audio-follows-video heuristic reads (`A`, `A2`, … all count as audio).
 
 ## Provenance & license
 Vendored libraries are clean offline format-interop and deterministic compute code: no secrets, no

package/resolve-advanced/server/aaf_probe.py

@@ -1248,7 +1248,8 @@ def _walk_slot(segment, *, prefix, fps, state):
 
     A NestedScope slot is a multi-layer track: each layer gets its own numbered label
     (V1..Vn / A1..An) and restarts at record 0, because layers are parallel, not
-    sequential. A plain (single-layer) slot keeps the flat "V"/"A" label.
+    sequential. A plain (single-layer) slot keeps the label the caller numbered it
+    with (first of its kind bare "V"/"A", then "A2", "A3" … per slot order — E109).
     """
     if type(segment).__name__ == "NestedScope":
         for n, layer in enumerate(_nested_layers(segment), start=1):
@@ -1456,6 +1457,13 @@ def probe(path):
             # `idx` is monotonic across the WHOLE mob, every slot and every nested layer.
             state = {"idx": 1, "events": [], "unhandled": {}, "effectsWithoutEvents": {}}
             edit_fps = None
+            # FLAT slots number per media kind in slot order (A, A2, A3 … / V, V2 …):
+            # an Avid turnover carries dialog, music and effects as SEPARATE flat
+            # sound MobSlots, and labelling them all "A" stacked every bed onto one
+            # lane where the bridge refuses the overlap (measured, E109). The first
+            # slot of a kind keeps the bare letter (compat with every reader that
+            # matches /^A$/); NestedScope layers keep their own layer numbering.
+            kind_ordinal = {"A": 0, "V": 0}
             for slot in getattr(mob, "slots", []) or []:
                 seg = getattr(slot, "segment", None)
                 if seg is None:
@@ -1467,7 +1475,11 @@ def probe(path):
                 fps = _fps_from_edit_rate(getattr(slot, "edit_rate", None))
                 if edit_fps is None:
                     edit_fps = fps  # picks the timecode slot to trust — see above
-                _walk_slot(seg, prefix=_media_kind_to_track(slot), fps=fps, state=state)
+                letter = _media_kind_to_track(slot)
+                kind_ordinal[letter] += 1
+                is_nested = getattr(seg, "class_name", "") == "NestedScope" or type(seg).__name__ == "NestedScope"
+                label = letter if (kind_ordinal[letter] == 1 or is_nested) else f"{letter}{kind_ordinal[letter]}"
+                _walk_slot(seg, prefix=label, fps=fps, state=state)
             events = state["events"]
             sequences.append(
                 {

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

@@ -254,15 +254,19 @@ export function eventsToAssembleSpec(events, opts = {}) {
   const isMarker = (t) => t === 'MARKER';
   const vids = events.filter((e) => !isAudio(e.track) && !isMarker(e.track) && e.recIn != null && e.recOut != null);
   // AAF exports one event per audio CHANNEL — a stereo/dual-mono clip arrives
-  // as identical A-track legs (measured on a Resolve 19 rich export: every
-  // audio event duplicated). Merge exact duplicates (same track/source/range)
-  // so they place once instead of refusing as a same-track overlap.
+  // as identical legs, one per channel slot (measured on a Resolve 19 rich
+  // export: every audio event duplicated). Merge exact duplicates (same
+  // source/range/srcIn) so they place once instead of refusing as a
+  // same-track overlap. The key deliberately ignores the LANE: since E109
+  // flat slots number A, A2, A3 …, so channel legs of one clip arrive on
+  // different lanes — still one clip, placed once — while a different bed on
+  // its own lane (dialog A, music A2) keeps its lane and never merges.
   const audsRaw = events.filter((e) => isAudio(e.track) && e.recIn != null && e.recOut != null);
   const seenAud = new Set();
   const auds = [];
   let audioChannelLegsMerged = 0;
   for (const e of audsRaw) {
-    const k = `${e.track}|${e.source}|${e.recIn}|${e.recOut}|${e.srcIn}`;
+    const k = `${e.source}|${e.recIn}|${e.recOut}|${e.srcIn}|${e.speed ?? 100}|${e.reverse ? 1 : 0}`;
     if (seenAud.has(k)) { audioChannelLegsMerged += 1; continue; }
     seenAud.add(k);
     auds.push(e);
@@ -976,12 +980,13 @@ export function verifyRoundtrip(inputEvents, exportedEvents, opts = {}) {
   // AUDIO (E97): compared only when the INPUT declares audio events — a
   // video-only turnover legitimately re-exports with audio (the A1
   // convenience mirror), which is reported informationally, never failed.
-  // AAF channel legs dedupe (same track/source/range arrives once per
-  // channel); BL/silence legs merge out like video black.
+  // AAF channel legs dedupe (the same source/range arrives once per channel
+  // slot — on numbered lanes since E109, so the key ignores the lane the way
+  // the bridge's placement merge does); BL/silence legs merge out like black.
   const dedupeAud = (list) => {
     const seen = new Set();
     return list.filter((e) => {
-      const k = `${e.track}|${e.source}|${e.recIn}|${e.recOut}|${e.srcIn}`;
+      const k = `${e.source}|${e.recIn}|${e.recOut}|${e.srcIn}`;
       if (seen.has(k)) return false;
       seen.add(k);
       return true;

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

@@ -86,7 +86,7 @@ const markerSchema = z.object({
 export const editorialTool = {
   name: 'editorial',
   description:
-    'Editorial integrity (Cluster E) — turnover interchange → normalized events → changelist + conform manifest with TIMING silent-lie guards (flattened retime / dropped J/L-cut audio / framerate-pulldown slip / reverse dropped / transition-handle starvation → flag, skip-not-fake). Report-only (gate: review). Actions: parse_interchange (EDL/OTIO/XMEML natively — incl. Resolve-written FCP7 -1 junction edges (paired in record order) + Solid Color generators, XMEML audio-track transitionitems as audio cross-fades on numbered lanes A/A2/…, and CMX FROM/TO CLIP NAME comments over the generic AX reel — + AAF via pyaaf2 + PRPROJ via gunzip+XML → normalized events incl. span-explicit transitions, BL fade legs, and freezes as zero-speed events (OTIO FreezeFrame, XMEML timeremap 0, PrProj in==out, AAF 0% motion effects); for AAF/PRPROJ pass the file PATH as content; AAF also returns per-sequence startTimecode/startFrame — build the timeline at THAT start, not the Resolve 01:00:00:00 default — and per-clip `geometry` for Avid transform effects), list_sequences (ONE offline picker entry point across xml/edl/otio/drt/drp/aaf/prproj → [{id,name,eventCount}], plus startTimecode/startFrame for AAF), convert_to_interchange (author OTIO/EDL/DRT Resolve CAN import from events or a parsed source; the EDL target writes CMX transition pairs incl. BL fades — the .prproj→Resolve conform bridge, no Premiere needed; editorial timing/transitions survive and per-clip effects/color do not. SPEED/REVERSE survive on the otio (LinearTimeWarp) and edl (M2) targets ONLY — this FLAT drt target flattens every retime to 100% forward and returns `flattened`/`flattenedCount` naming each event that lost one (`flattened` is always present on `drt`, empty when there were none); for a .drt that AUTHORS retimes/dissolves/multi-track/audio, use drt.assemble_from_interchange), turnover_changelist (diff old vs new → moved/retimed/trimmed/replaced/new/gone PLUS the junction diff: transition_added/transition_dropped/transition_changed with fade in/out or dissolve, outgoing/incoming, span and duration/type/pre-roll deltas — zero-length CMX carrier lines and the BL legs that carry fades fold into the junction diff instead of reading as gone/new sources; events pair by closest record position, consumed once, so a source cut twice at two speeds compares instance to instance; + timing flags incl. transition_dropped and dropped_split_audio on any A-track), conform_manifest (per-event assert: source resolved/handles/retime/reverse/TC-base; BL-aware — black legs need no source, fades no black-side handles, and a fade-out tail requirement lands on the picture source), marker_roundtrip (markers with provenance tags), verify_roundtrip (input events vs re-export events -> pass/mismatches + fitted per-source TC offsets + marker compare w/ markersNotInExport honesty flag; FADE-AWARE: BL/Solid-Color legs merge out as blackSegments and fade-window boundary reshapes are excused into fadeReshapedBoundaries instead of failing; RETIME-AWARE: speed/reverse compare pairwise — EXPORT_OTIO carries an authored Sm2TimeMap back as LinearTimeWarp (measured), so a flattened/lost retime fails as drift geometry alone cannot catch; AUDIO-AWARE: declared audio events compare (a video-only export such as EXPORT_EDL flags audioNotInExport instead of failing) (channel legs deduped, mismatches tagged trackType audio) while the mirrored-A1 export of a video-only turnover stays informational; the conform QC loop-closer). Offline (AAF needs pyaaf2; live AAF/DRP import is on the Python davinci-resolve MCP).',
+    'Editorial integrity (Cluster E) — turnover interchange → normalized events → changelist + conform manifest with TIMING silent-lie guards (flattened retime / dropped J/L-cut audio / framerate-pulldown slip / reverse dropped / transition-handle starvation → flag, skip-not-fake). Report-only (gate: review). Actions: parse_interchange (EDL/OTIO/XMEML natively — incl. Resolve-written FCP7 -1 junction edges (paired in record order) + Solid Color generators, XMEML audio-track transitionitems as audio cross-fades on numbered lanes A/A2/…, and CMX FROM/TO CLIP NAME comments over the generic AX reel — + AAF via pyaaf2 (flat sound/picture slots number A/A2/… and V/V2/… in slot order so separate beds keep their lanes; NestedScope layers keep layer numbering) + PRPROJ via gunzip+XML → normalized events incl. span-explicit transitions, BL fade legs, and freezes as zero-speed events (OTIO FreezeFrame, XMEML timeremap 0, PrProj in==out, AAF 0% motion effects); for AAF/PRPROJ pass the file PATH as content; AAF also returns per-sequence startTimecode/startFrame — build the timeline at THAT start, not the Resolve 01:00:00:00 default — and per-clip `geometry` for Avid transform effects), list_sequences (ONE offline picker entry point across xml/edl/otio/drt/drp/aaf/prproj → [{id,name,eventCount}], plus startTimecode/startFrame for AAF), convert_to_interchange (author OTIO/EDL/DRT Resolve CAN import from events or a parsed source; the EDL target writes CMX transition pairs incl. BL fades — the .prproj→Resolve conform bridge, no Premiere needed; editorial timing/transitions survive and per-clip effects/color do not. SPEED/REVERSE survive on the otio (LinearTimeWarp) and edl (M2) targets ONLY — this FLAT drt target flattens every retime to 100% forward and returns `flattened`/`flattenedCount` naming each event that lost one (`flattened` is always present on `drt`, empty when there were none); for a .drt that AUTHORS retimes/dissolves/multi-track/audio, use drt.assemble_from_interchange), turnover_changelist (diff old vs new → moved/retimed/trimmed/replaced/new/gone PLUS the junction diff: transition_added/transition_dropped/transition_changed with fade in/out or dissolve, outgoing/incoming, span and duration/type/pre-roll deltas — zero-length CMX carrier lines and the BL legs that carry fades fold into the junction diff instead of reading as gone/new sources; events pair by closest record position, consumed once, so a source cut twice at two speeds compares instance to instance; + timing flags incl. transition_dropped and dropped_split_audio on any A-track), conform_manifest (per-event assert: source resolved/handles/retime/reverse/TC-base; BL-aware — black legs need no source, fades no black-side handles, and a fade-out tail requirement lands on the picture source), marker_roundtrip (markers with provenance tags), verify_roundtrip (input events vs re-export events -> pass/mismatches + fitted per-source TC offsets + marker compare w/ markersNotInExport honesty flag; FADE-AWARE: BL/Solid-Color legs merge out as blackSegments and fade-window boundary reshapes are excused into fadeReshapedBoundaries instead of failing; RETIME-AWARE: speed/reverse compare pairwise — EXPORT_OTIO carries an authored Sm2TimeMap back as LinearTimeWarp (measured), so a flattened/lost retime fails as drift geometry alone cannot catch; AUDIO-AWARE: declared audio events compare (a video-only export such as EXPORT_EDL flags audioNotInExport instead of failing) (channel legs deduped, mismatches tagged trackType audio) while the mirrored-A1 export of a video-only turnover stays informational; the conform QC loop-closer). Offline (AAF needs pyaaf2; live AAF/DRP import is on the Python davinci-resolve MCP).',
   async handler({ action, args }) {
     if (action === 'parse_interchange') {
       const p = parseSchema.parse(args);

package/src/granular/common.py

@@ -87,7 +87,7 @@ if not logging.getLogger().handlers:
         handlers=[logging.StreamHandler()],
     )
 
-VERSION = "2.166.0"
+VERSION = "2.167.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.166.0"
+VERSION = "2.167.0"
 
 import base64
 import os