davinci-resolve-mcp 2.196.0 → 2.198.0

package/CHANGELOG.md

@@ -2,6 +2,46 @@
 
 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.198.0 — E146: verify_roundtrip consults the changelist's laws
+
+### Added
+
+- **`verify_roundtrip` consults the changelist's laws.** A round-trip verify
+  of a real offline→online reel reported 216 mismatches, 191 of them the
+  proxies' `4K-2K` names against the masters' `4K`. The verify now runs the
+  changelist first and adopts its inferred source renames (reported in
+  `sourceAliases` beside any explicit ones), excuses a record edge the
+  changelist folded into a `junction_realigned` (reported in
+  `junctionRealigned`, like fade reshapes), treats a black generator by any
+  name as black on both sides, and reports a named generator the export
+  does not carry (a counting leader) as `generatorsNotInExport` instead of
+  an index cascade over every cut that follows it. `inferAliases: false`
+  turns the adoption off. On the real reel: 216 → 57 mismatches against the
+  bridge-authored timeline and 205 → 21 against the hand conform, what
+  remains being the conform's own differences (the eye-matched re-conform
+  onto other media, and the hand conform's four retimed layers) plus one
+  missing clip's index cascade.
+
+## What's New in v2.197.0 — E145: a named generator is a black leg or a named hole
+
+### Fixed
+
+- **A named generator no longer refuses the whole reel.** Once E141 named
+  Premiere's synthetic items by their title, a Universal Counting Leader
+  arrived at the bridge as an event with no file and no source-map entry,
+  and `eventsToAssembleSpec` refused the entire 228-cut reel as an "unmapped
+  source reel". Now a black generator (Black Video, black, slug) authors as
+  the BL leg it is — a Solid Color that renders black — and any other named
+  generator with no Resolve equivalent is dropped with a reason in
+  `report.unresolvedGenerators` (name, track, record window), a hole the
+  ledger names, the way unresolved compounds already are. A source map that
+  maps the generator's name to a rendered file places it like media. An
+  unmapped real reel still refuses.
+
+On the real turnover: reels 02, 03 and 04 now conform offline through the
+bridge — 226 / 147 / 257 video cuts, every dissolve and retime authored,
+two leaders per reel reported as holes, black authored as black.
+
 ## What's New in v2.196.0 — E144: Resolve's own retimes decode; a flat map is a freeze
 
 ### Fixed

package/README.md

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

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

@@ -9,6 +9,7 @@
  * fidelity; per-clip effects/color do NOT (the Premiere→Resolve semantic gap, flagged not faked).
  */
 import { drt } from './libs.mjs';
+import { diffChangelist } from './editorial.mjs';
 
 const COLOR_MAP = {
   blue: 'Blue', cyan: 'Cyan', green: 'Green', yellow: 'Yellow', red: 'Red',
@@ -296,6 +297,27 @@ export function eventsToAssembleSpec(events, opts = {}) {
       }
     }
   }
