davinci-resolve-mcp 2.104.4 → 2.104.6

package/CHANGELOG.md

@@ -2,6 +2,71 @@
 
 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.104.6
+
+**A correction to the v2.104.2 StartFrame fix — measured against Resolve
+itself.** SMPTE non-drop timecode counts NOMINAL frames: the fields multiply
+by the integer base (30 for 29.97, 24 for 23.976), not the exact rate.
+Measured live on Studio 19.1.3.7: a 29.97 timeline at 01:00:00:00 reads
+GetStartFrame 108000 = 3600 x 30, and a 23.976 one reads 86400 = 3600 x 24.
+Issue #168's reporter expected round(3600 x 30000/1001) = 107892 — they said
+plainly they had patched defensively without verifying Resolve — and the
+v2.104.2 fix shipped that expectation. Both the original fractional product
+and the rounded 107892 were wrong; the Python converters (which always used
+nominal) and the Node converters now agree.
+
+Three Node converters move to nominal-base counting, with drop-frame
+handling (semicolon timecodes) matching the Python formula:
+
+- `drt.author`'s SeqContainer StartFrame (01:00:00:00 at 29.97 now writes
+  108000; at 23.976, 86400)
+- `editorial.tcToFrames` — the exact-rate product undercounted NTSC
+  timecode by 0.1% (108 frames per hour), which touched every EDL/AAF
+  source/record conversion at 29.97
+- `media-inventory.tcToFrames` — whose own framesToTc was already nominal,
+  so the tc->frames->tc round trip was asymmetric at NTSC rates until now
+
+The conform fixtures are integer-rate, which is how the exact-rate
+convention survived: nothing in the suite exercised an NTSC timecode
+conversion end to end. Regression tests now pin the measured nominal values
+and a drop-frame case.
+
+## What's New in v2.104.5
+
+The recent bug classes, generalized into guards — and the sweeps found the
+kwarg bug a second time.
+
+**PR #165's bug existed twice.** The positional-only bridge rule was guarded
+for src/server.py alone; sweeping ALL of src/ found
+`StartRendering(isInteractiveMode=...)` again in the render-deliver probe
+catalogue. Fixed, and the guard is rebuilt properly: it parses the Resolve
+method names out of the shipped API reference and flags keyword arguments on
+exactly those calls across the whole tree — which is what separates
+StartRendering from Popen without drowning in stdlib false positives.
+
+**Closing a project mid-render is now unreachable through this server.** The
+wedge documented in v2.104.0 (orphaned render, stuck IsRenderingInProgress,
+0% jobs, refused Quit) could still be triggered via project_manager.close or
+a disposable-project delete. `close` now refuses while a render is in
+progress — with the wedge named in the remediation — and accepts
+stop_render=true to stop, wait for the flag to clear, and close.
+delete_project_safely auto-stops first (deleting kills the render anyway;
+stopping is strictly better) and refuses when the flag will not clear, which
+is the already-wedged state where no delete ends well. Live-verified both
+paths on Studio 19.1.3.7: mid-render close refused, stop_render=true stopped
+and closed cleanly, no wedge.
+
+**Audits that came back clean, on the record:** the remaining default-ON
+analysis gates (marker plan is built unconditionally, vision is default-OFF
+behind a capability gate) cannot reproduce the cache-poisoning shape, and the
+Python tree carries no numeric-keyed hex tables of the kind that rotted in
+the Node encoders.
+
+PR #166's discarded-return guard fired on this release's own
+StopRendering call — third catch in three releases; the allowlist entry
+records that the helper verifies by polling the flag, stronger than the None
+the API returns.
+
 ## What's New in v2.104.4
 
 Hardening pass over the classes the v2.104.2 batch exposed, live-verified on

package/README.md

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

package/resolve-advanced/server/editorial.mjs

