davinci-resolve-mcp 2.34.0 → 2.35.0

package/CHANGELOG.md

@@ -2,6 +2,33 @@
 
 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.35.0
+
+The Cut-IR executor — transcript-driven editing now closes the loop onto the
+timeline.
+
+- **Added** `timeline(action="apply_cuts", cuts, dry_run?, confirm_token?)` applies
+  a CutList (from `propose_cuts`) to the timeline as lift / ripple deletes. It is
+  **DRY-RUN by default**; applying is destructive and fully governed: confirm-token
+  gated, and a timeline version is archived first (so it is reversible), through
+  the existing destructive hook. Cuts apply latest-first so ripple deletes do not
+  invalidate earlier spans. Live-validated end-to-end (propose -> token -> apply ->
+  version archived).
+
+## What's New in v2.34.1
+
+Page-switch serialization — the concurrency primitive for safe multi-agent use.
+
+- **Added** `src/utils/page_lock.py` — Resolve has a single globally-active page,
+  so two agents that flip pages concurrently corrupt each other. `page_lock()`
+  serializes page switches: a reentrant intra-process lock plus a best-effort
+  inter-process advisory file lock around the outermost section. The `open_page`
+  action now routes through it. This must be in place before any concurrent-agent
+  feature ships.
+- Networked transport, sandboxed scripting, and capability/role scoping (the rest
+  of the safe remote/multi-user design) are security-critical and remain a
+  separate, sign-off-gated phase — they are intentionally not shipped here.
+
 ## What's New in v2.34.0
 
 First phase of transcript-driven editing: a Cut intermediate representation and a

package/README.md

@@ -1,6 +1,6 @@
 # DaVinci Resolve MCP Server
 
