davinci-resolve-mcp 4.8.1 → 4.8.3

package/CHANGELOG.md

@@ -2,6 +2,137 @@
 
 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.8.3 — nested folder ids resolve for delete and move
+
+### Fixed
+
+- **`media_pool.delete_folders` and `media_pool.move_folders` resolve
+  `folder_ids` anywhere in the Media Pool tree.** Both actions scanned only the
+  root folder's direct children, so an id belonging to any nested folder came
+  back `{"error":{"message":"No folders found"}}` — even though the caller was
+  holding the id `GetUniqueId()` had just handed them, and `mp.DeleteFolders()`
+  on the resolved object worked fine. Both now use the existing recursive
+  `_find_folder_by_id` walk through a shared `_folders_from_ids` resolver.
+- **An unresolved id fails the call instead of being dropped** — the same
+  all-or-nothing rule 4.8.2 applied to the clip actions. Previously only an
+  all-empty result errored, so a mixed batch deleted or moved the subset that
+  happened to resolve and answered `{"success": true}`; `move_folders` did not
+  even stop at an empty result and answered `success: true` after
+  `MoveFolders([], target)`. Unresolved ids now return `FOLDER_NOT_FOUND` /
+  `invalid_input` naming both the unresolved and the resolved ids in `state`,
+  with nothing deleted or moved.
+- An empty or non-list `folder_ids` returns `INVALID_FOLDER_IDS` instead of
+  iterating a bare string character by character; a missing one keeps the
+  surface-wide `MISSING_FOLDER_IDS`. The root (Master) folder — newly reachable
+  now that the search is recursive — is refused with
+  `ROOT_FOLDER_NOT_ELIGIBLE` before Resolve sees it. `move_folders`' "Target
+  folder not found" now carries `FOLDER_NOT_FOUND` / `invalid_input` too.
+
+### Validation
+
+- New `tests/test_media_pool_folder_ids.py` pins both actions against a
+  three-level-deep folder, the partial-batch case, and the boundary inputs.
+  Against the 4.8.2 code 10 of its 11 tests fail; all 11 pass after.
+- Offline suite: 3,732 tests run, 84 skipped, 11 errors — the same environment
+  gaps as in 4.8.2 (`numpy` and `requests` absent from the venv, `node_modules`
+  not installed). None touch `media_pool`. Drift guards, api-parity,
+  api-limitations and read/write symmetry clean; tool counts unchanged.
+- Live reproduction on Resolve Studio 21.1.0.14 (reporter): deleting
+  `Master/OUTDOORS/1_FOOTAGE/wetransfer_dscf1065-mov_2022-01-31_1207` by its
+  `GetUniqueId()` returned `No folders found`, while `mp.DeleteFolders()` with
+  the recursively resolved folder object succeeded.
+- **Live-validated on Resolve Studio 21.1.0.14** with the new
+  `tests/live_nested_folder_ids_check.py`
+  (`venv/bin/python tests/live_nested_folder_ids_check.py`) against a real project
+  of 144 folders and 2,600 clips, probing a folder seven levels below Master.
+  `delete_folders` on its id reached `confirmation_required` naming exactly that
+  folder; `move_folders` resolved it and its current parent as the target;
+  partial and all-missing batches came back `FOLDER_NOT_FOUND` for both actions,
+  Master `ROOT_FOLDER_NOT_ELIGIBLE`, bare string and empty list
+  `INVALID_FOLDER_IDS`, no key `MISSING_FOLDER_IDS`. The check is strictly
+  non-destructive, with the same tripwire as the 4.8.2 clip check: the MediaPool
+  it hands the actions forwards only `GetRootFolder` / `GetCurrentFolder` and
+  intercepts every other method, so `DeleteFolders` / `MoveFolders` never reach
+  Resolve whatever the code does; token gating is forced on and no token is
+  passed; move probes aim at the folder's current parent; the destructive hook's
+  analysis-root writes are disabled and its logs go to a temp directory. Every
+  folder's parent and every clip's folder read back identical after the run.
+- The same live check against the 4.8.2 code fails with 14 findings and
+  reproduces the reported bug: the depth-7 id came back `No folders found` from
+  `delete_folders`, and the tripwire intercepted five `MoveFolders` calls with an
+  empty folder list, each answered as a plain result rather than an error. The
+  pool was unchanged after that run too.
+
+## What's New in v4.8.2 — a clip id that resolves to nothing fails the whole clip batch
+
+### Fixed
+
+- **`media_pool` `delete_clips`, `move_clips`, `relink` and `unlink` no longer act on
+  the part of a batch that happened to resolve.** All four resolved `clip_ids` with
+  `[_find_clip(root, cid) for cid in ...]` and then dropped every miss, so Resolve was
+  handed whatever was left. `delete_clips` errored only when *every* id missed
+  (`"No clips found"`); a mixed batch deleted the subset that resolved and answered
+  `{"success": true}`, and with confirm tokens on, the preview and the token covered
+  that subset too. `move_clips`, `relink` and `unlink` did not check for an empty
+  result at all: an all-missing batch reached `MoveClips([], target)` /
+  `RelinkClips([], path)` / `UnlinkClips([])` and reported whatever Resolve's bool
+  said. The caller could not tell a partial change from a whole one.
+  - A new `_clips_from_ids` resolver fails the call before anything reaches Resolve
+    (and before a confirm token is issued) with `CLIP_NOT_FOUND` /
+    `invalid_input`, naming the ids in `error.state.unresolved_clip_ids` and
+    `error.state.resolved_clip_ids`. Nothing is deleted, moved, relinked or unlinked.
+  - An empty or non-list `clip_ids` returns `INVALID_CLIP_IDS` instead of iterating a
+    bare string character by character; a missing one keeps the surface-wide
+    `MISSING_CLIP_IDS`.
+
+### Not changed
+
+- The same drop-the-misses pattern remains in four other `media_pool` actions, which
+  this release does not touch: `create_timeline_from_clips` (simple `clip_ids` mode)
+  builds the timeline from the subset, `append_to_timeline` (legacy `clip_ids` mode)
+  appends the subset and verifies against the resolved count, `export_metadata`
+  exports the subset — and with every id missing calls `ExportMetadata(path, [])`,
+  whose behaviour on an empty list is not measured — and `auto_sync_audio` syncs the
+  subset. The granular server's `delete_media_pool_clips` and `move_clips_to_folder`
+  have the same partial-batch behaviour (they do report a count). The `safe_*` /
+  `organize_clips` family reports its misses in `missing` rather than dropping them
+  silently.
+
+### Validation
+
+- New `tests/test_media_pool_clip_ids.py` pins all four actions against a fake
+  Media Pool that records every mutation call: a partial batch, an all-missing
+  batch, a partial `delete_clips` under confirm-token gating (no token is issued),
+  and the missing / empty / bare-string `clip_ids` shapes, plus the happy path with
+  a clip two folders deep. Against the pre-fix code 5 of its 10 tests fail
+  (17 subtests — every partial and all-missing case, the token case and both
+  shape cases); the 5 that pin preserved behaviour pass on both. All 10 pass after.
+- Offline suite: 3,721 tests run, 84 skipped, 11 errors — all environment gaps on the
+  machine that ran it (`numpy` and `requests` absent from the venv, so five test
+  modules fail to import and one LUT test cannot do arithmetic; `node_modules` not
+  installed, so five `test_offline_fallback` cases cannot load `jszip`). None touch
+  `media_pool`. Drift guards, api-parity, api-limitations and read/write symmetry
+  clean; `test_static_undefined_names` skipped because pyflakes is not installed.
+- **Live-validated on Resolve Studio 21.1.0.14** with the new
+  `tests/live_clip_ids_check.py` (`venv/bin/python tests/live_clip_ids_check.py`)
+  against a real project of 144 folders and 2,600 clips, probing a clip seven
+  folders deep. Partial and all-missing batches came back `CLIP_NOT_FOUND` for all
+  four actions, with no confirm token for the partial delete; bare string and
+  empty list → `INVALID_CLIP_IDS`, no key → `MISSING_CLIP_IDS`; a whole batch still
+  resolved to the real clip. The check is strictly non-destructive: the MediaPool it
+  hands the actions forwards only `GetRootFolder` / `GetCurrentFolder` and
+  intercepts every other method, so `DeleteClips` / `MoveClips` / `RelinkClips` /
+  `UnlinkClips` never reach Resolve whatever the code does; token gating is forced
+  on and no token is passed; the destructive hook's analysis-root writes are
+  disabled and its logs go to a temp directory. Every clip's folder, every folder's
+  parent and the probe clip's File Path read back identical after the run.
+- The same live check against the pre-fix code fails with 18 findings: the tripwire
+  intercepted 10 MediaPool mutations the old code sent — `MoveClips`,
+  `RelinkClips` and `UnlinkClips` with just the probe clip for the partial batches,
+  the same three with an empty list for the all-missing batches, `UnlinkClips([])`
+  for `clip_ids: []` — and the partial `delete_clips` was issued a confirm token.
+  The pool was unchanged after that run too.
+
 ## What's New in v4.8.1 — text modifiers (Follower) attach to TextPlus inputs
 
 ### Added