@@ -23,10 +23,21 @@ const require = createRequire(import.meta.url);
 // ── timecode ───────────────────────────────────────────────────────────
 const TC_RE = /^(\d{2}):(\d{2}):(\d{2})[:;](\d{2,3})$/;
 export function tcToFrames(tc, fps) {
-  const m = TC_RE.exec(String(tc).trim());
+  const raw = String(tc).trim();
+  const m = TC_RE.exec(raw);
   if (!m || !fps) return null;
   const [, h, mm, s, f] = m.map(Number);
-  return Math.round((h * 3600 + mm * 60 + s) * fps) + f;
+  // SMPTE timecode counts NOMINAL frames (base 30 for 29.97, 24 for 23.976) —
+  // measured against Resolve's own GetStartFrame (Studio 19.1.3.7). The
+  // previous exact-rate product undercounted NTSC by 0.1% (108 frames/hour).
+  const nominal = Math.round(fps);
+  let frames = (h * 3600 + mm * 60 + s) * nominal + f;
+  if (raw.includes(';')) {
+    const dropped = Math.round(nominal * 0.0666666667);
+    const totalMinutes = h * 60 + mm;
+    frames -= dropped * (totalMinutes - Math.floor(totalMinutes / 10));
+  }
+  return frames;
 }
 const isTc = (t) => TC_RE.test(t);
 

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