-[![Version](https://img.shields.io/badge/version-2.34.0-blue.svg)](https://github.com/samuelgursky/davinci-resolve-mcp/releases)
+[![Version](https://img.shields.io/badge/version-2.35.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-32%20(341%20full)-blue.svg)](#server-modes)

package/docs/SKILL.md

@@ -731,6 +731,9 @@ Key actions:
   text `{text, cue_count, has_subtitles, cues}`
 - `propose_cuts(cues?, long_pause_frames?)` — DRY-RUN: mechanically detect
   candidate cuts (fillers, long pauses, repeats) from the transcript; proposes only
+- `apply_cuts(cuts, dry_run?, confirm_token?)` — apply a CutList as lift/ripple
+  deletes. DRY-RUN by default; applying is destructive (confirm-token gated, a
+  timeline version is archived first). Cuts apply latest-first
 - `add_track(track_type, sub_type?)` / `delete_track(track_type, index)`
 - `get_items(track_type, index)` — items on a track
 - `clip_where(track_type?, track_index?, name_contains?, duration_lt?, duration_gt?)` —

package/install.py

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

package/src/granular/common.py

@@ -80,7 +80,7 @@ if not logging.getLogger().handlers:
         handlers=[logging.StreamHandler()],
     )
 
-VERSION = "2.34.0"
+VERSION = "2.35.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 341-tool granular server instead
 """
 
-VERSION = "2.34.0"
+VERSION = "2.35.0"
 
 import base64
 import os
@@ -46,6 +46,7 @@ from src.utils.mcp_stdio import run_fastmcp_stdio
 from src.utils.api_truth import lookup_api_truth, VERIFIED_ON as _API_TRUTH_VERIFIED_ON
 from src.utils.contracts import validate as _validate_params
 from src.utils.cut_ir import build_cut_list as _build_cut_list
+from src.utils.page_lock import open_page_serialized as _open_page_serialized
 from src.utils.proc import safe_run
 from src.utils.readback import verify_by_readback
 from src.utils.update_check import (
@@ -728,6 +729,7 @@ _destructive_hook.register_preference_provider(_destructive_preference_provider)
 # a version. Keep in sync with the _issue_confirm_token call sites.
 _TOKEN_GATED_DESTRUCTIVE_ACTIONS = frozenset({
     ("timeline", "delete_track"),
+    ("timeline", "apply_cuts"),
     ("graph", "apply_grade_from_drx"),
     ("graph", "reset_all_grades"),
     # 21.0 AI ops that render/generate NEW media files (additive, but expensive
@@ -10672,7 +10674,9 @@ def resolve_control(action: str, params: Optional[Dict[str, Any]] = None) -> Dic
         valid_pages = ["media", "cut", "edit", "color", "fusion", "fairlight", "deliver"]
         if p["page"] not in valid_pages:
             return _err(f"Invalid page '{p['page']}'. Valid pages: {', '.join(valid_pages)}")
-        return {"success": bool(r.OpenPage(p["page"]))}
+        # Serialize page switches so concurrent agents can't flip the single
+        # globally-active page underneath each other.
+        return {"success": bool(_open_page_serialized(r, p["page"]))}
     elif action == "get_keyframe_mode":
         return {"mode": r.GetKeyframeMode()}
     elif action == "set_keyframe_mode":
@@ -15206,6 +15210,10 @@ def timeline(action: str, params: Optional[Dict[str, Any]] = None) -> Dict[str,
       propose_cuts(cues?, long_pause_frames?) -> {cuts, cut_count, basis_cue_count, pass, note}
         DRY-RUN. Mechanically detect candidate cuts (filler words, long pauses,
         repeated lines) from the subtitle transcript. Proposes only; applies nothing.
+      apply_cuts(cuts, dry_run?, confirm_token?, allow_partial_item_delete?) -> {applied, total, results}
+        Apply a CutList (from propose_cuts) as lift/ripple deletes. DRY-RUN by
+        default; applying is DESTRUCTIVE — confirm-token gated and a timeline
+        version is archived first. Cuts apply latest-first.
       get_mark_in_out() -> {mark}
       set_mark_in_out(mark_in, mark_out, type?) -> {success}
       clear_mark_in_out(type?) -> {success}
@@ -15500,6 +15508,61 @@ def timeline(action: str, params: Optional[Dict[str, Any]] = None) -> Dict[str,
         if cues is None:
             cues = _timeline_transcript(tl, with_timecodes=True)["cues"]
         return _build_cut_list(cues, long_pause_frames=int(p.get("long_pause_frames", 48)))
+    elif action == "apply_cuts":
+        # Apply a CutList (from propose_cuts) to the timeline. DRY-RUN by default;
+        # applying is destructive (confirm-token gated, a version is archived
+        # first by the destructive hook). Cuts are applied latest-first so ripple
+        # deletes don't invalidate earlier spans.
+        cuts = p.get("cuts")
+        if not isinstance(cuts, list):
+            return _err("apply_cuts requires 'cuts' (a list, e.g. from propose_cuts)")
+        applicable = [
+            c for c in cuts
+            if isinstance(c, dict) and c.get("action") in ("lift", "ripple_delete")
+            and isinstance(c.get("span"), dict)
+            and c["span"].get("start") is not None and c["span"].get("end") is not None
+        ]
+        applicable.sort(key=lambda c: c["span"]["start"], reverse=True)
+        plan = [{"action": c["action"], "span": c["span"], "kind": c.get("kind")} for c in applicable]
+
+        if p.get("dry_run", True):
+            return {
+                "dry_run": True,
+                "would_apply": len(applicable),
+                "plan": plan,
+                "note": "No edits made. Re-run with dry_run=false (and a confirm_token) to apply.",
+            }
+
+        if "confirm_token" not in p and "confirmToken" not in p and _confirm_token_required():
+            return _issue_confirm_token(
+                action="timeline.apply_cuts", params=p,
+                preview={
+                    "operation": "timeline.apply_cuts",
+                    "warning": "Applies lift/ripple deletes to the timeline; ripple closes "
+                               "gaps and cannot be selectively undone. A timeline version is "
+                               "archived first.",
+                    "would_apply": len(applicable),
+                    "plan": plan,
+                },
+            )
+        blocked = _consume_confirm_token(action="timeline.apply_cuts", params=p)
+        if blocked:
+            return blocked
+
+        allow_partial = bool(p.get("allow_partial_item_delete", True))
+        results = []
+        for c in applicable:
+            sp = c["span"]
+            res = _timeline_lift_range_impl(tl, {
+                "start_frame": sp["start"],
+                "end_frame": sp["end"],
+                "ripple": c["action"] == "ripple_delete",
+                "allow_partial_item_delete": allow_partial,
+            })
+            results.append({"action": c["action"], "span": sp, "result": res})
+        applied = sum(1 for r in results
+                      if isinstance(r["result"], dict) and r["result"].get("success"))
+        return {"success": True, "applied": applied, "total": len(applicable), "results": results}
     elif action == "get_mark_in_out":
         return _ser(tl.GetMarkInOut())
     elif action == "set_mark_in_out":
@@ -15709,7 +15772,7 @@ def timeline(action: str, params: Optional[Dict[str, Any]] = None) -> Dict[str,
         if mp_err:
             return mp_err
         return _fairlight_boundary_report(proj, mp, tl, p)
-    return _unknown(action, ["list","get_current","set_current","get_name","set_name","get_start_frame","get_end_frame","get_start_timecode","set_start_timecode","get_track_count","add_track","delete_track","get_track_sub_type","set_track_enable","get_track_enabled","set_track_lock","get_track_locked","get_track_name","set_track_name","get_items","delete_clips","set_clips_linked","duplicate","duplicate_clips","copy_clips","move_clips","copy_range","duplicate_range","overwrite_range","lift_range","story_spine_report","create_variant_from_ranges","bulk_set_item_properties","apply_look_to_items","thumbnail_contact_sheet","marker_thumbnail_review","edit_kernel_capabilities","probe_edit_kernel_item","title_property_scan","set_title_text","bulk_set_title_text","create_compound_clip","create_fusion_clip","import_into_timeline","export","get_setting","set_setting","insert_generator","insert_fusion_generator","insert_fusion_composition","insert_ofx_generator","insert_title","insert_fusion_title","get_unique_id","get_node_graph","get_media_pool_item","get_transcript","propose_cuts","get_mark_in_out","set_mark_in_out","clear_mark_in_out","convert_to_stereo","get_items_in_track","get_voice_isolation_state","set_voice_isolation_state","extract_source_frame_ranges","audio_mix_capability_report",*_TIMELINE_CONFORM_KERNEL_ACTIONS,*_TIMELINE_AUDIO_KERNEL_ACTIONS])
+    return _unknown(action, ["list","get_current","set_current","get_name","set_name","get_start_frame","get_end_frame","get_start_timecode","set_start_timecode","get_track_count","add_track","delete_track","get_track_sub_type","set_track_enable","get_track_enabled","set_track_lock","get_track_locked","get_track_name","set_track_name","get_items","delete_clips","set_clips_linked","duplicate","duplicate_clips","copy_clips","move_clips","copy_range","duplicate_range","overwrite_range","lift_range","story_spine_report","create_variant_from_ranges","bulk_set_item_properties","apply_look_to_items","thumbnail_contact_sheet","marker_thumbnail_review","edit_kernel_capabilities","probe_edit_kernel_item","title_property_scan","set_title_text","bulk_set_title_text","create_compound_clip","create_fusion_clip","import_into_timeline","export","get_setting","set_setting","insert_generator","insert_fusion_generator","insert_fusion_composition","insert_ofx_generator","insert_title","insert_fusion_title","get_unique_id","get_node_graph","get_media_pool_item","get_transcript","propose_cuts","apply_cuts","get_mark_in_out","set_mark_in_out","clear_mark_in_out","convert_to_stereo","get_items_in_track","get_voice_isolation_state","set_voice_isolation_state","extract_source_frame_ranges","audio_mix_capability_report",*_TIMELINE_CONFORM_KERNEL_ACTIONS,*_TIMELINE_AUDIO_KERNEL_ACTIONS])
 
 
 # ═══════════════════════════════════════════════════════════════════════════════

package/src/utils/destructive_hook.py

@@ -70,6 +70,7 @@ DESTRUCTIVE_ACTIONS_BY_TOOL: Dict[str, FrozenSet[str]] = {
         "duplicate_range",
         "overwrite_range",
         "lift_range",
+        "apply_cuts",
         "create_stereo_clip",
         "auto_sync_audio",
         "create_compound_clip",

package/src/utils/page_lock.py

@@ -0,0 +1,75 @@
+"""Serialize DaVinci Resolve page switches across threads and processes.
+
+Resolve has a single globally-active page (Edit / Color / Fusion / Fairlight /
+Deliver / Cut). An operation that switches the page, does work there, and reads a
+result is only correct if no other operation flips the page underneath it. With a
+single stdio client that never happens, but the moment two agents (threads, or
+separate server processes) drive one Resolve, concurrent page switches corrupt
+each other. This primitive serializes the critical section, so it must be in
+place before any concurrent-agent feature ships.
+
+- Intra-process: a reentrant lock (nested page_lock() calls are safe).
+- Inter-process: a best-effort advisory file lock around the OUTERMOST section
+  (fcntl). On platforms without fcntl (Windows) the inter-process guard is a
+  no-op and only the intra-process lock applies.
+
+Usage:
+
+    with page_lock():
+        resolve.OpenPage("color")
+        ... do color-page work, read results ...
+"""
+import os
+import tempfile
+import threading
+from contextlib import contextmanager
+
+try:
+    import fcntl  # type: ignore
+    _HAS_FCNTL = True
+except ImportError:  # pragma: no cover - Windows
+    _HAS_FCNTL = False
+
+_INTRA = threading.RLock()
+_LOCKFILE = os.path.join(tempfile.gettempdir(), "davinci_resolve_mcp_page.lock")
+
+# Nesting depth and the held file handle, both guarded by _INTRA. The file lock
+# is taken only at the outermost level — a second fcntl.flock() on a new fd from
+# the same process would block on the first, deadlocking nested page_lock()s.
+_depth = 0
+_fh = None
+
+
+@contextmanager
+def page_lock():
+    """Hold the page-switch lock for the duration of the block (reentrant)."""
+    global _depth, _fh
+    _INTRA.acquire()
+    _depth += 1
+    try:
+        if _depth == 1 and _HAS_FCNTL:
+            try:
+                _fh = open(_LOCKFILE, "w")
+                fcntl.flock(_fh, fcntl.LOCK_EX)
+            except OSError:
+                # Advisory lock is best-effort; never block real work on it.
+                if _fh is not None:
+                    _fh.close()
+                _fh = None
+        yield
+    finally:
+        _depth -= 1
+        if _depth == 0 and _fh is not None:
+            try:
+                fcntl.flock(_fh, fcntl.LOCK_UN)
+            except OSError:
+                pass
+            _fh.close()
+            _fh = None
+        _INTRA.release()
+
+
+def open_page_serialized(resolve, page):
+    """Switch Resolve to `page` under the page lock. Returns OpenPage's result."""
+    with page_lock():
+        return resolve.OpenPage(page)