package/README.md

@@ -2,7 +2,7 @@
 
 English | [简体中文](README.zh-CN.md)
 
-[![Version](https://img.shields.io/badge/version-4.8.1-blue.svg)](https://github.com/samuelgursky/davinci-resolve-mcp/releases)
+[![Version](https://img.shields.io/badge/version-4.8.3-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.8.1-blue.svg)](https://github.com/samuelgursky/davinci-resolve-mcp/releases)
+[![Version](https://img.shields.io/badge/version-4.8.3-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.8.1 版 README。如与英文原版有出入，以 [英文原版](README.md) 为准。
+> 本翻译对应 v4.8.3 版 README。如与英文原版有出入，以 [英文原版](README.md) 为准。
 
 一个 Model Context Protocol (MCP) 服务器，让 AI 助手通过官方脚本 API 控制 DaVinci Resolve Studio（达芬奇）。它提供完整的 API 覆盖，外加带护栏的工作流助手，涵盖剪辑、媒体池整理、渲染设置、审阅标记、调色、Fusion、Fairlight、项目生命周期任务、扩展开发，以及不碰源媒体的媒体分析。
 

package/docs/SKILL.md

@@ -922,6 +922,14 @@ Key actions: `get_root_folder`, `get_current_folder`, `set_current_folder(path)`
 `setup_multicam_timeline(name, clip_ids|angles, sync_mode?, include_audio?, dry_run?)`,
 `get_selected`, `set_selected(clip_id)`, `export_metadata(path, clip_ids?)`
 
+`delete_clips`, `move_clips`, `relink` and `unlink` are all-or-nothing: if any id
+in `clip_ids` matches no clip, the call fails with `CLIP_NOT_FOUND` (the
+unresolved and resolved ids are in `error.state`) and no clip is changed. Drop the
+stale ids and retry; do not read a partial batch as done. `delete_folders(folder_ids)`
+and `move_folders(folder_ids, target_path)` work the same way with
+`FOLDER_NOT_FOUND`; they resolve `folder_ids` at any depth (pass the ids
+`folder get_subfolders` returns) and refuse the Master folder itself.
+
 Media Pool / Ingest kernel actions (v2.8.0+) add safer agent-facing workflows:
 `ingest_capabilities`, `probe_media_pool`, `probe_ingest_item`,
 `safe_import_media`, `safe_import_sequence`, `safe_import_folder`,

package/install.py

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

package/src/granular/common.py

@@ -93,7 +93,7 @@ if not logging.getLogger().handlers:
         handlers=[logging.StreamHandler()],
     )
 
-VERSION = "4.8.1"
+VERSION = "4.8.3"
 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.8.1"
+VERSION = "4.8.3"
 
 import base64
 import os
@@ -2912,6 +2912,45 @@ def _find_clip(folder, clip_id):
     return None
 
 
+def _clips_from_ids(root, clip_ids, *, verb):
+    """Resolve Media Pool clip unique IDs to clip objects. Returns (clips, error).
+
+    Unresolved ids abort the call instead of being dropped. The raw clip actions
+    used to filter misses out and hand Resolve whatever was left, so a mixed batch
+    deleted, moved, relinked or unlinked the subset that happened to resolve and
+    answered plain {"success": true} — indistinguishable from every id having
+    resolved. move_clips/relink/unlink did not even stop at an empty result:
+    MoveClips([], target) moved nothing and still reported success.
+
+    A non-list is refused rather than iterated: a bare string used to become one
+    id per character, each matching nothing and each silently dropped.
+    """
+    if not isinstance(clip_ids, list) or not clip_ids:
+        return None, _err(
+            "clip_ids must be a non-empty list of Media Pool clip unique IDs",
+            code="INVALID_CLIP_IDS", category="invalid_input",
+            remediation="Pass clip_ids as a list, e.g. params={\"clip_ids\": [\"<id>\"]}.")
+    clips, resolved, unresolved = [], [], []
+    for cid in clip_ids:
+        cid = str(cid)
+        found = _find_clip(root, cid)
+        if found is None:
+            unresolved.append(cid)
+        else:
+            clips.append(found)
+            resolved.append(cid)
+    if unresolved:
+        return None, _err(
+            f"Clip(s) not found: {', '.join(unresolved)}",
+            code="CLIP_NOT_FOUND", category="invalid_input",
+            reason=(f"{len(unresolved)} of {len(clip_ids)} clip_ids matched no clip "
+                    f"anywhere in the Media Pool; nothing was {verb}."),
+            remediation=("List clips with folder get_clips (or media_pool get_selected) "
+                         "and pass only ids that still exist."),
+            state={"unresolved_clip_ids": unresolved, "resolved_clip_ids": resolved})
+    return clips, None
+
+
 def _find_clip_with_parent(folder, clip_id, _parent=None):
     """Return (clip, parent_folder) for clip_id, searching recursively.
 
@@ -2928,6 +2967,13 @@ def _find_clip_with_parent(folder, clip_id, _parent=None):
             return found_clip, found_parent
     return None, None
 
+
+_FOLDER_ID_REMEDIATION = (
+    "List folders with folder get_subfolders (walking down from "
+    "path=\"Master\") and address by exact path or folder_id."
+)
+
+
 def _find_folder_by_id(folder, folder_id):
     if folder.GetUniqueId() == folder_id:
         return folder
@@ -2938,6 +2984,57 @@ def _find_folder_by_id(folder, folder_id):
     return None
 
 
+def _folders_from_ids(root, folder_ids, *, verb):
+    """Resolve Media Pool folder unique IDs to folder objects. Returns (folders, error).
+
+    Searches the WHOLE tree. The ids callers hold come from GetUniqueId() /
+    folder.get_subfolders, which hand them out at every depth, so the shallow
+    scan of root's direct children this replaced answered "No folders found" for
+    any nested folder — verified live on Resolve Studio 21.1.0.14, where
+    deleting Master/OUTDOORS/1_FOOTAGE/<clip bin> by its own id failed while
+    mp.DeleteFolders() on the recursively resolved object worked.
+
+    Unresolved ids abort the call instead of being dropped. Skipping them let a
+    partial match delete or move the subset it did find and answer plain
+    {"success": true}, which is indistinguishable from every id having resolved.
+
+    The root (Master) folder is refused rather than passed to Resolve: it cannot
+    be deleted or moved, and the shallow search could never return it.
+    """
+    if not isinstance(folder_ids, list) or not folder_ids:
+        return None, _err(
+            "folder_ids must be a non-empty list of folder unique IDs",
+            code="INVALID_FOLDER_IDS", category="invalid_input",
+            remediation=_FOLDER_ID_REMEDIATION)
+    root_id = root.GetUniqueId()
+    folders, unresolved, named_root = [], [], False
+    for fid in folder_ids:
+        fid = str(fid)
+        if fid == root_id:
+            named_root = True
+            continue
+        found = _find_folder_by_id(root, fid)
+        if found is None:
+            unresolved.append(fid)
+        else:
+            folders.append(found)
+    if named_root:
+        return None, _err(
+            f"The root (Master) folder cannot be {verb}",
+            code="ROOT_FOLDER_NOT_ELIGIBLE", category="invalid_input",
+            state={"root_folder_id": root_id})
+    if unresolved:
+        return None, _err(
+            f"Folder(s) not found: {', '.join(unresolved)}",
+            code="FOLDER_NOT_FOUND", category="invalid_input",
+            reason=(f"{len(unresolved)} of {len(folder_ids)} folder_ids matched no folder "
+                    f"anywhere in the Media Pool; nothing was {verb}."),
+            remediation=_FOLDER_ID_REMEDIATION,
+            state={"unresolved_folder_ids": unresolved,
+                   "resolved_folder_ids": [f.GetUniqueId() for f in folders]})
+    return folders, None
+
+
 def _folder_from_params(mp, p, *path_keys, no_address="current"):
     """Resolve the folder an action was aimed at. Returns (folder, error).
 
@@ -2958,8 +3055,7 @@ def _folder_from_params(mp, p, *path_keys, no_address="current"):
     `_navigate_folder(mp, "")`, which returns root). This fix must not also
     change what omitting the address means.
     """
-    remediation = ("List folders with folder get_subfolders (walking down from "
-                   "path=\"Master\") and address by exact path or folder_id.")
+    remediation = _FOLDER_ID_REMEDIATION
     path = _first_param(p, *path_keys)
     if path:
         f = _navigate_folder(mp, path)
@@ -21049,7 +21145,10 @@ def media_pool(action: str, params: Optional[Dict[str, Any]] = None) -> Dict[str
       add_subfolder(name, parent_path?) -> {success, name, id}
       delete_folders(folder_ids) -> {success}
         DESTRUCTIVE. Deletes folders + every clip they contain.
+        folder_ids resolve at ANY depth; an id matching nothing fails the whole
+        call (FOLDER_NOT_FOUND) rather than deleting the ids that did resolve.
       move_folders(folder_ids, target_path) -> {success}
+        folder_ids resolve at ANY depth; unresolved ids fail the whole call.
       refresh() -> {success}
       create_timeline(name, if_exists?) -> {success, name, id}
         — if_exists: version (default), reuse, or fail
@@ -21086,6 +21185,9 @@ def media_pool(action: str, params: Optional[Dict[str, Any]] = None) -> Dict[str
           Example: [{"FilePath": "frame_%03d.dpx", "StartIndex": 1, "EndIndex": 100}]
       delete_clips(clip_ids) -> {success}
         DESTRUCTIVE. Removes clips from the Media Pool (does not touch source files).
+        An id matching no clip fails the whole call (CLIP_NOT_FOUND) rather than
+        deleting the ids that did resolve; the same holds for move_clips, relink
+        and unlink.
       move_clips(clip_ids, target_path) -> {success}
       relink(clip_ids, folder_path) -> {success}
         UNSAFE. No dry_run. Prefer safe_relink.
@@ -21154,14 +21256,9 @@ def media_pool(action: str, params: Optional[Dict[str, Any]] = None) -> Dict[str
         f = mp.AddSubFolder(parent, p["name"])
         return _ok(name=f.GetName(), id=f.GetUniqueId()) if f else _err("Failed to create subfolder")
     elif action == "delete_folders":
-        folders = []
-        for fid in p["folder_ids"]:
-            # Search for folder by ID (simplified - searches root subfolders)
-            for sub in (root.GetSubFolderList() or []):
-                if sub.GetUniqueId() == fid:
-                    folders.append(sub)
-        if not folders:
-            return _err("No folders found")
+        folders, folders_err = _folders_from_ids(root, p["folder_ids"], verb="deleted")
+        if folders_err:
+            return folders_err
         if "confirm_token" not in p and "confirmToken" not in p and _confirm_token_required():
             return _issue_confirm_token(
                 action="media_pool.delete_folders", params=p,
@@ -21177,12 +21274,12 @@ def media_pool(action: str, params: Optional[Dict[str, Any]] = None) -> Dict[str
     elif action == "move_folders":
         target = _navigate_folder(mp, p["target_path"])
         if not target:
-            return _err(f"Target folder not found: {p['target_path']}")
-        folders = []
-        for fid in p["folder_ids"]:
-            for sub in (root.GetSubFolderList() or []):
-                if sub.GetUniqueId() == fid:
-                    folders.append(sub)
+            return _err(f"Target folder not found: {p['target_path']}",
+                        code="FOLDER_NOT_FOUND", category="invalid_input",
+                        remediation=_FOLDER_ID_REMEDIATION)
+        folders, folders_err = _folders_from_ids(root, p["folder_ids"], verb="moved")
+        if folders_err:
+            return folders_err
         return {"success": bool(mp.MoveFolders(folders, target))}
     elif action == "refresh":
         return {"success": bool(mp.RefreshFolders())}
@@ -21393,10 +21490,9 @@ def media_pool(action: str, params: Optional[Dict[str, Any]] = None) -> Dict[str
             result = mp.ImportMedia(paths)
         return {"imported": len(result) if result else 0}
     elif action == "delete_clips":
-        clips = [_find_clip(root, cid) for cid in p["clip_ids"]]
-        clips = [c for c in clips if c]
-        if not clips:
-            return _err("No clips found")
+        clips, clips_err = _clips_from_ids(root, p["clip_ids"], verb="deleted")
+        if clips_err:
+            return clips_err
         if "confirm_token" not in p and "confirmToken" not in p and _confirm_token_required():
             return _issue_confirm_token(
                 action="media_pool.delete_clips", params=p,
@@ -21413,16 +21509,19 @@ def media_pool(action: str, params: Optional[Dict[str, Any]] = None) -> Dict[str
         target = _navigate_folder(mp, p["target_path"])
         if not target:
             return _err(f"Target folder not found: {p['target_path']}")
-        clips = [_find_clip(root, cid) for cid in p["clip_ids"]]
-        clips = [c for c in clips if c]
+        clips, clips_err = _clips_from_ids(root, p["clip_ids"], verb="moved")
+        if clips_err:
+            return clips_err
         return {"success": bool(mp.MoveClips(clips, target))}
     elif action == "relink":
-        clips = [_find_clip(root, cid) for cid in p["clip_ids"]]
-        clips = [c for c in clips if c]
+        clips, clips_err = _clips_from_ids(root, p["clip_ids"], verb="relinked")
+        if clips_err:
+            return clips_err
         return {"success": bool(mp.RelinkClips(clips, p["folder_path"]))}
     elif action == "unlink":
-        clips = [_find_clip(root, cid) for cid in p["clip_ids"]]
-        clips = [c for c in clips if c]
+        clips, clips_err = _clips_from_ids(root, p["clip_ids"], verb="unlinked")
+        if clips_err:
+            return clips_err
         return {"success": bool(mp.UnlinkClips(clips))}
     elif action == "export_metadata":
         clip_ids = p.get("clip_ids")