davinci-resolve-mcp 4.10.4 → 4.10.6

package/CHANGELOG.md

@@ -2,6 +2,76 @@
 
 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 v4.10.6 — names that need xml escaping reach their bin and their color group
+
+### Fixes
+
+- **`drt(action="assemble_project")` failed outright when a timeline placed
+  in a bin had `&`, `"` or `'` in its name.** The pool clip stores the name
+  escaped (`Reel 1 & 2`), but the step that moves it into its bin searched
+  for the raw `Reel 1 & 2`, found nothing, and threw
+  `could not locate pool clip for timeline Reel 1 & 2 to move into folder Reels`.
+  No archive was written. The lookup now matches the escaped name.
+  - **The bin's own name was written unescaped**, so `folder: "R&D"` produced
+    a `MpFolder.xml` that does not parse. It is escaped now.
+  - A name without those characters escapes to itself, so existing archives
+    come out byte-for-byte unchanged.
+  - Lands #283 from @Dev-next-gen, as submitted, with two tests that fail on
+    the old code.
+- **The same mistake in reverse affected color-group grade reads.** The
+  helpers behind `drp(action="extract_group_grades")` and
+  `drx(action="grade_transfer")` found a group by searching `project.xml` for
+  `<Name>` plus the raw name:
+  - asking for a group called `Night & Day` returned `group not found`, because
+    the file stores `Night &amp; Day`;
+  - the unfiltered listing reported the stored form, `Night &amp; Day`, as the
+    group's name;
+  - a clip or other element with the same name as a group, placed before it in
+    the file, made the lookup return a segment that spanned two groups and
+    both of their grades.
+
+  Group names are now decoded when read and compared as plain text. An
+  apostrophe resolves whether the file spells it `'` or `&apos;`. The lookup
+  only looks inside `<Sm2Group>` elements, and the label passed to the
+  decoder is escaped. A caller that passed the escaped form back
+  (`Night &amp; Day`) must now pass the plain name.
+
+### Validation
+
+- Offline file handling only; nothing calls Resolve. Advanced suite green,
+  with two new group-name tests that fail on the old code; Python suite green.
+- `assemble_project` changes the offline `.drp` authoring tier. The
+  round-trip harness was not run: it needs a Resolve 21.x Studio host, and
+  this machine runs 19.1.3.7. For a name without `&`, `"` or `'`, the archive
+  is byte-identical to before.
+
+## What's New in v4.10.5 — `rename_plan` sees a name the plan keeps
+
+### Fixes
+
+- **`media(action="rename_plan")` missed a rename onto a name that stays in
+  place.** It counted collisions only among the names it renames *to*, so a
+  name it leaves alone was invisible to the check. With
+  `names: ["A001_C001.mov", "dailies_A001_C001.mov"]`, `find: "dailies_"`,
+  `replace: ""`, the camera original was correctly refused, and the plan then
+  proposed renaming `dailies_A001_C001.mov` onto it with `collisions: 0`.
+  Applying that plan overwrites the file the refusal was protecting.
+  - A name the plan keeps now occupies its target: a refused camera original,
+    and a name `find` leaves unchanged. The same call returns
+    `action: "collision"`, `collisions: 1`, `renameCount: 0`.
+  - **`reel_normalize` had the same gap**: a reel already at its normalized
+    name was not counted, so `["card1", "CARD001"]` both landed on `CARD001`
+    with no collision. It is counted now.
+  - A swap (`b → x` while `x → y`) is still not a collision, since `x` is
+    leaving. Noops stay noops and refusals stay refusals.
+- Lands #284 from @Dev-next-gen, as submitted, with two tests that fail on
+  the old code.
+
+### Validation
+
+- Planning code only; nothing touches Resolve or media. Advanced suite
+  green; Python suite green.
+
 ## What's New in v4.10.4 — enrolled in Anthropic's OSS Scanner
 
 ### Security

package/README.md

@@ -2,7 +2,7 @@
 
 English | [简体中文](README.zh-CN.md)
 