@@ -17,10 +17,21 @@ import { probeMedia } from './ffprobe-media.mjs';
 /** "HH:MM:SS:FF" (or ';' DF) → integer frames at fps. Returns null if unparseable. */
 export function tcToFrames(tc, fps) {
   if (typeof tc !== 'string' || !fps) return null;
-  const m = /^(\d{1,2}):(\d{2}):(\d{2})[:;](\d{2,3})$/.exec(tc.trim());
+  const raw = tc.trim();
+  const m = /^(\d{1,2}):(\d{2}):(\d{2})[:;](\d{2,3})$/.exec(raw);
   if (!m) return null;
   const [, h, mm, s, f] = m.map(Number);
-  return Math.round((h * 3600 + mm * 60 + s) * fps) + f;
+  // Nominal-base counting, matching framesToTc below and Resolve's own
+  // GetStartFrame (measured, Studio 19.1.3.7) — the exact-rate product made
+  // the tc->frames->tc round trip asymmetric at NTSC rates.
+  const nominal = Math.round(fps);
+  let frames = (h * 3600 + mm * 60 + s) * nominal + f;
+  if (raw.includes(';')) {
+    const dropped = Math.round(nominal * 0.0666666667);
+    const totalMinutes = h * 60 + mm;
+    frames -= dropped * (totalMinutes - Math.floor(totalMinutes / 10));
+  }
+  return frames;
 }
 
 export function framesToTc(frames, fps) {

package/resolve-advanced/vendor/drp-format/__tests__/framerate-encoding.test.js

@@ -34,14 +34,31 @@ test('the three formerly-wrong table rates never reappear', () => {
   assert.notStrictEqual(encodeFrameRate(59.94), '286b55e253f9ed3f');
 });
 
-test('StartFrame is an integer at fractional rates and startFrame wins', async () => {
+test('StartFrame counts NOMINAL frames and startFrame wins', async () => {
+  // Measured against Resolve itself (Studio 19.1.3.7): 01:00:00:00 at 29.97
+  // reads GetStartFrame 108000 = 3600 x 30, and 23.976 reads 86400 = 3600 x
+  // 24 — SMPTE NDF counts by the integer base, not the exact rate. Both the
+  // pre-#168 fractional product and its first rounded fix (107892) were wrong.
   const tl = { name: 'T', videoTracks: [], audioTracks: [] };
-  const fromTc = await buildSeqContainerFile(tl, {
+  const ntsc30 = await buildSeqContainerFile(tl, {
     frameRate: 30000 / 1001, startTimecode: '01:00:00:00',
   });
-  assert.match(fromTc, /<StartFrame>107892<\/StartFrame>/);
+  assert.match(ntsc30, /<StartFrame>108000<\/StartFrame>/);
+  const ntsc24 = await buildSeqContainerFile(tl, {
+    frameRate: 24000 / 1001, startTimecode: '01:00:00:00',
+  });
+  assert.match(ntsc24, /<StartFrame>86400<\/StartFrame>/);
   const explicit = await buildSeqContainerFile(tl, {
     frameRate: 30000 / 1001, startTimecode: '01:00:00:00', startFrame: 99999,
   });
   assert.match(explicit, /<StartFrame>99999<\/StartFrame>/);
 });
+
+test('drop-frame start timecode subtracts the dropped numbers', async () => {
+  // 00:01:00;02 DF at 29.97: minute 1 drops 2 numbers -> 1800 + 2 - 2 = 1800.
+  const tl = { name: 'T', videoTracks: [], audioTracks: [] };
+  const df = await buildSeqContainerFile(tl, {
+    frameRate: 30000 / 1001, startTimecode: '00:01:00;02',
+  });
+  assert.match(df, /<StartFrame>1800<\/StartFrame>/);
+});

package/resolve-advanced/vendor/drp-format/seq-container-builder.js

@@ -363,15 +363,27 @@ function buildMarkersFieldsBlob(markers, frameRate) {
 function timecodeToFrames(timecode, fps = 24) {
   if (!timecode || typeof timecode !== 'string') return 0;
 
-  const parts = timecode.split(':').map(Number);
-  if (parts.length !== 4) return 0;
+  const dropFrame = timecode.includes(';');
+  const parts = timecode.replace(/;/g, ':').split(':').map(Number);
+  if (parts.length !== 4 || parts.some(Number.isNaN)) return 0;
 
   const [hh, mm, ss, ff] = parts;
-  // A frame index is an integer. At fractional rates the seconds product is
-  // fractional (3600 x 30000/1001 = 107892.107...), and writing it raw put a
-  // fractional <StartFrame> in the XML (issue #168). Non-drop convention:
-  // round the seconds part, then add the frame component.
-  return Math.round(hh * 3600 * fps + mm * 60 * fps + ss * fps) + ff;
+  // SMPTE timecode counts NOMINAL frames: the fields multiply by the integer
+  // base (30 for 29.97, 24 for 23.976), not the exact rate. Measured against
+  // Resolve itself (Studio 19.1.3.7): a 29.97 timeline at 01:00:00:00 reads
+  // GetStartFrame 108000 = 3600 x 30, and a 23.976 one reads 86400 = 3600 x
+  // 24. Both the pre-#168 exact-rate product (107892.107...) and its rounded
+  // fix (107892) were wrong; nominal is what Resolve stores.
+  const nominal = Math.round(fps);
+  let frames = (hh * 3600 + mm * 60 + ss) * nominal + ff;
+  if (dropFrame) {
+    // Drop-frame skips 2 (or 4 at 59.94) TC numbers per minute except every
+    // tenth minute — same formula as the Python _timecode_to_frame_id.
+    const dropped = Math.round(nominal * 0.0666666667);
+    const totalMinutes = hh * 60 + mm;
+    frames -= dropped * (totalMinutes - Math.floor(totalMinutes / 10));
+  }
+  return frames;
 }
 
 // =============================================================================

package/src/granular/common.py

@@ -87,7 +87,7 @@ if not logging.getLogger().handlers:
         handlers=[logging.StreamHandler()],
     )
 
-VERSION = "2.104.4"
+VERSION = "2.104.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 353-tool granular server instead
 """
 
-VERSION = "2.104.4"
+VERSION = "2.104.6"
 
 import base64
 import os
@@ -17630,7 +17630,11 @@ def project_manager(action: str, params: Optional[Dict[str, Any]] = None) -> Dic
       create(name, media_location_path?) -> {success, name}
       load(name) -> {success}
       save() -> {success}
-      close() -> {success}
+      close(stop_render?) -> {success}
+        Refuses while a render is in progress — closing mid-render orphans the
+        render and wedges Resolve's pipeline until restart (stuck
+        IsRenderingInProgress, 0% jobs, refused Quit). stop_render=true stops
+        the render, waits for the flag to clear, then closes.
       delete(name) -> {success}
       import_project(path, name?) -> {success}
       export_project(name, path, with_stills_and_luts?) -> {success}
@@ -17734,7 +17738,33 @@ def project_manager(action: str, params: Optional[Dict[str, Any]] = None) -> Dic
         return {"success": bool(pm.SaveProject())}
     elif action == "close":
         proj = pm.GetCurrentProject()
-        return {"success": bool(pm.CloseProject(proj))} if proj else _err("No project open")
+        if not proj:
+            return _err("No project open")
+        # Closing mid-render orphans the render and wedges Resolve's pipeline
+        # (api_truth IsRenderingInProgress entry, measured live). Refuse by
+        # default; stop_render=true stops the render and waits before closing.
+        try:
+            rendering = bool(proj.IsRenderingInProgress())
+        except Exception:
+            rendering = False
+        if rendering:
+            if not p.get("stop_render"):
+                return _err(
+                    "A render is in progress on this project. Closing now would "
+                    "orphan the render and wedge Resolve's render pipeline — the "
+                    "stuck IsRenderingInProgress flag blocks every later render "
+                    "and refuses Quit until Resolve is restarted.",
+                    category="invalid_input",
+                    remediation=(
+                        "Wait for the render (poll render.get_job_status), or pass "
+                        "stop_render=true to stop it and close once the flag clears."
+                    ),
+                )
+            from src.utils.project_cleanup import stop_render_before_close
+            render_state = stop_render_before_close(proj)
+            if not render_state.get("safe"):
+                return _err(render_state["detail"], category="api_error")
+        return {"success": bool(pm.CloseProject(proj))}
     elif action == "delete":
         if not p.get("name"):
             return _err("delete requires name")

package/src/utils/probe_catalogue.py

@@ -504,7 +504,9 @@ def _probe_render_to_disk(ctx):
     job = ctx.project.AddRenderJob()
     if not job:
         return False
-    ctx.project.StartRendering(job, isInteractiveMode=False)
+    # Positional: the free-edition bridge proxies Resolve calls positionally,
+    # and a keyword argument dies inside _BoundMethod (PR #165's bug class).
+    ctx.project.StartRendering(job, False)
     deadline = _t.monotonic() + 420
     while ctx.project.IsRenderingInProgress() and _t.monotonic() < deadline:
         _t.sleep(1)

package/src/utils/project_cleanup.py

@@ -64,6 +64,52 @@ def save_project_if_safe(pm: Any) -> Dict[str, Any]:
         return {"saved": False, "skipped": False, "project": name, "reason": repr(exc)}
 
 
+def stop_render_before_close(project: Any, *, wait_seconds: float = 8.0) -> Dict[str, Any]:
+    """Stop any in-progress render and wait for the flag to clear.
+
+    Closing or deleting a project while its render runs orphans the render and
+    wedges Resolve's whole pipeline: IsRenderingInProgress sticks True on every
+    subsequent project, new jobs sit at 0%, StartRendering starts returning
+    False, and Quit() is refused behind a modal (api_truth, measured live on
+    Studio 19.1.3.7). Returns {safe, was_rendering, waited_seconds, detail}.
+    A flag that stays True after StopRendering at idle is the stuck state —
+    only restarting Resolve clears it, so `safe` comes back False.
+    """
+    import time as _time
+
+    try:
+        rendering = bool(project.IsRenderingInProgress())
+    except Exception:
+        return {"safe": True, "was_rendering": False, "waited_seconds": 0.0,
+                "detail": "IsRenderingInProgress unavailable; proceeding"}
+    if not rendering:
+        return {"safe": True, "was_rendering": False, "waited_seconds": 0.0, "detail": ""}
+    try:
+        project.StopRendering()
+    except Exception:
+        pass
+    waited = 0.0
+    while waited < wait_seconds:
+        _time.sleep(0.5)
+        waited += 0.5
+        try:
+            if not project.IsRenderingInProgress():
+                return {"safe": True, "was_rendering": True,
+                        "waited_seconds": waited, "detail": "render stopped"}
+        except Exception:
+            break
+    return {
+        "safe": False, "was_rendering": True, "waited_seconds": waited,
+        "detail": (
+            "IsRenderingInProgress is still True after StopRendering and "
+            f"{waited:.0f}s — closing now would orphan the render and wedge "
+            "Resolve's render pipeline (stuck flag, 0% jobs, refused Quit). "
+            "If Resolve is idle at 0% CPU this is the already-stuck state and "
+            "only restarting Resolve clears it."
+        ),
+    }
+
+
 def delete_project_safely(
     pm: Any,
     name: str,
@@ -89,6 +135,20 @@ def delete_project_safely(
         except Exception:
             current = None
         if current == name:
+            # Deleting the current project kills its render anyway — stopping
+            # first is strictly better than orphaning it (the wedge documented
+            # in stop_render_before_close). Refuse only when the flag will not
+            # clear, which is the already-wedged state where the delete cannot
+            # end well either.
+            try:
+                project = pm.GetCurrentProject()
+            except Exception:
+                project = None
+            if project is not None:
+                render_state = stop_render_before_close(project)
+                if not render_state.get("safe"):
+                    return {"success": False, "attempts": 0, "leftover": name,
+                            "detail": render_state["detail"]}
             # CloseProject ALWAYS, and first. It is what releases the session's
             # lock on the project; switching away with LoadProject does not, and
             # DeleteProject then returns False permanently — retries never help.