+  // NAMED GENERATORS (E145): a Premiere Universal Counting Leader / Black
+  // Video (E141 names them by their Media <Title>) or a DRT generator clip
+  // arrives as an event with generatorName and no file. Black authors as the
+  // BL leg it is (a Solid Color that renders black); anything else has no
+  // Resolve equivalent the bridge can place, so it is DROPPED with a reason
+  // in unresolvedGenerators — a hole the ledger names — instead of refusing
+  // the whole reel as an unmapped source (a real 228-cut reel refused over
+  // its counting leader).
+  const unresolvedGenerators = [];
+  const isBlackGenerator = (name) => /^(black|black video|black matte|slug)$/i.test(String(name || '').trim());
+  for (const list of [vids, auds]) {
+    for (let i = list.length - 1; i >= 0; i -= 1) {
+      const e = list[i];
+      if (sourceMap[e.source] || isBL(e.source)) continue;
+      const gen = e.generatorName || (isBlackGenerator(e.source) ? e.source : null);
+      if (!gen) continue;
+      if (isBlackGenerator(gen)) { list[i] = { ...e, source: 'BL', generatorName: gen }; continue; }
+      unresolvedGenerators.push({ name: gen, track: e.track, recIn: e.recIn, recOut: e.recOut, reason: 'a named generator with no media and no Resolve equivalent the bridge can author — map its name to a rendered file in sourceMap, or accept the hole' });
+      list.splice(i, 1);
+    }
+  }
   const unmapped = [...new Set([...vids, ...auds].map((e) => e.source).filter((srcName) => !isBL(srcName) && !sourceMap[srcName]))];
   if (unmapped.length) {
     throw new Error(
@@ -737,6 +759,7 @@ export function eventsToAssembleSpec(events, opts = {}) {
       flattenedCompounds: [...new Set(events.filter((e) => e.fromCompound).map((e) => e.fromCompound))],
       flattenedCompoundEvents: events.filter((e) => e.fromCompound).length,
       unresolvedCompounds,
+      unresolvedGenerators,
       authoredAudioEvents: audioPlacements.length,
       audioRetimesSkipped,
       audioLanesBeyondCeiling,
@@ -918,15 +941,44 @@ export function verifyRoundtrip(inputEvents, exportedEvents, opts = {}) {
   // canonicalize exactly like event sources.
   const aliases = {};
   for (const [k, v] of Object.entries(opts.sourceAliases || {})) aliases[canonSource(k)] = canonSource(v);
+  // RELINK + REALIGN laws (E146): the changelist already knows how an
+  // offline→online turnover renames its media (proxies "4K-2K" → masters
+  // "4K", ".mp4" → ".mov"; E141) and how a conform re-centres a cut inside
+  // an unchanged dissolve (E142). A round-trip verify that ignores them
+  // reports 191 source mismatches on a real reel whose picture is the same.
+  // Run the changelist once, adopt its inferred aliases, and let its
+  // junction_realigned list excuse the record edges it explains.
+  const changelistAliases = [];
+  const realignedJunctions = [];
+  if (opts.inferAliases !== false) {
+    try {
+      const explicit = Object.entries(opts.sourceAliases || {}).map(([from, to]) => ({ from, to }));
+      const d = diffChangelist(inputEvents, exportedEvents, { sourceAliases: explicit, inferAliases: true });
+      for (const a of d.sourceAliases || []) {
+        if (!a.inferred) continue;
+        changelistAliases.push(a);
+        if (aliases[canonSource(a.from)] === undefined) aliases[canonSource(a.from)] = canonSource(a.to);
+      }
+      for (const c of d.changes || []) if (c.kind === 'junction_realigned') realignedJunctions.push(c);
+    } catch {
+      /* the changelist is advisory here — a verify never fails because the diff could not run */
+    }
+  }
   const mapSource = (s) => aliases[s] ?? s;
   // recOut > recIn: an EDL dissolve writes a ZERO-duration outgoing leg
   // before the D event — a pairing placeholder, never a rendered clip, and
   // no export reproduces it.
   const vids = (evts) => evts.filter((e) => /^V\d*$/.test(String(e.track)) && e.recIn != null && e.recOut != null && e.recOut > e.recIn);
   const audsOf = (evts) => evts.filter((e) => /^A\d*$/.test(String(e.track)) && e.recIn != null && e.recOut != null && e.recOut > e.recIn);
+  // The record origin anchors on real PICTURE: a named generator leg (a
+  // counting leader at 0) is synthetic and an export may drop it (E146), and
+  // an anchor that moved with it would slide every later cut by its length.
+  const isNamedGenerator = (e) => Boolean(e.generatorName) && !/^(black|black video|solid color|slug)$/i.test(String(e.generatorName));
   const anchorOfSide = (evts) => {
-    const v = vids(evts);
+    const v = vids(evts).filter((e) => !isNamedGenerator(e));
     if (v.length) return Math.min(...v.map((e) => e.recIn));
+    const vg = vids(evts);
+    if (vg.length) return Math.min(...vg.map((e) => e.recIn));
     const au = audsOf(evts);
     return au.length ? Math.min(...au.map((e) => e.recIn)) : 0;
   };
@@ -935,7 +987,7 @@ export function verifyRoundtrip(inputEvents, exportedEvents, opts = {}) {
     if (!v.length) return [];
     const off = anchorOfSide(evts);
     return v
-      .map((e) => ({ track: canonTrack(e.track), source: mapSource(canonSource(e.source)), recIn: e.recIn - off, recOut: e.recOut - off, srcIn: e.srcIn ?? 0, speed: e.speed ?? 100, reverse: Boolean(e.reverse), color: e.color && typeof e.color === 'object' ? { r: Number(e.color.r) || 0, g: Number(e.color.g) || 0, b: Number(e.color.b) || 0 } : null, compound: e.compound || null, fromCompound: e.fromCompound || null }))
+      .map((e) => ({ track: canonTrack(e.track), source: mapSource(canonSource(e.source)), recIn: e.recIn - off, recOut: e.recOut - off, srcIn: e.srcIn ?? 0, speed: e.speed ?? 100, reverse: Boolean(e.reverse), color: e.color && typeof e.color === 'object' ? { r: Number(e.color.r) || 0, g: Number(e.color.g) || 0, b: Number(e.color.b) || 0 } : null, compound: e.compound || null, fromCompound: e.fromCompound || null, generatorName: e.generatorName || null }))
       .sort((a, b) => a.track.localeCompare(b.track) || a.recIn - b.recIn);
   };
   // FADES (E94): BL legs on the input side and the Solid Color generators a
@@ -946,8 +998,15 @@ export function verifyRoundtrip(inputEvents, exportedEvents, opts = {}) {
   // picture edge by up to the transition duration (matching Resolve's own
   // start-at-cut reshaping), so an edge within an input junction's fade
   // window is excused — and reported, not silently absorbed.
-  const isBlackSeg = (e) => /^(bl|black|solid color)$/.test(e.source);
+  // A black generator by any name (E145: Premiere's Black Video, a slug) is black too.
+  const isBlackSeg = (e) => /^(bl|black|solid color|black video|black matte|slug)$/.test(e.source) || Boolean(e.generatorName && /^(black|black video|solid color|slug)$/i.test(e.generatorName));
   const inAnchor = anchorOfSide(inputEvents);
+  const exAnchor = anchorOfSide(exportedEvents);
+  // A record edge that the changelist folded into a junction_realigned is
+  // the same picture — excused and reported, like a fade reshape.
+  const junctionRealigned = [];
+  const realignedEdge = (edgeIn, edgeExp, track) => realignedJunctions.some((c) => canonTrack(c.track) === track
+    && Math.abs((c.oldRecIn - inAnchor) - edgeIn) <= recTol && Math.abs((c.newRecIn - exAnchor) - edgeExp) <= recTol);
   const junctionsFor = (trackRe) => inputEvents
     .filter((e) => trackRe.test(String(e.track)) && e.recIn != null && e.transition && e.transition.duration > 0)
     .map((e) => ({ frame: e.recIn - inAnchor, d: e.transition.duration }));
@@ -968,9 +1027,13 @@ export function verifyRoundtrip(inputEvents, exportedEvents, opts = {}) {
       const inBad = Math.abs(x.recIn - y.recIn) > recTol;
       const outBad = Math.abs(x.recOut - y.recOut) > recTol;
       if (inBad || outBad) {
-        const inExcused = !inBad || inFadeWindow(x.recIn, y.recIn);
-        const outExcused = !outBad || inFadeWindow(x.recOut, y.recOut);
-        if (inExcused && outExcused) {
+        const inRealigned = inBad && realignedEdge(x.recIn, y.recIn, x.track);
+        const outRealigned = outBad && realignedEdge(x.recOut, y.recOut, x.track);
+        const inExcused = !inBad || inRealigned || inFadeWindow(x.recIn, y.recIn);
+        const outExcused = !outBad || outRealigned || inFadeWindow(x.recOut, y.recOut);
+        if ((inRealigned || outRealigned) && inExcused && outExcused) {
+          junctionRealigned.push({ at: i, ...tt, source: x.source, input: [x.recIn, x.recOut], exported: [y.recIn, y.recOut] });
+        } else if (inExcused && outExcused) {
           fadeReshapedBoundaries.push({ at: i, ...tt, source: x.source, input: [x.recIn, x.recOut], exported: [y.recIn, y.recOut] });
         } else {
           mismatches.push({ kind: 'record', ...tt, at: i, input: [x.recIn, x.recOut], exported: [y.recIn, y.recOut] });
@@ -1056,9 +1119,23 @@ export function verifyRoundtrip(inputEvents, exportedEvents, opts = {}) {
     for (const e of inner) collapsedIn.add(e);
     collapsedEx.add(ex);
   }
-  const a = a0.filter((e) => !isBlackSeg(e) && !collapsedIn.has(e));
+  // GENERATORS THE EXPORT DOES NOT CARRY (E146): a named generator leg on
+  // the input (a counting leader) that no exported event of the same name
+  // covers is a capability hole the bridge already names
+  // (unresolvedGenerators) — reported as generatorsNotInExport, never a
+  // count/index cascade over every cut that follows it.
+  const generatorsNotInExport = [];
+  const genMissing = new Set();
+  for (const e of a0) {
+    if (!e.generatorName || isBlackSeg(e) || collapsedIn.has(e)) continue;
+    const partner = b0.find((x) => x.track === e.track && x.source === e.source && x.recIn < e.recOut && x.recOut > e.recIn);
+    if (partner) continue;
+    genMissing.add(e);
+    generatorsNotInExport.push({ name: e.generatorName, track: e.track, record: [e.recIn, e.recOut] });
+  }
+  const a = a0.filter((e) => !isBlackSeg(e) && !collapsedIn.has(e) && !genMissing.has(e));
   const b = b0.filter((e) => !isBlackSeg(e) && !collapsedEx.has(e));
-  const blackSegments = { input: a0.length - a.length, exported: b0.length - b.length };
+  const blackSegments = { input: a0.length - a.length - genMissing.size, exported: b0.length - b.length };
   const n = comparePairs(a, b, junctionsFor(/^V\d*$/), 'video');
 
   // AUDIO (E97): compared only when the INPUT declares audio events — a
@@ -1126,6 +1203,9 @@ export function verifyRoundtrip(inputEvents, exportedEvents, opts = {}) {
   mismatches.push(...generatorColours.mismatches);
   return {
     pass: mismatches.length === 0, pairs: n, srcOffsets, mismatches, markers,
+    sourceAliases: [...Object.entries(opts.sourceAliases || {}).map(([from, to]) => ({ from, to, inferred: false })), ...changelistAliases],
+    junctionRealigned,
+    generatorsNotInExport,
     ...(generatorColours.compared ? { generatorColours } : {}),
     ...(generatorColourNotInExport ? { generatorColourNotInExport } : {}),
     ...(compoundsCollapsedInExport.length ? { compoundsCollapsedInExport } : {}),

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

@@ -90,7 +90,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 OTIO generator clips (a Solid Color is a Clip with a NULL media_reference; it walks as a BL leg with generatorName, and an OTIO GeneratorReference carries its colour) and nested OTIO Stacks (compound clips — Resolve\'s writer nests them with a trim window) FLATTEN into record time with fromCompound on each cut, so Resolve\'s own OTIO exports re-conform (its FCP7 XML writer flattens a compound to ONE media-less clipitem instead — tagged `compound`, which the bridge drops with a reason in unresolvedCompounds unless the sourceMap maps the compound name to a flattened media file), Resolve-written FCP7 -1 junction edges (paired in record order) + Solid Color / Color Matte generators carrying their `fillcolor` (BL legs with `color` → fade-to-white and colour mattes author, E110), 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; a NESTED SEQUENCE used as a clip — a SourceClip referencing a named CompositionMob — flattens through its reference window with fromCompound, like OTIO Stacks) + PRPROJ via gunzip+XML (real Premiere 2025 files — uuid ObjectUID/ObjectURef graph, TrackGroups, ClipTrackItem→SubClip→VideoClip→MediaSource→Media chain, zeros written as absence — and the legacy ObjectID/VideoTracks shape both walk; measured on a 739-sequence turnover that used to list ZERO; a NESTED SEQUENCE used as a clip — Source = Video/AudioSequenceSource → Sequence — flattens through its in-point window with fromCompound, like OTIO Stacks and AAF nested compositions; 13,711 such events on one real reels project; real transitions live in the track\'s TransitionItems list — read alongside ClipItems, attached with their DisplayName as type, HasOutgoingClip/HasIncomingClip false = fade from/to black or silence; tracks number as lanes V/V2…/A/A2… and a flattened nested sequence\'s inner lanes first-fit above what the parent already stacks — laneShift records the shift; markers are the sequence\'s OWN, read from Premiere\'s DVAMarker JSON) → 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/DRT/DRP pass the file PATH as content; DRT/DRP walk ONE timeline (`timeline` = pool name or index; default the first timeline-kind container) into events with sequence-relative record positions + the returned startFrame/startTimecode/fps read from the pool sequence — <In> is the source in-point (EMPTY on real audio clips → srcInAbsent), a keyed MediaTimemapBA Sm2TimeMap decodes to the speed (E140: the four retimed clips of a real reel read 80 — Premiere\'s 80 for the same cuts — with srcOut following the record window at that speed — and on a retime <In> is RECORD-domain (E143, measured live: the map spans the whole source stretched by 1/speed and the clip windows into that), so the event\'s srcIn is In × speed with the raw value kept as recordDomainIn; a hand conform that typed the source frame straight into In of an 80% clip shows a frame 20% of In earlier than intended, and this reader now says so; XMax 60000 + zero slope = a freeze → the zero-speed in==out event; a negative slope = reverse; a map the decoder cannot read stays speed null + retimeUnknown, never faked to 100%), Sm2TiTransition alignment 2 centres on the cut and 3 ends at it — so two Resolve timeline VERSIONS diff through turnover_changelist (E139); 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 and nestedIn — an AAF composition another composition uses as a clip is NESTED in it; offer the parent, its cuts arrive flattened), 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 → a SHAPE verdict first — identical | subset (new keeps some of old\'s cuts unchanged in place and nothing else: a patch/selects reel of the same cut, NOT N deletions; a real Premiere auto-save kept 3 of 335) | superset (the reverse) | edit — with retained/oldCuts/newCuts, `sparse` and the retainedWindows for subset/superset, a transition that vanished or appeared with the cuts it joins counting as a consequence not an edit; RELINK-AWARE (E141): sourceAliases ({from,to} | {pattern,replace}) rename old sources before pairing, a systematic rename is INFERRED from unpaired cuts sharing a record window (one-to-one, recurring or clearly the same name) and reported in sourceAliases — a real offline→online turnover paired 15 of 228 cuts until the "4K-2K" proxies aliased to the "4K" masters, then 186 — and a constant per-source source-window shift witnessed on ≥2 cuts is a TC REBASE (sourceTcOffsets), not trims; a cut moved INSIDE an unchanged dissolve span with the incoming\'s source-in and the outgoing\'s source-out sliding by the same delta is ONE junction_realigned (E142: Premiere keeps a fractional alignment, Resolve\'s conform re-centres it — 9 of 10 residual moves on a real reel were this; same picture, a consequence not an edit) and two labels of one transition family ("Cross Dissolve (Legacy)" vs "Cross Dissolve") are a relabel in transitionRelabels, so a picture-identical conform reads shape `equivalent`; then 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; a compound seen collapsed in one cut and flattened in the other reports compound_collapsed/compound_expanded once, never replaced+gone), 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; a compound clipitem fails source_resolved by NAME with the remedy — map it to a flattened file or turn over as OTIO), 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; COLOUR-AWARE: an input generator leg carrying a fillcolor (fade-to-white, colour matte) must come back on the same track over its span with the same colour — Resolve\'s FCP7 writer emits it — else generator-colour fails (generatorColours reports the compare) — pass exportedFormat: an OTIO/EDL re-export cannot carry colour (measured) and reports generatorColourNotInExport instead of failing; COMPOUND-AWARE: an XML re-export that collapsed a compound to one clipitem over cuts the input flattened from that compound reports compoundsCollapsedInExport instead of count/source drift; 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 OTIO generator clips (a Solid Color is a Clip with a NULL media_reference; it walks as a BL leg with generatorName, and an OTIO GeneratorReference carries its colour) and nested OTIO Stacks (compound clips — Resolve\'s writer nests them with a trim window) FLATTEN into record time with fromCompound on each cut, so Resolve\'s own OTIO exports re-conform (its FCP7 XML writer flattens a compound to ONE media-less clipitem instead — tagged `compound`, which the bridge drops with a reason in unresolvedCompounds unless the sourceMap maps the compound name to a flattened media file), Resolve-written FCP7 -1 junction edges (paired in record order) + Solid Color / Color Matte generators carrying their `fillcolor` (BL legs with `color` → fade-to-white and colour mattes author, E110), 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; a NESTED SEQUENCE used as a clip — a SourceClip referencing a named CompositionMob — flattens through its reference window with fromCompound, like OTIO Stacks) + PRPROJ via gunzip+XML (real Premiere 2025 files — uuid ObjectUID/ObjectURef graph, TrackGroups, ClipTrackItem→SubClip→VideoClip→MediaSource→Media chain, zeros written as absence — and the legacy ObjectID/VideoTracks shape both walk; measured on a 739-sequence turnover that used to list ZERO; a NESTED SEQUENCE used as a clip — Source = Video/AudioSequenceSource → Sequence — flattens through its in-point window with fromCompound, like OTIO Stacks and AAF nested compositions; 13,711 such events on one real reels project; real transitions live in the track\'s TransitionItems list — read alongside ClipItems, attached with their DisplayName as type, HasOutgoingClip/HasIncomingClip false = fade from/to black or silence; tracks number as lanes V/V2…/A/A2… and a flattened nested sequence\'s inner lanes first-fit above what the parent already stacks — laneShift records the shift; markers are the sequence\'s OWN, read from Premiere\'s DVAMarker JSON) → 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/DRT/DRP pass the file PATH as content; DRT/DRP walk ONE timeline (`timeline` = pool name or index; default the first timeline-kind container) into events with sequence-relative record positions + the returned startFrame/startTimecode/fps read from the pool sequence — <In> is the source in-point (EMPTY on real audio clips → srcInAbsent), a keyed MediaTimemapBA Sm2TimeMap decodes to the speed (E140: the four retimed clips of a real reel read 80 — Premiere\'s 80 for the same cuts — with srcOut following the record window at that speed — and on a retime <In> is RECORD-domain (E143, measured live: the map spans the whole source stretched by 1/speed and the clip windows into that), so the event\'s srcIn is In × speed with the raw value kept as recordDomainIn; a hand conform that typed the source frame straight into In of an 80% clip shows a frame 20% of In earlier than intended, and this reader now says so; XMax 60000 + zero slope = a freeze → the zero-speed in==out event; a negative slope = reverse; a map the decoder cannot read stays speed null + retimeUnknown, never faked to 100%), Sm2TiTransition alignment 2 centres on the cut and 3 ends at it — so two Resolve timeline VERSIONS diff through turnover_changelist (E139); 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 and nestedIn — an AAF composition another composition uses as a clip is NESTED in it; offer the parent, its cuts arrive flattened), 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 → a SHAPE verdict first — identical | subset (new keeps some of old\'s cuts unchanged in place and nothing else: a patch/selects reel of the same cut, NOT N deletions; a real Premiere auto-save kept 3 of 335) | superset (the reverse) | edit — with retained/oldCuts/newCuts, `sparse` and the retainedWindows for subset/superset, a transition that vanished or appeared with the cuts it joins counting as a consequence not an edit; RELINK-AWARE (E141): sourceAliases ({from,to} | {pattern,replace}) rename old sources before pairing, a systematic rename is INFERRED from unpaired cuts sharing a record window (one-to-one, recurring or clearly the same name) and reported in sourceAliases — a real offline→online turnover paired 15 of 228 cuts until the "4K-2K" proxies aliased to the "4K" masters, then 186 — and a constant per-source source-window shift witnessed on ≥2 cuts is a TC REBASE (sourceTcOffsets), not trims; a cut moved INSIDE an unchanged dissolve span with the incoming\'s source-in and the outgoing\'s source-out sliding by the same delta is ONE junction_realigned (E142: Premiere keeps a fractional alignment, Resolve\'s conform re-centres it — 9 of 10 residual moves on a real reel were this; same picture, a consequence not an edit) and two labels of one transition family ("Cross Dissolve (Legacy)" vs "Cross Dissolve") are a relabel in transitionRelabels, so a picture-identical conform reads shape `equivalent`; then 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; a compound seen collapsed in one cut and flattened in the other reports compound_collapsed/compound_expanded once, never replaced+gone), 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; a compound clipitem fails source_resolved by NAME with the remedy — map it to a flattened file or turn over as OTIO), 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; COLOUR-AWARE: an input generator leg carrying a fillcolor (fade-to-white, colour matte) must come back on the same track over its span with the same colour — Resolve\'s FCP7 writer emits it — else generator-colour fails (generatorColours reports the compare) — pass exportedFormat: an OTIO/EDL re-export cannot carry colour (measured) and reports generatorColourNotInExport instead of failing; COMPOUND-AWARE: an XML re-export that collapsed a compound to one clipitem over cuts the input flattened from that compound reports compoundsCollapsedInExport instead of count/source drift; RELINK/REALIGN-AWARE (E146): it runs the changelist first and adopts its inferred source renames (a real offline→online reel went from 216 mismatches to its true differences once "4K-2K" proxies aliased to the "4K" masters), excuses a record edge the changelist folded into junction_realigned (reported in junctionRealigned), and reports a named generator the export does not carry (a counting leader) as generatorsNotInExport instead of an index cascade over every later cut; 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);
@@ -173,6 +173,7 @@ export const editorialTool = {
           .describe('The SAME reel→{mediaFilePath} map the assemble used — lets an EDL reel (CUTSRC) match the re-export\'s file basename (cut_src)'),
         exportedFormat: z.string().optional()
           .describe('Format of the re-export (otio|edl|xml|drt). Generator COLOUR can only be witnessed by an XML re-export (Resolve\'s OTIO/EDL writers carry none — measured); pass it so a colour compare against a colour-blind export reports generatorColourNotInExport instead of failing'),
+        inferAliases: z.boolean().optional().describe('Adopt the changelist\'s inferred source renames (proxy→master) and its junction_realigned excuses (default true, E146)'),
       }).parse(args);
       // EDL reels vs exported basenames: derive the alias table from the
       // sourceMap that drove the assemble (the one authority linking them).
@@ -181,7 +182,7 @@ export const editorialTool = {
         const base = String(src.mediaFilePath).split('/').pop();
         if (base) sourceAliases[reel] = base;
       }
-      return verifyRoundtrip(p.input, p.exported, { recTol: p.recTol, srcTol: p.srcTol, sourceAliases, exportedFormat: p.exportedFormat });
+      return verifyRoundtrip(p.input, p.exported, { recTol: p.recTol, srcTol: p.srcTol, sourceAliases, exportedFormat: p.exportedFormat, inferAliases: p.inferAliases });
     }
     if (action === 'marker_roundtrip') {
       const p = markerSchema.parse(args);

package/src/granular/common.py

@@ -87,7 +87,7 @@ if not logging.getLogger().handlers:
         handlers=[logging.StreamHandler()],
     )
 
-VERSION = "2.196.0"
+VERSION = "2.198.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.196.0"
+VERSION = "2.198.0"
 
 import base64
 import os