davinci-resolve-mcp 2.33.8 → 2.34.1

package/CHANGELOG.md

@@ -2,6 +2,34 @@
 
 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.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
+mechanical cut proposer.
+
+- **Added** `src/utils/cut_ir.py` — the Cut-IR: a typed representation of an
+  editorial cut ({kind, span, action, confidence, rationale, evidence}) plus a
+  deterministic Pass-1 detector that flags filler words, long pauses, and
+  repeated lines from a timestamped transcript. No LLM.
+- **Added** `timeline(action="propose_cuts", cues?, long_pause_frames?)` — a
+  DRY-RUN that runs Pass-1 over the timeline's subtitle transcript (or provided
+  cues) and returns a CutList. It proposes only; it applies nothing. The semantic
+  Pass-2 and the governed timeline executor are subsequent phases.
+
 ## What's New in v2.33.8
 
 Bridge-call performance instrumentation.

package/README.md

@@ -1,6 +1,6 @@
 # DaVinci Resolve MCP Server
 
-[![Version](https://img.shields.io/badge/version-2.33.8-blue.svg)](https://github.com/samuelgursky/davinci-resolve-mcp/releases)
+[![Version](https://img.shields.io/badge/version-2.34.1-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

@@ -729,6 +729,8 @@ Key actions:
 - `get_track_count(track_type)` — track_type: `"video"`, `"audio"`, `"subtitle"`
 - `get_transcript(with_timecodes?)` — read the subtitle track(s) as transcript
   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
 - `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.33.8"
+VERSION = "2.34.1"
 # 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.33.8",
+  "version": "2.34.1",
   "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.33.8"
+VERSION = "2.34.1"
 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.33.8"
+VERSION = "2.34.1"
 
 import base64
 import os
@@ -45,6 +45,8 @@ from src.utils.cdl import normalize_cdl_payload
 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 (
@@ -10671,7 +10673,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":
@@ -15202,6 +15206,9 @@ def timeline(action: str, params: Optional[Dict[str, Any]] = None) -> Dict[str,
       get_media_pool_item() -> {name, id}
       get_transcript(with_timecodes?) -> {text, cue_count, has_subtitles, cues}
         Read the timeline's subtitle track(s) as transcript text.
+      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.
       get_mark_in_out() -> {mark}
       set_mark_in_out(mark_in, mark_out, type?) -> {success}
       clear_mark_in_out(type?) -> {success}
@@ -15489,6 +15496,13 @@ def timeline(action: str, params: Optional[Dict[str, Any]] = None) -> Dict[str,
         return {"name": mpi.GetName(), "id": mpi.GetUniqueId()} if mpi else {"name": None, "id": None}
     elif action == "get_transcript":
         return _timeline_transcript(tl, with_timecodes=bool(p.get("with_timecodes")))
+    elif action == "propose_cuts":
+        # Dry-run only: detect mechanical cuts (fillers, long pauses, repeats)
+        # from the timeline's subtitle transcript. Proposes; never edits.
+        cues = p.get("cues")
+        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 == "get_mark_in_out":
         return _ser(tl.GetMarkInOut())
     elif action == "set_mark_in_out":
@@ -15698,7 +15712,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","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","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/cut_ir.py

@@ -0,0 +1,115 @@
+"""Cut intermediate representation (Cut-IR) and the mechanical (Pass-1) detector.
+
+The Cut-IR is the typed contract between a timestamped transcript and concrete,
+governed timeline operations. Producers emit Cuts; an executor (a later phase)
+consumes them as governed, versioned edits; a review UI shows them. This module
+provides the schema plus the deterministic Pass-1 detector — filler words, long
+pauses, and repeated lines — with no LLM. The semantic Pass-2 and the timeline
+executor are separate phases (see local/design/research/r1-cut-ir.md).
+
+A Cut:
+    {
+      "kind": "filler" | "long_pause" | "stammer" | "false_start" | "semantic",
+      "span": {"start": <frame>, "end": <frame>},
+      "action": "lift" | "ripple_delete" | "keep" | "reorder" | "swap",
+      "confidence": 0.0..1.0,
+      "rationale": str,
+      "evidence": {...},
+    }
+"""
+from typing import Any, Dict, List, Optional
+
+# Common English fillers (single tokens and short phrases).
+FILLER_WORDS = {
+    "um", "uh", "er", "ah", "eh", "hmm", "mm", "uhh", "umm",
+    "like", "so", "well", "right", "okay", "ok",
+}
+FILLER_PHRASES = {"you know", "i mean", "sort of", "kind of", "you see"}
+
+
+def make_cut(
+    kind: str,
+    start: Optional[int],
+    end: Optional[int],
+    action: str,
+    confidence: float,
+    rationale: str,
+    evidence: Optional[Dict[str, Any]] = None,
+) -> Dict[str, Any]:
+    return {
+        "kind": kind,
+        "span": {"start": start, "end": end},
+        "action": action,
+        "confidence": round(float(confidence), 2),
+        "rationale": rationale,
+        "evidence": evidence or {},
+    }
+
+
+def _norm(text: str) -> str:
+    return (text or "").strip().lower().strip(".,!?;:")
+
+
+def _is_filler_only(text: str) -> bool:
+    low = _norm(text)
+    if not low:
+        return False
+    if low in FILLER_PHRASES:
+        return True
+    tokens = [t.strip(".,!?;:") for t in low.split()]
+    tokens = [t for t in tokens if t]
+    return bool(tokens) and all(t in FILLER_WORDS for t in tokens)
+
+
+def detect_cuts_pass1(
+    cues: List[Dict[str, Any]],
+    *,
+    long_pause_frames: int = 48,
+) -> List[Dict[str, Any]]:
+    """Mechanical Pass-1 detection over timestamped cues.
+
+    cues: list of {"text", "start", "end"} in frames. Returns a list of Cuts.
+    """
+    cuts: List[Dict[str, Any]] = []
+    for i, cue in enumerate(cues):
+        text = (cue.get("text") or "").strip()
+        start, end = cue.get("start"), cue.get("end")
+
+        if _is_filler_only(text):
+            cuts.append(make_cut(
+                "filler", start, end, "lift", 0.8,
+                f"Filler-only cue: {text!r}", {"text": text},
+            ))
+
+        if i > 0:
+            prev_text = (cues[i - 1].get("text") or "").strip()
+            if _norm(prev_text) and _norm(text) == _norm(prev_text):
+                cuts.append(make_cut(
+                    "stammer", start, end, "lift", 0.6,
+                    f"Repeated line: {text!r}", {"text": text},
+                ))
+            prev_end = cues[i - 1].get("end")
+            if (prev_end is not None and start is not None
+                    and start - prev_end > long_pause_frames):
+                cuts.append(make_cut(
+                    "long_pause", prev_end, start, "lift", 0.5,
+                    f"Pause of {start - prev_end} frames before {text!r}",
+                    {"frames": start - prev_end},
+                ))
+    return cuts
+
+
+def build_cut_list(
+    cues: List[Dict[str, Any]],
+    *,
+    long_pause_frames: int = 48,
+) -> Dict[str, Any]:
+    """Run Pass-1 and wrap the result as a (dry-run) CutList."""
+    cuts = detect_cuts_pass1(cues, long_pause_frames=long_pause_frames)
+    return {
+        "cuts": cuts,
+        "cut_count": len(cuts),
+        "basis_cue_count": len(cues),
+        "pass": "mechanical",
+        "note": "Dry-run proposal. Review before applying; no edits were made.",
+    }

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)