davinci-resolve-mcp 2.54.1 → 2.54.3

package/CHANGELOG.md

@@ -2,6 +2,44 @@
 
 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.54.3
+
+Follow-up to the v2.54.2 config-merge fix (#71): the JSONC sanitizer's
+trailing-comma step was not string-aware.
+
+- **Fixed** `_strip_jsonc` removed trailing commas with a regex applied to the
+  whole document, so a comma inside a string value followed by whitespace and a
+  closing brace/bracket — e.g. `"greeting": "hello, } world"` — had the comma
+  silently stripped *from inside the string* when merging a commented (JSONC)
+  client config. The trailing-comma pass is now string-aware (mirroring the
+  comment stripper), so string contents are never altered while real trailing
+  commas are still removed. Added regression tests covering string values that
+  contain `, }` / `, ]`. (Dropped the now-unused `re` import.)
+
+## What's New in v2.54.2
+
+A destructive-overwrite bug in the installer (issue #71): the MCP client setup
+step could wipe a user's entire editor settings file instead of merging into it.
+
+- **Fixed** `install.py` silently destroyed existing client config files whose
+  contents weren't strict JSON. `read_json` swallowed `JSONDecodeError` and
+  returned `{}`, so the subsequent "merge" wrote a file containing *only* the
+  `davinci-resolve` server entry — wiping themes, terminal env vars, LSP
+  settings, keybindings, everything else. Zed was the reported victim because
+  its `settings.json` ships with `//` comments (JSONC), but the same latent
+  risk existed for **every** supported client — VS Code and Continue also accept
+  JSONC. The fix is centralized in the single read/merge path so all clients are
+  covered:
+  - `read_json` now best-effort strips JSONC `//` and `/* */` comments and
+    trailing commas (string-aware, so comment markers inside string values are
+    preserved), letting commented configs merge cleanly instead of being lost.
+  - When a config file exists but still can't be parsed after that, the
+    installer **refuses to overwrite it** and tells the user to add the entry
+    manually — rather than silently replacing their settings.
+- **Added** regression tests covering JSONC merge, plain-JSON merge,
+  refuse-to-overwrite on unparseable files, fresh-file creation, and
+  string-aware comment stripping.
+
 ## What's New in v2.54.1
 
 One more instance of the enum-keyed silent-failure class (issue #70), plus a

package/README.md

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

package/install.py

@@ -35,7 +35,7 @@ from src.utils.update_check import (
 
 # ─── Version ──────────────────────────────────────────────────────────────────
 
-VERSION = "2.54.1"
+VERSION = "2.54.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
@@ -458,14 +458,124 @@ def build_zed_entry(python_path, server_path, api_path, lib_path, system=SYSTEM,
 
 # ─── Config File Operations ──────────────────────────────────────────────────
 
+class ConfigParseError(Exception):
+    """Existing config file has content but could not be parsed.
+
+    Callers must NOT overwrite such a file -- doing so destroys the user's
+    settings (issue #71).
+    """
+
+
+def _strip_jsonc(text):
+    """Best-effort strip of // and /* */ comments and trailing commas.
+
+    Zed's ``settings.json`` (and several other clients) accept JSON-with-comments.
+    Python's ``json`` module rejects those, so we strip them before parsing.
+    The walk is string-aware, so a ``//`` or ``/*`` sequence inside a JSON
+    string value is preserved.
+    """
+    out = []
+    i = 0
+    n = len(text)
+    in_string = False
+    escape = False
+    while i < n:
+        ch = text[i]
+        if in_string:
+            out.append(ch)
+            if escape:
+                escape = False
+            elif ch == "\\":
+                escape = True
+            elif ch == '"':
+                in_string = False
+            i += 1
+            continue
+        if ch == '"':
+            in_string = True
+            out.append(ch)
+            i += 1
+            continue
+        if ch == "/" and i + 1 < n and text[i + 1] == "/":
+            i += 2
+            while i < n and text[i] not in "\r\n":
+                i += 1
+            continue
+        if ch == "/" and i + 1 < n and text[i + 1] == "*":
+            i += 2
+            while i + 1 < n and not (text[i] == "*" and text[i + 1] == "/"):
+                i += 1
+            i += 2
+            continue
+        out.append(ch)
+        i += 1
+    stripped = "".join(out)
+    # Drop trailing commas before a closing brace/bracket — string-aware, so a
+    # comma inside a string value (e.g. "a, }") is never touched. A prior regex
+    # pass here was NOT string-aware and silently corrupted such values during a
+    # JSONC merge (follow-up to the issue #71 fix).
+    result = []
+    i = 0
+    n = len(stripped)
+    in_string = False
+    escape = False
+    while i < n:
+        ch = stripped[i]
+        if in_string:
+            result.append(ch)
+            if escape:
+                escape = False
+            elif ch == "\\":
+                escape = True
+            elif ch == '"':
+                in_string = False
+            i += 1
+            continue
+        if ch == '"':
+            in_string = True
+            result.append(ch)
+            i += 1
+            continue
+        if ch == ",":
+            j = i + 1
+            while j < n and stripped[j] in " \t\r\n":
+                j += 1
+            if j < n and stripped[j] in "}]":
+                i += 1  # trailing comma: drop it
+                continue
+        result.append(ch)
+        i += 1
+    return "".join(result)
+
+
 def read_json(path):
-    """Read a JSON file, return empty dict if missing or invalid."""
+    """Read a JSON/JSONC config file.
+
+    Returns an empty dict when the file is absent or empty (safe to create).
+    Raises :class:`ConfigParseError` when the file has content that cannot be
+    parsed even after stripping JSONC comments and trailing commas -- callers
+    must refuse to overwrite such a file, or they would wipe the user's
+    existing settings (issue #71: Zed's settings.json ships with comments).
+    """
     try:
         with open(path, "r") as f:
-            return json.load(f)
-    except (FileNotFoundError, json.JSONDecodeError):
+            raw = f.read()
+    except FileNotFoundError:
         return {}
 
+    if not raw.strip():
+        return {}
+
+    try:
+        return json.loads(raw)
+    except json.JSONDecodeError:
+        pass
+
+    try:
+        return json.loads(_strip_jsonc(raw))
+    except json.JSONDecodeError as exc:
+        raise ConfigParseError(str(exc)) from exc
+
 
 def write_json(path, data):
     """Write JSON to file, creating parent directories."""
@@ -501,8 +611,18 @@ def write_client_config(client, python_path, server_path, api_path, lib_path, dr
         preview = {config_key: {"davinci-resolve": server_entry}}
         return True, f"Would write to {config_path}:\n{json.dumps(preview, indent=2)}"
 
-    # Read existing config and merge
-    existing = read_json(config_path)
+    # Read existing config and merge. If the file exists but cannot be parsed,
+    # refuse to overwrite it -- silently replacing it would wipe the user's
+    # settings (issue #71, especially Zed's commented settings.json).
+    try:
+        existing = read_json(config_path)
+    except ConfigParseError as exc:
+        return False, (
+            f"{config_path} exists but could not be parsed ({exc}). "
+            f"Refusing to overwrite to avoid data loss. Add the "
+            f'"{config_key}" entry manually using the manual config output '
+            f"(run with --manual)."
+        )
 
     if config_key not in existing:
         existing[config_key] = {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "davinci-resolve-mcp",
-  "version": "2.54.1",
+  "version": "2.54.3",
   "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.54.1"
+VERSION = "2.54.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 341-tool granular server instead
 """
 
-VERSION = "2.54.1"
+VERSION = "2.54.3"
 
 import base64
 import os