-[![Version](https://img.shields.io/badge/version-4.10.4-blue.svg)](https://github.com/samuelgursky/davinci-resolve-mcp/releases)
+[![Version](https://img.shields.io/badge/version-4.10.6-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-37%20(389%20full)-blue.svg)](#server-modes)

package/README.zh-CN.md

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

package/resolve-advanced/server/group-grade-read.mjs

@@ -54,26 +54,36 @@ export function readProjectXml(drpPath) {
   return xml;
 }
 
+// project.xml stores a name as xml text (`Night & Day`); callers name a group as
+// plain text. Read and compare the decoded form so both spellings agree.
+const ENTITIES = { amp: '&', lt: '<', gt: '>', quot: '"', apos: "'" };
+const unescapeXml = (s) =>
+  s.replace(/&(?:#(\d+)|#x([0-9a-fA-F]+)|(amp|lt|gt|quot|apos));/g, (m, dec, hex, name) =>
+    dec ? String.fromCodePoint(+dec) : hex ? String.fromCodePoint(parseInt(hex, 16)) : ENTITIES[name]);
+const xmlEscape = (s) => String(s).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+
+/** Each <Sm2Group> element with its (decoded) name. */
+function* groups(xml) {
+  for (const m of xml.matchAll(/<Sm2Group\b[\s\S]*?<\/Sm2Group>/g)) {
+    const n = m[0].match(/<Name>([^<]*)<\/Name>/);
+    if (n) yield { name: unescapeXml(n[1]), seg: m[0] };
+  }
+}
+
 /** All color-group names present in the project (from <Sm2Group><Name>…). */
 export function listGroupNames(xml) {
-  const names = [];
-  for (const m of xml.matchAll(/<Sm2Group\b[\s\S]*?<Name>([^<]+)<\/Name>/g)) names.push(m[1]);
-  return [...new Set(names)];
+  return [...new Set([...groups(xml)].map((g) => g.name))];
 }
 
 export function groupSegment(xml, name) {
-  const j = xml.indexOf(`<Name>${name}</Name>`);
-  if (j < 0) return null;
-  const start = xml.lastIndexOf('<Sm2Group', j);
-  const end = xml.indexOf('</Sm2Group>', j);
-  if (start < 0 || end < 0) return null;
-  return xml.slice(start, end + '</Sm2Group>'.length);
+  for (const g of groups(xml)) if (g.name === name) return g.seg;
+  return null;
 }
 
 export const groupBodies = (seg) => [...seg.matchAll(/<Body>([0-9a-fA-F]+)<\/Body>/g)].map((m) => m[1]);
 
 async function decodeBody(bodyHex, label) {
-  const content = `<?xml version="1.0" encoding="UTF-8"?>\n<Resolve_Color_Exchange><Label>${label}</Label><Width>1920</Width><Height>1080</Height><Body>${bodyHex}</Body></Resolve_Color_Exchange>`;
+  const content = `<?xml version="1.0" encoding="UTF-8"?>\n<Resolve_Color_Exchange><Label>${xmlEscape(label)}</Label><Width>1920</Width><Height>1080</Height><Body>${bodyHex}</Body></Resolve_Color_Exchange>`;
   let r;
   try {
     r = await drxTool.handler({ action: 'parse', args: { content } });

package/resolve-advanced/server/media-ops.mjs

@@ -133,19 +133,18 @@ export function renamePlan(names, rule = {}) {
   const camRe = rule.cameraOriginalRe || CAMERA_ORIGINAL_RE;
   const plan = [];
   const targets = new Map();
+  // A name the plan leaves in place still occupies it — a refused camera original
+  // above all — so it counts as a target too, or a rename onto it reads as free.
   for (const name of names) {
     const isCam = camRe.test(name);
     if (isCam && !rule.allowCameraOriginals) {
       plan.push({ from: name, action: 'refuse-camera-original', note: 'camera original — rename via sidecar/DB only, never the file' });
+      targets.set(name, (targets.get(name) || 0) + 1);
       continue;
     }
     const to = name.replace(re, rule.replace ?? '');
-    if (to === name) {
-      plan.push({ from: name, to, action: 'noop' });
-      continue;
-    }
     targets.set(to, (targets.get(to) || 0) + 1);
-    plan.push({ from: name, to, action: 'rename' });
+    plan.push({ from: name, to, action: to === name ? 'noop' : 'rename' });
   }
   // Flag collisions (two sources → one target).
   for (const p of plan) if (p.action === 'rename' && targets.get(p.to) > 1) p.action = 'collision';
@@ -168,7 +167,7 @@ export function reelNormalize(reels, opts = {}) {
     const to = String(r)
       .toUpperCase()
       .replace(/(\d+)\s*$/, (m) => m.padStart(pad, '0'));
-    if (to !== r) targets.set(to, (targets.get(to) || 0) + 1);
+    targets.set(to, (targets.get(to) || 0) + 1);
     plan.push({ from: r, to, action: to === r ? 'noop' : 'normalize' });
   }
   for (const p of plan) if (p.action === 'normalize' && targets.get(p.to) > 1) p.action = 'collision';

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

@@ -316,7 +316,7 @@ export const drtTool = {
         if (!f || /[\/\\]/.test(f)) throw new Error(`assemble_project: folder must be a plain bin name (no path separators): ${JSON.stringify(t.folder)}`);
         return f;
       });
-      const { assembleTimeline } = drp();
+      const { assembleTimeline, escapeXml } = drp();
       const buffers = [];
       for (const [i, spec] of p.timelines.entries()) {
         const s = { ...spec, timelineName: names[i] };
@@ -459,7 +459,10 @@ export const drtTool = {
             bins.set(folder, bin);
           }
           const bin = bins.get(folder);
-          const tlRe = new RegExp(`<Element>\\s*<Sm2MpTimelineClip DbId="[^"]+">(?:(?!<\\/Element>\\s*<Element>)[\\s\\S])*?<Name>${names[i].replace(/[.*+?^$()|[\]{}]/g, '\\$&')}<\\/Name>[\\s\\S]*?<\\/Sm2MpTimelineClip>\\s*<\\/Element>`);
+          // The name reached the pool clip through escapeXml: `Reel 1 & 2` is stored
+          // `Reel 1 &amp; 2`, and the raw name matched nothing.
+          const nameXml = escapeXml(names[i]).replace(/[.*+?^$()|[\]{}]/g, '\\$&');
+          const tlRe = new RegExp(`<Element>\\s*<Sm2MpTimelineClip DbId="[^"]+">(?:(?!<\\/Element>\\s*<Element>)[\\s\\S])*?<Name>${nameXml}<\\/Name>[\\s\\S]*?<\\/Sm2MpTimelineClip>\\s*<\\/Element>`);
           const hit = mpXml.match(tlRe);
           if (!hit) throw new Error(`assemble_project: could not locate pool clip for timeline ${names[i]} to move into folder ${folder}`);
           mpXml = mpXml.replace(hit[0], '');
@@ -495,7 +498,7 @@ export const drtTool = {
         for (const [folder, bin] of bins) {
           base.file(bin.entry,
             `<?xml version="1.0" encoding="UTF-8"?>\n` +
-            `<Sm2MpFolder DbId="${bin.id}">\n <FieldsBlob/>\n <Name>${folder}</Name>\n` +
+            `<Sm2MpFolder DbId="${bin.id}">\n <FieldsBlob/>\n <Name>${escapeXml(folder)}</Name>\n` +
             ` <MpFolder>${masterFolderId}</MpFolder>\n <UniqueMediaPoolItemId>${randomUUID()}</UniqueMediaPoolItemId>\n` +
             ` <MediaVec>\n${bin.clips.join('\n')}\n </MediaVec>\n` +
             ` <MediaPool>${poolId}</MediaPool>\n <Folded>false</Folded>\n <ColorTag>FOLDER_COLOR_NONE</ColorTag>\n` +

package/src/granular/common.py

@@ -91,7 +91,7 @@ if not logging.getLogger().handlers:
         handlers=[logging.StreamHandler()],
     )
 
-VERSION = "4.10.4"
+VERSION = "4.10.6"
 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 377-tool granular server instead
 """
 
-VERSION = "4.10.4"
+VERSION = "4.10.6"
 
 import base64
 import os