davinci-resolve-mcp 2.54.2 → 2.54.3

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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

package/README.md

@@ -1,6 +1,6 @@
 # DaVinci Resolve MCP Server
 
-[![Version](https://img.shields.io/badge/version-2.54.2-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

@@ -17,7 +17,6 @@ import argparse
 import json
 import os
 import platform
-import re
 import shutil
 import subprocess
 import sys
@@ -36,7 +35,7 @@ from src.utils.update_check import (
 
 # ─── Version ──────────────────────────────────────────────────────────────────
 
-VERSION = "2.54.2"
+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
@@ -511,9 +510,42 @@ def _strip_jsonc(text):
         out.append(ch)
         i += 1
     stripped = "".join(out)
-    # Drop trailing commas before a closing brace/bracket.
-    stripped = re.sub(r",(\s*[}\]])", r"\1", stripped)
-    return stripped
+    # 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):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "davinci-resolve-mcp",
-  "version": "2.54.2",
+  "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.2"
+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.2"
+VERSION = "2.54.3"
 
 import base64
 import os