davinci-resolve-mcp 2.131.0 → 2.132.0

package/docs/guides/native-drt-authoring.md

@@ -53,7 +53,7 @@ window. `render.verify_output` covers the container-level checks.
 | TC-bearing sources (AAF route) | native clip capture (`MediaStartTime`), channel-leg merge | v2.120–2.122 |
 | Subtitles | `spec.subtitles` / `spec.subtitlesSrt` (raw SRT) | v2.128 |
 | Compound clips | survive `extract_from_drp` → `.drt` (inner containers kept, recursive) | v2.130 |
-| Compound authoring | `spec.compounds` (one per archive; nested edit renders) | v2.131 |
+| Compound authoring | `spec.compounds` (multiple compose; nested edits render) | v2.131–2.132 |
 | Fusion titles | `elements: [{type:'title', text}]` — **21-gen hosts only** | v2.108 |
 
 `assemble_from_interchange` drives the same engine from an EDL / OTIO /

package/install.py

@@ -37,7 +37,7 @@ from src.utils.update_check import (
 
 # ─── Version ──────────────────────────────────────────────────────────────────
 
-VERSION = "2.131.0"
+VERSION = "2.132.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.131.0",
+  "version": "2.132.0",
   "description": "NPM bootstrapper for the DaVinci Resolve MCP Server.",
   "license": "MIT",
   "author": "Samuel Gursky <samgursky@gmail.com>",

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

@@ -51,7 +51,7 @@ const assembleSchema = z.object({
   spec: z
     .object({})
     .passthrough()
-    .describe("assembleTimeline spec: { timelineName?, startFrame? (timeline start frame @24, default 86400=01:00:00:00 — sets the start TIMECODE, render-verified on 19), media?: {mediaFilePath, spec:{width,height,frameCount,fps}, cuts:[{startFrame,durationFrames,srcIn?,track? (1-based video track; >1 = video-only, render-verified stacking),speed?/reverse? (constant retime, e.g. 0.5, forward or backwards; video-only; readback+render-verified on 19),audioOnly?+track? (explicit AUDIO placement on audio track 1-8; presence suppresses the A1 mirror; render-verified on 19)}]} | [same, ...] (multi-source needs media_pool.capture_media_template run once per file), transitions?: [{track, atFrame, durationFrames?, trackType? ('video' dissolve | 'audio' cross-fade, both render-verified on 19)}], markers?: [{frame (timeline-absolute), color? (16 names), name?, note?, duration?, customData?}] (readback-verified on 19), compounds?: [{name, startFrame (parent, absolute), durationFrames, track?, cuts:[{mediaFilePath, startFrame (INNER, 0-based), durationFrames, srcIn?}]}] (ONE per archive; inner cuts need captured templates w/ native clips; render-verified nested playback on 19), subtitles?: [{startFrame (timeline-absolute), durationFrames, text}] + subtitlesSrt? (raw SRT, cues anchor at the origin; readback-verified on 19; angle-bracket runs read as SRT markup), elements?: [{type:'title'|'generator', track, startFrame, durationFrames?, text?, generatorName? ('Solid Color'|'SMPTE Color Bar'|'Grey Scale' render-verified on 19), ...}] }. startFrame is timeline-absolute (origin 86400)."),
+    .describe("assembleTimeline spec: { timelineName?, startFrame? (timeline start frame @24, default 86400=01:00:00:00 — sets the start TIMECODE, render-verified on 19), media?: {mediaFilePath, spec:{width,height,frameCount,fps}, cuts:[{startFrame,durationFrames,srcIn?,track? (1-based video track; >1 = video-only, render-verified stacking),speed?/reverse? (constant retime, e.g. 0.5, forward or backwards; video-only; readback+render-verified on 19),audioOnly?+track? (explicit AUDIO placement on audio track 1-8; presence suppresses the A1 mirror; render-verified on 19)}]} | [same, ...] (multi-source needs media_pool.capture_media_template run once per file), transitions?: [{track, atFrame, durationFrames?, trackType? ('video' dissolve | 'audio' cross-fade, both render-verified on 19)}], markers?: [{frame (timeline-absolute), color? (16 names), name?, note?, duration?, customData?}] (readback-verified on 19), compounds?: [{name, startFrame (parent, absolute), durationFrames, track?, cuts:[{mediaFilePath, startFrame (INNER, 0-based), durationFrames, srcIn?}]}] (multiple compose; inner cuts need captured templates w/ native clips; render-verified nested playback incl. two compounds on 19), subtitles?: [{startFrame (timeline-absolute), durationFrames, text}] + subtitlesSrt? (raw SRT, cues anchor at the origin; readback-verified on 19; angle-bracket runs read as SRT markup), elements?: [{type:'title'|'generator', track, startFrame, durationFrames?, text?, generatorName? ('Solid Color'|'SMPTE Color Bar'|'Grey Scale' render-verified on 19), ...}] }. startFrame is timeline-absolute (origin 86400)."),
   outputPath: z.string().describe('Absolute path where the importable .drt will be written'),
   targetAppVersion: z
     .union([z.string(), z.number()])

package/resolve-advanced/vendor/drp-format/assemble-timeline.js

@@ -221,6 +221,13 @@ async function assembleTimeline(spec = {}) {
         insertedExtra.add(fp);
       }
     }
+    // Pin the PARENT container id BEFORE inserting inner containers: entry
+    // listing is name-sorted, so an inner container can alphabetically
+    // precede the parent and swallow the next compound's item (measured —
+    // CMP_B landed inside CMP_A's inner timeline).
+    const zip0 = await JSZip.loadAsync(buffer);
+    const parentEntry0 = Object.keys(zip0.files).find((n) => !zip0.files[n].dir && /SeqContainer\/.+\.xml$/.test(n));
+    const parentContainerId = ((await zip0.file(parentEntry0).async('string')).match(/<Sm2SequenceContainer DbId="([^"]+)"/) || [])[1];
     for (const [ci, comp] of spec.compounds.entries()) {
       if (!comp || typeof comp !== 'object') throw new TypeError(`assembleTimeline: compounds[${ci}] must be an object`);
       const res = await placeCompound(buffer, {
@@ -228,6 +235,7 @@ async function assembleTimeline(spec = {}) {
         startFrame: comp.startFrame,
         durationFrames: comp.durationFrames,
         track: comp.track,
+        timelineUuid: parentContainerId,
       });
       buffer = res.buffer;
       const innerCuts = (comp.cuts || []).map((cut, i) => {

package/resolve-advanced/vendor/drp-format/place-compound.js

@@ -29,6 +29,7 @@ const path = require('node:path');
 const crypto = require('node:crypto');
 const { escapeXml } = require('./xml-builder');
 const { loadDrpZip, selectTargetSeq, getTrackVec, replaceTrackVec, getItemsInner, setItemsInner, freshDbIds } = require('./seq-surgery');
+const { decodeKeyedDict, encodeKeyedDict } = require('./keyed-dict');
 
 const T = (f) => path.join(__dirname, 'templates', f);
 
@@ -56,28 +57,47 @@ async function placeCompound(drpInput, opts = {}) {
   const zip = await loadDrpZip(drpInput);
   const { entry, xml: parentXml } = await selectTargetSeq(zip, timelineUuid);
 
-  // The harvested compound cluster keeps its ORIGINAL GUIDs verbatim: the
-  // embedded Sm2Sequence FieldsBlob almost certainly encodes cluster
-  // identities, and freshening the XML ids around an unchanged blob CRASHED
-  // Resolve on import (measured, E47/E47c — the app died, twice). The
-  // harvest GUIDs cannot collide with an assembled archive's fresh ids, so
-  // verbatim is safe — but it limits authoring to ONE compound per archive.
-  const pool0 = fs.readFileSync(T('compound-pool-r19.xml'), 'utf8');
-  const compoundId = pool0.match(/<Sm2MpCompoundClip DbId="([^"]+)"/)[1];
-  const innerSequenceId = pool0.match(/<Sm2Sequence DbId="([^"]+)"/)[1];
-  const inner0 = fs.readFileSync(T('compound-inner-r19.xml'), 'utf8');
-  const innerContainerId = inner0.match(/<Sm2SequenceContainer DbId="([^"]+)"/)[1];
-  if (zip.file(`SeqContainer/${innerContainerId}.xml`)) {
-    throw new Error('placeCompound: only one compound per archive is supported (the harvested donor identities are kept verbatim)');
-  }
+  // Cluster identity: the embedded Sm2Sequence FieldsBlob carries a keyed
+  // `SeqRef` entry naming the INNER CONTAINER's uuid — freshening the XML
+  // ids WITHOUT patching that entry orphans the blob and CRASHES Resolve on
+  // import (the app died, twice, before this was decoded). With SeqRef
+  // patched through the keyed-dict codec, every cluster id can be fresh, so
+  // multiple compounds per archive compose.
+  const compoundId = crypto.randomUUID();
+  const innerSequenceId = crypto.randomUUID();
+  const innerContainerId = crypto.randomUUID();
 
-  // 1) Inner container: template verbatim, Items emptied (content added by
-  //    the caller via the cuts machinery, 0-based frames).
-  const inner = inner0.replace(/<Items>[\s\S]*?<\/Items>/g, '<Items/>');
+  // 1) Inner container: fresh container/track ids, tracks point at the new
+  //    embedded sequence id, Items emptied (content added by the caller via
+  //    the cuts machinery, 0-based frames).
+  let inner = fs.readFileSync(T('compound-inner-r19.xml'), 'utf8');
+  inner = freshDbIds(inner);
+  inner = inner.replace(/<Sm2SequenceContainer DbId="[^"]+"/, `<Sm2SequenceContainer DbId="${innerContainerId}"`);
+  inner = inner.replace(/<Sequence>[0-9a-f-]{36}<\/Sequence>/g, `<Sequence>${innerSequenceId}</Sequence>`);
+  inner = inner.replace(/<Items>[\s\S]*?<\/Items>/g, '<Items/>');
   zip.file(`SeqContainer/${innerContainerId}.xml`, inner);
 
-  // 2) Pool compound element: verbatim identities; only name + extents change.
-  let pool = pool0;
+  // 2) Pool compound element: fresh identities + blob SeqRef patch.
+  let pool = fs.readFileSync(T('compound-pool-r19.xml'), 'utf8');
+  pool = pool.replace(/<Sm2MpCompoundClip DbId="[^"]+"/, `<Sm2MpCompoundClip DbId="${compoundId}"`);
+  pool = pool.replace(/<Sm2Sequence DbId="[^"]+"/, `<Sm2Sequence DbId="${innerSequenceId}"`);
+  pool = pool.replace(/<UniqueSequenceId>[^<]*<\/UniqueSequenceId>/, `<UniqueSequenceId>${crypto.randomUUID()}</UniqueSequenceId>`);
+  pool = pool.replace(/<UniqueMediaPoolItemId>[^<]*<\/UniqueMediaPoolItemId>/, `<UniqueMediaPoolItemId>${crypto.randomUUID()}</UniqueMediaPoolItemId>`);
+  pool = pool.replace(/<SmPTZRPreset DbId="[^"]+"/, `<SmPTZRPreset DbId="${crypto.randomUUID()}"`);
+  // The embedded sequence's <Parent> points BACK at the compound's own id —
+  // the reference sweep found it as the one un-rewired link (a dangling
+  // Parent is presumably as fatal as the dangling MpFolder/SeqRef were).
+  pool = pool.replace(/<Parent>[0-9a-f-]{36}<\/Parent>/, `<Parent>${compoundId}</Parent>`);
+  {
+    const fbM = pool.match(/(<Sm2Sequence DbId="[^"]+">\s*<FieldsBlob>)([0-9a-fA-F]+)(<\/FieldsBlob>)/);
+    if (!fbM) throw new Error('placeCompound: embedded Sm2Sequence FieldsBlob not found');
+    const dict = decodeKeyedDict(Buffer.from(fbM[2], 'hex'));
+    const seqRef = dict.entries.find((e) => e.key === 'SeqRef');
+    if (!seqRef) throw new Error('placeCompound: embedded blob has no SeqRef entry — schema drift, refusing to author a crasher');
+    seqRef.value = innerContainerId;
+    const patched = encodeKeyedDict({ hdr: dict.hdr, entries: dict.entries }).toString('hex');
+    pool = pool.replace(fbM[0], `${fbM[1]}${patched}${fbM[3]}`);
+  }
   pool = pool.replace(/<Name>[^<]*<\/Name>/, `<Name>${escapeXml(name)}</Name>`);
   // MediaExtents = [startSec, durationSec] LE doubles; inner starts at 0.
   const me = Buffer.alloc(16);

package/src/granular/common.py

@@ -87,7 +87,7 @@ if not logging.getLogger().handlers:
         handlers=[logging.StreamHandler()],
     )
 
-VERSION = "2.131.0"
+VERSION = "2.132.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.131.0"
+VERSION = "2.132.0"
 
 import base64
 import os