davinci-resolve-mcp 2.220.0 → 2.222.0

package/CHANGELOG.md

@@ -2,6 +2,94 @@
 
 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.222.0 — native Resolve 21.1 timecode and waveform alignment
+
+Contributed by @legionsound (#212), live-validated on Studio 21.1.0.14.
+
+### Added
+
+- **`timeline auto_align_clips`**, with the granular twin
+  `auto_align_timeline_clips`, calling native 21.1 `AutoAlignClips` on explicit
+  timeline item IDs, with the documented `SyncUsing` and `UseTrack` options
+  accepting either constant names or integral native values. Every ID resolves
+  before anything moves, order is preserved, malformed input is refused, and a
+  native `false` stays `false`. Tool count 374 → 375.
+- **The wrapper does not silently expand the selection.** On the measured
+  build, waveform alignment refused a video-only selection, and an audio-only
+  selection aligned the audio while leaving its linked video at the old
+  position. Rather than quietly adding the linked items — which would move
+  clips the caller never named — the tool documentation tells callers to
+  include both sides of a linked pair, and an incomplete selection gets an
+  honest refusal it can act on.
+
+### Validation
+
+- Full suite green: 3,465 passed, 1 skipped. `timeline.auto_align_clips`
+  probed directly: MEDIUM / destructive / recognised, and present in the
+  destructive registry.
+- Live evidence is @legionsound's on Studio 21.1.0.14, and the two modes carry
+  **different strengths of evidence**, kept distinct rather than averaged:
+  timecode alignment is a position result (sources one second apart, starts
+  0/48 moving to 0/24), while waveform/MIX was verified against rendered
+  output — identical speech starts 0/24 moving to 0/0, with complete decoded
+  video **and PCM audio** matching independently positioned manual reference
+  timelines exactly, for both wrappers. Not reproduced here; this machine is
+  Studio 19.1.3.7, below the 21.1 floor.
+- **Not claimed**: other microphones, drift, variable frame rates, other track
+  selections and long recordings. Smart Switch remains separate and unstarted.
+
+### Changed
+
+- Adapted on merge, as with #213 and #214: counts resolved to **375**,
+  confirmed by the agent-rule generator, generated files regenerated rather
+  than hand-merged. No behaviour changed in the adaptation.
+
+## What's New in v2.221.0 — native Resolve 21.1 audio level normalization
+
+Contributed by @legionsound (#214), live-validated on Studio 21.1.0.14.
+
+### Added
+
+- **`timeline normalize_audio_level`**, with the granular twin
+  `normalize_timeline_audio_level`, calling native 21.1 `NormalizeAudioLevel`
+  on explicit audio timeline item IDs. All four `NormalizeAudioOptions` fields
+  are supported — `normalizationMode`, `targetLevel` in dBFS, `targetLoudness`
+  in LKFS and `setLevelMode` — with either documented constant names or
+  integral native values. Every ID resolves before anything is written;
+  duplicate or missing IDs and malformed options are refused with nothing
+  changed. A native `false` stays `false`, and native defaults stay native
+  defaults rather than being pre-filled by the wrapper.
+- Registered in **both** write tables with a 21.1 callable-method floor,
+  destructive granular annotations and compound dry-run refusal tests. Tool
+  count 373 → 374.
+- **Source audio files are untouched** — this writes clip levels on the
+  timeline, not the media on disk.
+
+### Validation
+
+- Full suite green: 3,461 passed, 1 skipped. `timeline.normalize_audio_level`
+  probed directly: MEDIUM / destructive / recognised in the classifier, and
+  present in the destructive registry.
+- Live evidence is @legionsound's on Studio 21.1.0.14, and it is measured from
+  the **exported audio** rather than from a readback — independent FFmpeg
+  analysis of WAVs the wrappers actually produced: relative peak normalization
+  to −6 dBFS preserved the source 12 dB difference (−6.0 / −18.0 dBFS),
+  independent peak normalization measured −6.0 / −6.0 dBFS, and an EBU R128
+  target of −23 LKFS measured −22.9 LUFS, within 0.1 LU. Complete decoded PCM
+  was identical between both interfaces in every case. Not reproduced here;
+  this machine is Studio 19.1.3.7, below the 21.1 floor.
+- **Not claimed**: other normalization modes, difficult true-peak limiting,
+  multichannel routing, long programs and other source formats.
+
+### Changed
+
+- Adapted on merge, the same way #213 was. The branch was rebased onto
+  v2.219.0, so its 370 → 371 count bump and every generated agent-rule file
+  collided with the 373 that output blanking had landed. Counts resolved to
+  **374**, confirmed independently by the agent-rule generator, and the
+  generated files regenerated rather than hand-merged. No behaviour changed in
+  the adaptation.
+
 ## What's New in v2.220.0 — native Resolve 21.1 output blanking, timeline and clip
 
 Contributed by @legionsound (#213), live-validated on Studio 21.1.0.14.

package/README.md

@@ -2,10 +2,10 @@
 
 English | [简体中文](README.zh-CN.md)
 
-[![Version](https://img.shields.io/badge/version-2.220.0-blue.svg)](https://github.com/samuelgursky/davinci-resolve-mcp/releases)
+[![Version](https://img.shields.io/badge/version-2.222.0-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-36%20(373%20full)-blue.svg)](#server-modes)
+[![Tools](https://img.shields.io/badge/MCP%20Tools-36%20(375%20full)-blue.svg)](#server-modes)
 [![Advanced](https://img.shields.io/badge/Advanced%20(offline)-18%20tools-blueviolet.svg)](#server-modes)
 [![Tested](https://img.shields.io/badge/Live%20Tested-93.6%25-green.svg)](docs/reference/api-coverage.md#test-results)
 [![DaVinci Resolve](https://img.shields.io/badge/DaVinci%20Resolve-18.5+-darkred.svg)](https://www.blackmagicdesign.com/products/davinciresolve)
@@ -133,7 +133,7 @@ The command starts a loopback-only server and opens the control panel in your br
 | Mode | Entry point | Tools | Best for |
 |------|-------------|-------|----------|
 | Compound | `src/server.py` | 36 | Default mode for most assistants. Related Resolve operations are grouped behind action parameters to keep context usage low. |
-| Full / granular | `src/server.py --full` or `src/resolve_mcp_server.py` | 373 | Power users who want one MCP tool per Resolve API method. |
+| Full / granular | `src/server.py --full` or `src/resolve_mcp_server.py` | 375 | Power users who want one MCP tool per Resolve API method. |
 
 The compound server is recommended unless you specifically need the granular one-tool-per-method surface.
 
@@ -365,7 +365,7 @@ The default server is a local stdio process launched by your MCP client; it does
 
 | Metric | Value |
 |--------|-------|
-| MCP Tools | **36** compound / **373** granular (live server) |
+| MCP Tools | **36** compound / **375** granular (live server) |
 | Advanced (offline) tools | **18** — .drp/.drt/.drx + DB authoring, no Resolve running |
 | Kernel Actions | **136** guarded workflow actions across 9 compound tools |
 | API Methods Covered | **361/361** (100%) |

package/README.zh-CN.md

@@ -2,17 +2,17 @@
 
 [English](README.md) | 简体中文
 
-[![Version](https://img.shields.io/badge/version-2.220.0-blue.svg)](https://github.com/samuelgursky/davinci-resolve-mcp/releases)
+[![Version](https://img.shields.io/badge/version-2.222.0-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-36%20(373%20full)-blue.svg)](#服务器模式)
+[![Tools](https://img.shields.io/badge/MCP%20Tools-36%20(375%20full)-blue.svg)](#服务器模式)
 [![Advanced](https://img.shields.io/badge/Advanced%20(offline)-18%20tools-blueviolet.svg)](#服务器模式)
 [![Tested](https://img.shields.io/badge/Live%20Tested-93.6%25-green.svg)](docs/reference/api-coverage.md#test-results)
 [![DaVinci Resolve](https://img.shields.io/badge/DaVinci%20Resolve-18.5+-darkred.svg)](https://www.blackmagicdesign.com/products/davinciresolve)
 [![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)
 
-> 本翻译对应 v2.220.0 版 README。如与英文原版有出入，以 [英文原版](README.md) 为准。
+> 本翻译对应 v2.222.0 版 README。如与英文原版有出入，以 [英文原版](README.md) 为准。
 
 一个 Model Context Protocol (MCP) 服务器，让 AI 助手通过官方脚本 API 控制 DaVinci Resolve Studio（达芬奇）。它提供完整的 API 覆盖，外加带护栏的工作流助手，涵盖剪辑、媒体池整理、渲染设置、审阅标记、调色、Fusion、Fairlight、项目生命周期任务、扩展开发，以及不碰源媒体的媒体分析。
 
@@ -88,7 +88,7 @@ venv/bin/python -m src.control_panel
 | 模式 | 入口 | 工具数 | 适合谁 |
 |------|------|--------|--------|
 | Compound（复合） | `src/server.py` | 36 | 大多数助手的默认模式。相关的 Resolve 操作按 action 参数分组，压低上下文占用。 |
-| Full / granular（细粒度） | `src/server.py --full` 或 `src/resolve_mcp_server.py` | 373 | 想要"一个 Resolve API 方法 = 一个 MCP 工具"的重度用户。 |
+| Full / granular（细粒度） | `src/server.py --full` 或 `src/resolve_mcp_server.py` | 375 | 想要"一个 Resolve API 方法 = 一个 MCP 工具"的重度用户。 |
 
 除非你明确需要一方法一工具的细粒度界面，否则推荐复合模式。
 
@@ -226,7 +226,7 @@ DRX 调色写入**针对 Resolve Studio 做过实机校准**：调色参数默
 
 | 指标 | 数值 |
 |------|------|
-| MCP 工具 | **36** 复合 / **373** 细粒度（实时服务器） |
+| MCP 工具 | **36** 复合 / **375** 细粒度（实时服务器） |
 | Advanced（离线）工具 | **18**——.drp/.drt/.drx + 数据库创作，无需 Resolve 运行 |
 | 内核 action | 9 个复合工具下 **136** 个带护栏的工作流 action |
 | API 方法覆盖 | **361/361**（100%） |

package/docs/SKILL.md

@@ -345,7 +345,7 @@ to the user as verified.
 | Mode | Entry point | Tool count | Use when |
 |---|---|---|---|
 | Compound (default) | `src/server.py` | 36 tools | Most workflows — keeps context lean |
-| Granular (full) | `src/server.py --full` | 373 tools | Power users needing one tool per API method |
+| Granular (full) | `src/server.py --full` | 375 tools | Power users needing one tool per API method |
 
 Resolve 21.1 adds [twelve read-only discovery controls](reference/resolve211-read-controls.md)
 for edition, presets, audio formats/codecs, normalization modes, speed, fades
@@ -2486,3 +2486,7 @@ Native 21.1 transition creation: see [transition controls](reference/resolve211-
 
 Native multicam creation and flattening: [21.1 controls](reference/resolve211-multicam.md), with contributor render evidence and remaining family coverage.
 Native timeline/clip output blanking: [21.1 controls](reference/resolve211-blanking.md), with explicit inheritance and pixel-bound evidence.
+
+Native audio normalization: [21.1 controls](reference/resolve211-normalization.md), with independently measured exported-audio evidence.
+
+Native timecode/waveform alignment: [21.1 controls](reference/resolve211-alignment.md), including linked-item selection semantics and rendered video/audio evidence.

package/docs/contributing.md

@@ -64,7 +64,7 @@ davinci-resolve-mcp/
 ├── install.py                    # Universal installer (macOS/Windows/Linux)
 ├── src/
 │   ├── server.py                # Compound MCP server — 36 tools (default)
-│   ├── resolve_mcp_server.py    # Thin full-server entrypoint — 373 tools
+│   ├── resolve_mcp_server.py    # Thin full-server entrypoint — 375 tools
 │   ├── granular/                # Modular full-server implementation
 │   └── utils/                   # Platform detection, Resolve connection helpers
 ├── tests/                       # offline suite (test_*.py) + live harnesses (live_*.py):

package/docs/install.md

@@ -144,7 +144,7 @@ The MCP server comes in two modes:
 | Mode | File | Tools | Best For |
 |------|------|-------|----------|
 | **Compound** (default) | `src/server.py` | 36 | Most users — fast, clean, low context usage |
-| **Full** | `src/resolve_mcp_server.py` | 373 | Power users who want one tool per API method |
+| **Full** | `src/resolve_mcp_server.py` | 375 | Power users who want one tool per API method |
 
 The compound server's `timeline_item` tool includes dedicated actions for common workflows:
 
@@ -159,7 +159,7 @@ The compound server's `timeline_item` tool includes dedicated actions for common
 
 The installer uses the compound server by default. To use the full server:
 ```bash
-python src/server.py --full    # Launch full 373-tool server
+python src/server.py --full    # Launch full 375-tool server
 # Or point your MCP config directly at src/resolve_mcp_server.py
 ```
 

package/docs/reference/api-coverage.md

@@ -25,7 +25,7 @@ Every non-deprecated method in the bundled legacy README is represented. This
 does not claim complete coverage of the newer Resolve 21.1 typed API. The
 default compound server exposes **36 tools** that group related operations by
 action parameter, keeping LLM context windows lean. The full granular server
-provides **373 individual tools** for power users. The legacy coverage spans
+provides **375 individual tools** for power users. The legacy coverage spans
 13 API object classes. MCP-level kernel actions are tracked separately in
 [Kernel Action Coverage](../kernels/README.md).
 
@@ -636,3 +636,7 @@ Native 21.1 transition creation: see [transition controls](resolve211-native-tra
 
 Native multicam creation and flattening: [21.1 controls](resolve211-multicam.md), with contributor render evidence and remaining family coverage.
 Native timeline/clip output blanking: [21.1 controls](resolve211-blanking.md), with explicit inheritance and pixel-bound evidence.
+
+Native audio normalization: [21.1 controls](resolve211-normalization.md), with independently measured exported-audio evidence.
+
+Native timecode/waveform alignment: [21.1 controls](resolve211-alignment.md), including linked-item selection semantics and rendered video/audio evidence.

package/docs/reference/resolve211-alignment.md

@@ -0,0 +1,54 @@
+# Native Resolve 21.1 timeline alignment
+
+Compound `timeline auto_align_clips` and granular `auto_align_timeline_clips`
+accept `item_ids` (timeline item unique IDs, not media-pool IDs) and optional
+`options`. All IDs must resolve in the current timeline's video/audio tracks;
+missing or duplicate IDs are refused before writes. The requested order and
+selection are preserved. This command does not implicitly add linked items.
+
+**Include both video and linked audio IDs when synchronizing camera clips.**
+Contributor observation on 21.1.0.14: waveform alignment of the video items alone
+returned false; audio-only selection moved the audio while linked video stayed
+put. Explicitly selecting all video/audio items aligned the complete fixture.
+Do not assume that selecting one half of a linked pair moves the other half.
+
+Options follow AutoAlignOptions: SyncUsing accepts
+AUTO_ALIGN_CLIPS_USING_TIMECODE or AUTO_ALIGN_CLIPS_USING_WAVEFORM; UseTrack
+accepts a native track number or AUTO_ALIGN_CLIPS_WAVEFORM_TRACK_MIX /
+AUTO_ALIGN_CLIPS_WAVEFORM_TRACK_AUTOMATIC. Constant names resolve against the
+live Resolve object; integral numeric native values are also accepted. Omitted
+options stay omitted, using native defaults. Unknown keys, invalid named
+constants and malformed types are rejected. Native false stays success:false.
+
+The callable method and 21.1 floor are checked. The compound action is registered
+as a destructive MEDIUM-risk write in both classifier tables. Explicit dry-run
+requests are refused before mutation. Granular annotations mark a destructive,
+non-idempotent write.
+
+## Contributor validation and limits
+
+Contributor-validated on macOS Studio 21.1.0.14, using synthetic speech and color
+cards in a disposable 640x360/24 fps project. The two sources contain the same
+speech but source timecodes differ by one second.
+
+- Timecode fixture: deliberately placed at frames0/48, both wrappers moved the
+  selected video/audio to frames0/24, matching source timecodes.
+- Waveform fixture with MIX: deliberately placed at frames0/24, both wrappers
+  moved all selected video/audio to frame0, matching identical speech content.
+- For each mode, both wrappers' complete decoded ProRes video and PCM audio
+  matched an independently positioned manual reference exactly. This is full
+  rendered video/audio comparison, not just position readback.
+
+Other audio track selections, dissimilar microphones, drift, variable frame rates,
+long-form recordings and partly overlapping selections are not established by
+this fixture. A failed chirp/video-only probe is not proof of a native bug.
+Smart Switch is a separate operation and remains follow-up work.
+
+`tests/live_resolve211_alignment.py OUTPUT_DIR` requires the disposable project
+Codex Alignment Validation 20260909, with speech-red.mov and speech-blue.mov in
+its root bin. Both are 24 fps color-card movies using the same synthetic spoken
+recording; red timecode00:00:00:00 and blue timecode00:00:01:00. It creates manual,
+compound and granular timelines for each mode, renders six movies and saves the
+scratch project. Never substitute production media. Compare each mode's full
+decoded video and audio against its manual reference. The helper tests also pin
+ID ordering, malformed/missing input refusal, native failure and write gates.

package/docs/reference/resolve211-multicam.md

@@ -48,11 +48,11 @@ Use the synthetic FFmpeg fixture commands in resolve211-native-transitions.md;
 never run the fixture against production media. Compare complete decoded frames
 from compound-before/compound-flattened/granular-before/granular-flattened.mov.
 
-Smart Switch and AutoAlignClips remain separate work. Native timecode alignment
-has positive position-readback evidence, but rendered/waveform acceptance remains
-open. Silent color-card Smart Switch returned false and is not a meaningful
-positive speaking-camera test. This contribution does not claim the entire
-multicam family completed.
+Smart Switch remains separate work. Native timecode and waveform alignment now
+have dedicated wrappers and rendered video/audio comparisons documented in
+[alignment controls](resolve211-alignment.md). Silent color-card Smart Switch
+returned false and is not a meaningful positive speaking-camera test. This
+does not claim the entire multicam family completed.
 
 Do not infer angle order from clip_ids order. The wrapper forwards the requested
 source order, but this measurement establishes the selected angle and its

package/docs/reference/resolve211-normalization.md

@@ -0,0 +1,58 @@
+# Native Resolve 21.1 audio normalization
+
+Compound `timeline normalize_audio_level` and granular
+`normalize_timeline_audio_level` take explicit audio timeline `item_ids` and
+optional `options`. IDs are resolved on the current timeline's audio tracks,
+with no implicit linked-item expansion. Missing/duplicate IDs and malformed
+options are refused before the native write. Native false stays success:false.
+
+All NormalizeAudioOptions fields are supported:
+
+- normalizationMode: native name from get_normalize_audio_modes.
+- targetLevel: finite dBFS number, for example -6.
+- targetLoudness: finite LKFS number, for example -23.
+- setLevelMode: NORMALIZE_AUDIO_SET_LEVEL_RELATIVE or
+  NORMALIZE_AUDIO_SET_LEVEL_INDEPENDENT, or an integral native constant value.
+
+Names resolve against the live Resolve object. Unknown option keys, invalid
+named constants, booleans in numeric fields and non-finite values are rejected.
+Omitted options stay omitted; Resolve supplies its native defaults. Mode names
+are passed through rather than hard-coded into a stale list. Use the existing
+mode reader for the current build. The wrapper does not invent range clamps or
+turn a refused native normalization into success.
+
+The action has a 21.1 callable-method floor, entries in both destructive/risk
+tables (MEDIUM), destructive granular annotations, and explicit compound dry-run
+refusal. Normalization changes project clip gain, not source audio files.
+
+## Contributor audio evidence
+
+Contributor-validated on macOS Studio 21.1.0.14 in a disposable project using
+997 Hz synthetic stereo tones, with one source 12 dB quieter than the other.
+Both actual community interfaces produced byte-identical decoded PCM per case.
+Independent FFmpeg measurements of exported 24-bit/48 kHz WAVs:
+
+| Requested case | Measured output |
+|---|---|
+| Sample Peak Program, relative, target -6 dBFS | Two clip segments peak -6.0/-18.0 dBFS; 12 dB difference preserved |
+| Sample Peak Program, independent, target -6 dBFS | Both segments peak -6.0 dBFS |
+| EBU R128, target -23 LKFS, peak setting-1 dBFS | Integrated -22.9 LUFS, within 0.1 LU of requested target |
+
+These are exported-audio measurements, not just gain readback. They do not prove
+all normalization modes, true-peak limiting on difficult signals, long-program
+loudness, multichannel bus behavior, or different source formats.
+
+`tests/live_resolve211_normalization.py OUTPUT_DIR` requires disposable project
+Codex Normalization Validation 20260909 at 24 fps, with tone.wav and quiet.wav.
+The script creates timelines/renders and saves that project. Generate fixtures
+without production media:
+
+```sh
+ffmpeg -f lavfi -i 'sine=frequency=997:sample_rate=48000:duration=4' \
+  -af 'pan=stereo|c0=c0|c1=c0' -c:a pcm_s24le tone.wav
+ffmpeg -i tone.wav -af volume=-12dB -c:a pcm_s24le quiet.wav
+```
+
+Measure each four-second segment with volumedetect and the loudness case with
+ebur128. Compare full decoded PCM between interfaces. Pure tones are deliberate
+meter fixtures; this does not substitute for representative-program QA.

package/install.py

@@ -37,7 +37,7 @@ from src.utils.update_check import (
 
 # ─── Version ──────────────────────────────────────────────────────────────────
 
-VERSION = "2.220.0"
+VERSION = "2.222.0"
 # 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
@@ -1543,7 +1543,7 @@ def verify_resolve_connection(python_path, api_path, lib_path):
 
 def print_banner():
     title = f"DaVinci Resolve MCP Server — Installer v{VERSION}"
-    subtitle = "36 compound · 373 full · 3 platforms"
+    subtitle = "36 compound · 375 full · 3 platforms"
     print()
     print(bold("  ╔══════════════════════════════════════════════════════╗"))
     print(bold(f"  ║{title:^54}║"))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "davinci-resolve-mcp",
-  "version": "2.220.0",
+  "version": "2.222.0",
   "description": "NPM bootstrapper for the DaVinci Resolve MCP Server.",
   "license": "MIT",
   "author": "Samuel Gursky <samgursky@gmail.com>",

package/src/granular/common.py

@@ -87,7 +87,7 @@ if not logging.getLogger().handlers:
         handlers=[logging.StreamHandler()],
     )
 
-VERSION = "2.220.0"
+VERSION = "2.222.0"
 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/granular/resolve_211.py

@@ -1,4 +1,6 @@
 """Native Resolve 21.1 discovery and editing controls."""
+from src.utils.resolve211_alignment import auto_align
+from src.utils.resolve211_normalization import normalize_audio
 from src.utils.resolve211_blanking import validate_blanking
 from src.utils.resolve211_multicam import create_multicam, resolve_constant, GRADES
 from src.utils.resolve211_edits import validate_edit_options, validate_transition_options, transition_result
@@ -278,3 +280,27 @@ def set_timeline_item_use_timeline_for_output_blanking(use_timeline: bool, track
     if missing:
         return missing
     return {"success": bool(item.SetUseTimelineForOutputBlanking(use_timeline))}
+
+
+@mcp.tool(annotations=DESTRUCTIVE_TOOL)
+def normalize_timeline_audio_level(item_ids: list[str], options: dict | None = None) -> dict:
+    """Native 21.1 normalization of explicit audio timeline item IDs. Options normalizationMode, targetLevel (dBFS), targetLoudness (LKFS), setLevelMode; use get_normalize_audio_modes for names."""
+    _, timeline, error = _get_timeline()
+    if error:
+        return error
+    missing = _requires_method(timeline, "NormalizeAudioLevel", "21.1")
+    if missing:
+        return missing
+    return normalize_audio(get_resolve(), timeline, item_ids, {} if options is None else options)
+
+
+@mcp.tool(annotations=DESTRUCTIVE_TOOL)
+def auto_align_timeline_clips(item_ids: list[str], options: dict | None = None) -> dict:
+    """Native 21.1 alignment of current video/audio items by unique ID. Include linked audio AND video IDs to move both; selection is not expanded. Options SyncUsing and UseTrack accept documented constant names or integral native values."""
+    _, timeline, error = _get_timeline()
+    if error:
+        return error
+    missing = _requires_method(timeline, "AutoAlignClips", "21.1")
+    if missing:
+        return missing
+    return auto_align(get_resolve(), timeline, item_ids, {} if options is None else options)

package/src/resolve_mcp_server.py

@@ -34,7 +34,7 @@ from src.utils.update_check import start_background_update_check
 if __name__ == "__main__":
     try:
         start_background_update_check(VERSION, project_dir, logger)
-        logger.info(f"Starting DaVinci Resolve MCP Server v{VERSION} (373 granular tools)")
+        logger.info(f"Starting DaVinci Resolve MCP Server v{VERSION} (375 granular tools)")
         run_fastmcp_stdio(mcp)
     except KeyboardInterrupt:
         logger.info("Server shutdown requested")

package/src/server.py

@@ -8,10 +8,10 @@ Each tool groups related operations via an 'action' parameter.
 
 Usage:
     python src/server.py              # Start the MCP server
-    python src/server.py --full       # Start the 373-tool granular server instead
+    python src/server.py --full       # Start the 375-tool granular server instead
 """
 
-VERSION = "2.220.0"
+VERSION = "2.222.0"
 
 import base64
 import os
@@ -44,6 +44,8 @@ for p in [current_dir, project_dir]:
 
 from src.utils.resolve211_multicam import create_multicam, resolve_constant, GRADES
 from src.utils.resolve211_blanking import validate_blanking
+from src.utils.resolve211_alignment import auto_align
+from src.utils.resolve211_normalization import normalize_audio
 from src.utils.resolve211_edits import validate_edit_options, validate_transition_options, transition_result
 
 # Platform-specific Resolve paths
@@ -25053,7 +25055,7 @@ def edit_engine(action: str, params: Optional[Dict[str, Any]] = None) -> Dict[st
 
 
 _TIMELINE_ACTIONS = [
-    "set_output_blanking", "get_normalize_audio_modes", "get_output_blanking",
+    "set_output_blanking", "normalize_audio_level", "auto_align_clips", "get_normalize_audio_modes", "get_output_blanking",
     # Offline authoring — served without a Resolve connection, above the _check() gate.
     "author_offline", "offline_fallback_capabilities",
     "list", "get_current", "set_current", "get_name", "set_name", "get_start_frame",
@@ -25103,6 +25105,8 @@ def timeline(action: str, params: Optional[Dict[str, Any]] = None) -> Dict[str,
 
     Actions:
       set_output_blanking(options) -> {success} — native 21.1 pixel coordinates.
+      normalize_audio_level(item_ids, options?) -> {success} — native 21.1 normalization; audio timeline item IDs.
+      auto_align_clips(item_ids, options?) -> {success} — native 21.1 timecode/waveform alignment; include both video/audio IDs to move linked pairs.
       get_normalize_audio_modes() -> {modes} — documented on Resolve 21.1+.
       get_output_blanking() -> {blanking} — documented on Resolve 21.1+. Pixel coordinates; empty on a clip inheriting timeline blanking.
       list() -> {timelines}
@@ -25421,6 +25425,18 @@ def timeline(action: str, params: Optional[Dict[str, Any]] = None) -> Dict[str,
     if not tl:
         return _err("No current timeline")
 
+    if action == "auto_align_clips":
+        missing = _requires_method(tl, "AutoAlignClips", "21.1")
+        if missing:
+            return missing
+        return auto_align(get_resolve(), tl, p.get("item_ids"), {} if p.get("options") is None else p["options"])
+
+    if action == "normalize_audio_level":
+        missing = _requires_method(tl, "NormalizeAudioLevel", "21.1")
+        if missing:
+            return missing
+        return normalize_audio(get_resolve(), tl, p.get("item_ids"), {} if p.get("options") is None else p["options"])
+
     if action == "set_output_blanking":
         error = validate_blanking(p.get("options"))
         if error:
@@ -32721,9 +32737,9 @@ if __name__ == "__main__":
     start_background_update_check(VERSION, project_dir, logger, env=_setup_update_env())
     _install_threaded_tool_dispatch(mcp)
 
-    # Support --full flag to run the 373-tool granular server instead
+    # Support --full flag to run the 375-tool granular server instead
     if "--full" in sys.argv:
-        logger.info("Starting full 373-tool granular server...")
+        logger.info("Starting full 375-tool granular server...")
         sys.argv = [arg for arg in sys.argv if arg != "--full"]
         from src.granular import mcp as granular_mcp
 

package/src/utils/destructive_hook.py

@@ -88,6 +88,8 @@ DESTRUCTIVE_ACTIONS_BY_TOOL: Dict[str, FrozenSet[str]] = {
     }),
     "timeline": frozenset({
         "set_output_blanking",
+        "normalize_audio_level",
+        "auto_align_clips",
         "delete_clips",
         "move_clips",
         "duplicate_clips",

package/src/utils/execution_lifecycle.py

@@ -275,10 +275,13 @@ class RiskClassificationHook(LifecycleHook):
         # RippleTimeline true, moves every clip after it; `set_fades` rewrites
         # how the clip's edges render. Existing content altered, not deleted.
         ("media_pool", "create_multicam_clip"),
+        ("timeline", "auto_align_clips"),
         ("timeline_item", "flatten_multicam"),
         ("timeline", "set_output_blanking"),
         ("timeline_item", "set_output_blanking"),
         ("timeline_item", "set_use_timeline_for_output_blanking"),
+
+        ("timeline", "normalize_audio_level"),
         ("timeline_item", "add_transition"),
         ("timeline_item", "set_speed"),
         ("timeline_item", "set_fades"),

package/src/utils/resolve211_alignment.py

@@ -0,0 +1,32 @@
+"""Native alignment with strict ID resolution before any timeline mutation."""
+from src.utils.resolve211_multicam import resolve_constant
+
+OPTIONS = {
+    'SyncUsing': ('AUTO_ALIGN_CLIPS_USING_TIMECODE','AUTO_ALIGN_CLIPS_USING_WAVEFORM'),
+    'UseTrack': ('AUTO_ALIGN_CLIPS_WAVEFORM_TRACK_MIX','AUTO_ALIGN_CLIPS_WAVEFORM_TRACK_AUTOMATIC'),
+}
+
+
+def auto_align(r, timeline, item_ids, options):
+    if not isinstance(item_ids,list) or not item_ids or any(not isinstance(i,str) or not i for i in item_ids):
+        return {'error':'item_ids must be a non-empty list of timeline item unique IDs'}
+    if len(set(item_ids))!=len(item_ids):
+        return {'error':'item_ids must not contain duplicates'}
+    if not isinstance(options,dict) or set(options)-set(OPTIONS):
+        return {'error':'options must contain only SyncUsing and/or UseTrack'}
+    normalized={}
+    for key,value in options.items():
+        normalized[key],error=resolve_constant(r,value,OPTIONS[key])
+        if error:
+            return {'error':key+': '+error}
+    wanted=set(item_ids)
+    found={}
+    for track_type in ('video','audio'):
+        for index in range(1,timeline.GetTrackCount(track_type)+1):
+            for item in timeline.GetItemListInTrack(track_type,index) or []:
+                uid=item.GetUniqueId()
+                if uid in wanted:
+                    found[uid]=item
+    if any(uid not in found for uid in item_ids):
+        return {'error':'One or more item_ids were not found in current video/audio tracks; no alignment performed'}
+    return {'success':bool(timeline.AutoAlignClips([found[uid] for uid in item_ids],normalized))}

package/src/utils/resolve211_normalization.py

@@ -0,0 +1,42 @@
+"""Native normalization: validate explicit audio-item selection before writes."""
+import math
+
+
+def finite_number(value):
+    try:
+        return type(value) in (int,float) and math.isfinite(value)
+    except OverflowError:
+        return False
+
+
+def normalize_audio(r, timeline, item_ids, options):
+    if not isinstance(item_ids,list) or not item_ids or any(not isinstance(i,str) or not i for i in item_ids):
+        return {'error':'item_ids must be a non-empty list of audio timeline item unique IDs'}
+    if len(set(item_ids))!=len(item_ids):
+        return {'error':'item_ids must not contain duplicates'}
+    if not isinstance(options,dict) or set(options)-{'normalizationMode','targetLevel','targetLoudness','setLevelMode'}:
+        return {'error':'Unknown normalization options or non-dictionary options'}
+    normalized=dict(options)
+    for key,value in options.items():
+        if key=='normalizationMode':
+            if not isinstance(value,str) or not value.strip():
+                return {'error':'normalizationMode must be a non-empty native mode name'}
+        elif key=='setLevelMode':
+            if isinstance(value,str):
+                if value not in ('NORMALIZE_AUDIO_SET_LEVEL_RELATIVE','NORMALIZE_AUDIO_SET_LEVEL_INDEPENDENT'):
+                    return {'error':'Unknown setLevelMode constant'}
+                value=getattr(r,value,None)
+            if not finite_number(value) or int(value)!=value:
+                return {'error':'setLevelMode must be a documented constant name or integral native value'}
+            normalized[key]=value
+        elif not finite_number(value):
+            return {'error':key+' must be a finite number'}
+    wanted=set(item_ids);found={}
+    for index in range(1,timeline.GetTrackCount('audio')+1):
+        for item in timeline.GetItemListInTrack('audio',index) or []:
+            uid=item.GetUniqueId()
+            if uid in wanted:
+                found[uid]=item
+    if any(uid not in found for uid in item_ids):
+        return {'error':'One or more IDs were not found on audio tracks; no normalization performed'}
+    return {'success':bool(timeline.NormalizeAudioLevel([found[uid] for uid in item_ids],normalized))}

package/src/utils/resolve_versions.py

@@ -225,11 +225,14 @@ _EVIDENCE_GATES: List[Dict[str, Any]] = [
 # disagree, which is what keeps the two from drifting apart again.
 
 CODE_FLOORS: Dict[str, str] = {
+    "Timeline.AutoAlignClips": "21.1",
     "MediaPool.CreateMulticamClip": "21.1",
     "TimelineItem.FlattenMulticam": "21.1",
     "Timeline.SetOutputBlanking": "21.1",
     "TimelineItem.SetOutputBlanking": "21.1",
     "TimelineItem.SetUseTimelineForOutputBlanking": "21.1",
+
+    "Timeline.NormalizeAudioLevel": "21.1",
     "TimelineItem.AddTransition": "21.1",
     "TimelineItem.SetSpeed": "21.1",
     "TimelineItem.SetFades": "21.1",