davinci-resolve-mcp 2.104.0 → 2.104.2

package/src/granular/media_pool.py

@@ -2,6 +2,7 @@
 
 from src.granular.common import *  # noqa: F401,F403
 from src.utils.multicam import build_multicam_setup_plan
+from src.utils.resolve_writes import set_current_timeline, describe_switch_failure
 
 resolve = ResolveProxy()
 
@@ -272,15 +273,22 @@ def setup_multicam_timeline(
     timeline = mp.CreateEmptyTimeline(plan["name"])
     if not timeline:
         return {"error": f"Failed to create multicam setup timeline: {plan['name']}"}
-    try:
-        project.SetCurrentTimeline(timeline)
-    except Exception:
-        pass
+    switched, switch_detail = set_current_timeline(project, timeline)
+    if not switched:
+        return {"error": describe_switch_failure(switch_detail, "stacking the angles"),
+                "switch": switch_detail}
+    start_timecode_set = None
     if plan.get("start_timecode"):
+        # A refused start timecode leaves the timeline at 01:00:00:00 while every
+        # recordFrame below was computed against the requested one, so the whole
+        # stack lands at the wrong absolute time. Reported, not swallowed.
         try:
-            timeline.SetStartTimecode(plan["start_timecode"])
-        except Exception:
-            pass
+            start_timecode_set = bool(timeline.SetStartTimecode(plan["start_timecode"]))
+        except Exception as exc:
+            return {"error": f"SetStartTimecode('{plan['start_timecode']}') raised: {exc}"}
+        if not start_timecode_set:
+            return {"error": f"SetStartTimecode('{plan['start_timecode']}') was refused; "
+                             f"the angle stack would land at the wrong absolute time"}
 
     video_tracks = _ensure_timeline_tracks_for_multicam(timeline, "video", plan.get("max_video_track", 0))
     if not video_tracks.get("success"):

package/src/granular/timeline.py

@@ -3,6 +3,7 @@
 from src.granular.common import *  # noqa: F401,F403
 
 from src.utils.page_lock import color_page_for_thumbnails
+from src.utils.resolve_writes import set_current_timeline, describe_switch_failure
 
 resolve = ResolveProxy()
 
@@ -1038,11 +1039,15 @@ def create_timeline_from_clips(
         tl = mp.CreateEmptyTimeline(name)
         if not tl:
             return {"success": False, "error": "Failed to create timeline"}
-        try:
-            if project:
-                project.SetCurrentTimeline(tl)
-        except Exception:
-            logger.debug("Could not set newly created timeline current", exc_info=True)
+        if project:
+            # The appends below go to the CURRENT timeline, so this is a
+            # precondition for the whole build, not a convenience.
+            switched, switch_detail = set_current_timeline(project, tl)
+            if not switched:
+                return {"success": False,
+                        "error": describe_switch_failure(switch_detail,
+                                                         "appending the clip_infos"),
+                        "switch": switch_detail}
         timeline_start = _timeline_start_frame(tl)
         built = []
         for i, ci in enumerate(clip_infos):

package/src/granular/timeline_item.py

@@ -978,9 +978,15 @@ def modify_keyframe(timeline_item_id: str, property_name: str, frame: int, new_v
             if new_frame < start_frame or new_frame > end_frame:
                 return f"Error: New frame {new_frame} is outside the item's range ({start_frame} to {end_frame})"
                 
-            # Delete the keyframe at the current frame
+            # Delete the keyframe at the current frame. A discarded False here
+            # leaves the ORIGINAL keyframe in place; the AddKeyframe below then
+            # succeeds at the new frame and the tool reports "moved" for what is
+            # actually a copy.
             current_value = timeline_item.GetPropertyAtKeyframeIndex(property_name, keyframe_index)
-            timeline_item.DeleteKeyframe(property_name, frame)
+            if not timeline_item.DeleteKeyframe(property_name, frame):
+                return (f"Failed to move keyframe for {property_name}: DeleteKeyframe "
+                        f"refused frame {frame}, so the original is still there and "
+                        f"nothing was moved")
             
             # Add a new keyframe at the new frame position with the current value (or new value if specified)
             value = new_value if new_value is not None else current_value
@@ -991,9 +997,13 @@ def modify_keyframe(timeline_item_id: str, property_name: str, frame: int, new_v
             else:
                 return f"Failed to move keyframe for {property_name}"
         else:
-            # Only changing the value, not the frame position
-            # We need to delete and re-add the keyframe with the new value
-            timeline_item.DeleteKeyframe(property_name, frame)
+            # Only changing the value, not the frame position: delete and
+            # re-add. A discarded False leaves the OLD value in place and
+            # AddKeyframe on an occupied frame is not a value update.
+            if not timeline_item.DeleteKeyframe(property_name, frame):
+                return (f"Failed to update keyframe value for {property_name} at frame "
+                        f"{frame}: DeleteKeyframe refused, so the old value is still "
+                        f"there and nothing was changed")
             result = timeline_item.AddKeyframe(property_name, frame, new_value)
             
             if result:
@@ -1171,8 +1181,12 @@ def set_keyframe_interpolation(timeline_item_id: str, property_name: str, frame:
                 value = timeline_item.GetPropertyAtKeyframeIndex(property_name, i)
                 break
         
-        # Delete the old keyframe
-        timeline_item.DeleteKeyframe(property_name, frame)
+        # Delete the old keyframe. A discarded False leaves the original
+        # interpolation in place and the tool still reports success.
+        if not timeline_item.DeleteKeyframe(property_name, frame):
+            return (f"Failed to set interpolation for {property_name} at frame {frame}: "
+                    f"DeleteKeyframe refused, so the original keyframe and its "
+                    f"interpolation are unchanged")
         
         # Add a new keyframe with the same value but different interpolation
         result = timeline_item.AddKeyframe(property_name, frame, value, interpolation_map[interpolation_type])