davinci-resolve-mcp 4.13.6 → 4.13.7

package/CHANGELOG.md

@@ -2,6 +2,45 @@
 
 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.13.7 — Missing-media relink works for paths written on another OS
+
+Lands #294, the follow-up to #293 for the Windows/macOS path work tracked in
+#278. A project moved between macOS and Windows keeps the paths the other OS
+wrote, so the missing-media diagnosis and relink plan now go by the path's own
+form.
+
+### Fixed
+
+- **Wanted basename (`src/server.py`, `_missing_media_diagnosis` and
+  `_build_relink_plan`)**: both used `os.path.basename`, which splits on the
+  running OS's separator only. On macOS the basename of `E:\DCIM\P1047043.MOV`
+  was the whole string, so a bounded search could never match. Both now split
+  on `/` and `\`.
+- **Volumes from another OS**: after #293, `E:\` on macOS (or `/Volumes/X` on
+  Windows) counted as an unmounted volume. That skipped the relink search and
+  advised mounting a volume this OS can never mount. Such roots are now flagged
+  `foreign_os_path` on volume, folder, item and candidate rows, and are never
+  probed with `isdir`. They report the new
+  `primary_cause="foreign_os_path"`, which advises searching the approved roots,
+  and they no longer trigger `skip_search_when_volume_missing`. A same-OS
+  unmounted volume behaves as before. When both kinds are present, the advice
+  names both.
+- **Sanitized relink plans**: with `sanitized=true`, `file_path` is dropped, so
+  the plan searched by the Resolve clip name. It now takes the basename from
+  `file_path_sanitized`, which keeps the filename.
+
+### Documentation
+
+- `docs/SKILL.md` documents `foreign_os_path`.
+
+### Validation
+
+- New `ForeignOsMediaPathTests` and basename/form tables pin the host OS, so
+  Linux, macOS and Windows CI all run both directions. Linux CI green on the PR.
+- Full offline suite and release static checks pass on macOS.
+- Diagnosis only, with no Resolve API call changed, so a live test is not
+  required.
+
 ## What's New in v4.13.6 — `drt` downgrade stamps the real Resolve build
 
 ### Fixed

package/README.md

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

package/docs/SKILL.md

@@ -1806,7 +1806,11 @@ missing volume roots, sample basenames, and a recommended next step. If a source
 volume such as a camera card is not mounted, `build_relink_plan` skips broad
 search by default and reports `skip_reason="missing_source_volume_not_mounted"`;
 mount the volume or pass `skip_search_when_volume_missing=false` only when a
-bounded scan of approved roots is intentional.
+bounded scan of approved roots is intentional. Paths written on another OS
+(`E:\...` on macOS, `/Volumes/...` on Windows, after a project moves between
+machines) are flagged `foreign_os_path`: their volume can never be mounted
+here, so they report `primary_cause="foreign_os_path"`, do not hold back the
+search, and are matched by their own basename under the approved roots.
 
 Audio / Fairlight kernel actions (v2.14.0+) add live-tested audio state,
 mapping, voice-isolation, sync, transcription, subtitle, and Fairlight boundary

package/install.py

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

package/src/granular/common.py

@@ -91,7 +91,7 @@ if not logging.getLogger().handlers:
         handlers=[logging.StreamHandler()],
     )
 
-VERSION = "4.13.6"
+VERSION = "4.13.7"
 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.13.6"
+VERSION = "4.13.7"
 
 import base64
 import os
@@ -21,6 +21,7 @@ import inspect
 import json
 import logging
 import math
+import ntpath
 import platform
 import re
 import shutil
@@ -8465,6 +8466,43 @@ def _media_path_parts(text: str) -> List[str]:
     return [part for part in re.split(r"[\\/]", text) if part]
 
 
+def _media_path_basename(path: Any) -> str:
+    # `os.path.basename` splits on the running OS's separator only, so on macOS
+    # the basename of `E:\DCIM\P1047043.MOV` is the whole string and a search
+    # for it can never match. Go by the path's own form instead.
+    parts = _media_path_parts(str(path or ""))
+    return parts[-1] if parts else ""
+
+
+def _media_path_form(path: Any) -> Optional[str]:
+    # "windows" for a drive letter or UNC share, "posix" for a /-rooted path,
+    # None for a relative path, which says nothing about the OS that wrote it.
+    text = str(path or "")
+    if text.startswith("\\\\") or _WINDOWS_DRIVE_PATH.match(text):
+        return "windows"
+    if text.startswith("/"):
+        return "posix"
+    return None
+
+
+def _host_media_path_form() -> str:
+    return "windows" if os.name == "nt" else "posix"
+
+
+def _media_path_is_foreign(path: Any) -> bool:
+    # A path another OS wrote: `E:\` on macOS, `/Volumes/X` on Windows. Its
+    # volume can never be mounted on this machine, so "mount it" is the wrong
+    # advice; the media has to be found under a root this OS can see.
+    form = _media_path_form(path)
+    return form is not None and form != _host_media_path_form()
+
+
+def _media_path_dirname(text: str) -> str:
+    # ntpath understands drive letters, UNC shares and both separators on any
+    # OS; posix-form paths keep the running OS's own dirname.
+    return ntpath.dirname(text) if _media_path_form(text) == "windows" else os.path.dirname(text)
+
+
 def _sanitize_media_path(path: Any, *, keep_filename: bool = True) -> Optional[str]:
     if not path:
         return None
@@ -8508,7 +8546,8 @@ def _missing_media_diagnosis(missing_rows: List[Dict[str, Any]]) -> Dict[str, An
     for row in missing_rows:
         file_path = row.get("file_path")
         media_pool_item_id = row.get("media_pool_item_id") or file_path or row.get("name")
-        basename = os.path.basename(str(file_path or row.get("media_pool_item_name") or row.get("name") or ""))
+        basename = _media_path_basename(file_path or row.get("media_pool_item_name") or row.get("name"))
+        foreign = _media_path_is_foreign(file_path)
         item = by_media_pool_item.setdefault(
             str(media_pool_item_id),
             {
@@ -8517,6 +8556,7 @@ def _missing_media_diagnosis(missing_rows: List[Dict[str, Any]]) -> Dict[str, An
                 "wanted_basename": basename,
                 "file_path_sanitized": _sanitize_media_path(file_path),
                 "volume_root_sanitized": _sanitize_media_path(_media_path_volume_root(file_path), keep_filename=False),
+                "foreign_os_path": foreign,
                 "timeline_occurrence_count": 0,
                 "track_refs": [],
             },
@@ -8536,7 +8576,11 @@ def _missing_media_diagnosis(missing_rows: List[Dict[str, Any]]) -> Dict[str, An
                 volume_root,
                 {
                     "volume_root_sanitized": _sanitize_media_path(volume_root, keep_filename=False),
-                    "mounted": os.path.isdir(volume_root),
+                    # Never probed: this OS reads the name as something else
+                    # (`/Volumes/X` is a folder on the current Windows drive,
+                    # `E:\` a relative name on macOS).
+                    "mounted": False if foreign else os.path.isdir(volume_root),
+                    "foreign_os_path": foreign,
                     "clip_count": 0,
                     "sample_basenames": [],
                 },
@@ -8545,13 +8589,14 @@ def _missing_media_diagnosis(missing_rows: List[Dict[str, Any]]) -> Dict[str, An
             if basename and basename not in volume_row["sample_basenames"] and len(volume_row["sample_basenames"]) < 8:
                 volume_row["sample_basenames"].append(basename)
 
-        folder = os.path.dirname(str(file_path)) if file_path else ""
+        folder = _media_path_dirname(str(file_path)) if file_path else ""
         if folder:
             folder_row = missing_folders.setdefault(
                 folder,
                 {
                     "folder_sanitized": _sanitize_media_path(folder, keep_filename=False),
-                    "exists": os.path.isdir(folder),
+                    "exists": False if foreign else os.path.isdir(folder),
+                    "foreign_os_path": foreign,
                     "clip_count": 0,
                     "sample_basenames": [],
                 },
@@ -8563,14 +8608,28 @@ def _missing_media_diagnosis(missing_rows: List[Dict[str, Any]]) -> Dict[str, An
     unique_items = list(by_media_pool_item.values())
     missing_volume_rows = list(missing_volumes.values())
     missing_folder_rows = list(missing_folders.values())
-    absent_volumes = [row for row in missing_volume_rows if not row.get("mounted")]
+    foreign_volumes = [row for row in missing_volume_rows if row.get("foreign_os_path")]
+    absent_volumes = [row for row in missing_volume_rows if not row.get("mounted") and not row.get("foreign_os_path")]
     absent_folders = [row for row in missing_folder_rows if not row.get("exists")]
+    foreign_labels = ", ".join(row["volume_root_sanitized"] for row in foreign_volumes[:3])
     primary_cause = "none"
     recommended_next_step = "No offline media detected."
     if absent_volumes:
         primary_cause = "volume_not_mounted"
         labels = ", ".join(row["volume_root_sanitized"] for row in absent_volumes[:3])
         recommended_next_step = f"Mount the missing volume(s): {labels}."
+        if foreign_volumes:
+            recommended_next_step += (
+                f" Paths written on another operating system ({foreign_labels}) cannot be mounted here;"
+                " relink those from approved media roots by basename."
+            )
+    elif foreign_volumes:
+        primary_cause = "foreign_os_path"
+        recommended_next_step = (
+            f"These media paths were written on another operating system, so their volume(s)"
+            f" ({foreign_labels}) cannot be mounted here. Search approved media roots for the wanted basenames"
+            " (build_relink_plan), then relink with media_pool.safe_relink."
+        )
     elif absent_folders:
         primary_cause = "folder_not_found"
         labels = ", ".join(row["folder_sanitized"] for row in absent_folders[:3])
@@ -8731,8 +8790,10 @@ def _build_relink_plan(tl, p: Dict[str, Any]):
         return _err(f"search_roots must be existing directories: {invalid}")
     missing_report = _detect_missing_media(tl, p)
     diagnosis = missing_report.get("diagnosis") or _missing_media_diagnosis(missing_report.get("missing", []))
+    # A volume another OS wrote can never be mounted here, so it never holds the
+    # search back: approved roots are the only place its media can turn up.
     if _coerce_bool(p.get("skip_search_when_volume_missing"), True) and any(
-        not row.get("mounted") for row in diagnosis.get("missing_volumes", [])
+        not row.get("mounted") and not row.get("foreign_os_path") for row in diagnosis.get("missing_volumes", [])
     ):
         return {
             "success": True,
@@ -8749,7 +8810,10 @@ def _build_relink_plan(tl, p: Dict[str, Any]):
     candidates = []
     rows_by_basename: Dict[str, List[Dict[str, Any]]] = {}
     for row in missing_report.get("missing", []):
-        wanted = os.path.basename(str(row.get("file_path") or row.get("media_pool_item_name") or row.get("name") or ""))
+        # A sanitized report drops `file_path`; its sanitized form keeps the
+        # filename and the root's form, which is all the search needs.
+        path = row.get("file_path") or row.get("file_path_sanitized")
+        wanted = _media_path_basename(path or row.get("media_pool_item_name") or row.get("name"))
         if wanted:
             rows_by_basename.setdefault(wanted, []).append(row)
     for wanted, rows in rows_by_basename.items():
@@ -8763,6 +8827,7 @@ def _build_relink_plan(tl, p: Dict[str, Any]):
             {
                 **row,
                 "wanted_basename": wanted,
+                "foreign_os_path": _media_path_is_foreign(row.get("file_path") or row.get("file_path_sanitized")),
                 "timeline_occurrence_count": len(rows),
                 "candidate_paths": [] if _coerce_bool(p.get("sanitize_paths")) or _coerce_bool(p.get("sanitized")) else matches,
                 "candidate_paths_sanitized": sanitized_matches,