Retain local scripts again and forward

Author: alan-george-lk

.github/workflows/ci.yml

@@ -81,6 +81,8 @@ jobs:
               - cmake/**
               - CMakeLists.txt
               - CMakePresets.json
+              - scripts/clang-format.sh
+              - scripts/clang-tidy.sh
               - cpp-tools
               - cpp-tools/**
               - .gitmodules
@@ -136,12 +138,13 @@ jobs:
     if: ${{ needs.changes.outputs.cpp_tools == 'true' || github.event_name == 'workflow_dispatch' }}
     # GitHub loads this workflow from the separate cpp-tools repository. Keep
     # this immutable ref aligned with the cpp-tools submodule gitlink.
-    uses: livekit/cpp-tools/.github/workflows/cpp-tools.yml@12c945180b6a2b48149c79be79d9d7d727fc3c12
+    uses: livekit/cpp-tools/.github/workflows/cpp-tools.yml@707762771f079e0932c8c6a123e943a4b2fefe32
     with:
       clang_format: true
       clang_tidy: true
       checkout_submodules: recursive
-      clang_format_paths: src include benchmarks
+      clang_format_runner: scripts/clang-format.sh
+      clang_tidy_runner: scripts/clang-tidy.sh
       clang_tidy_dependencies_command: |
         sudo apt-get update
         sudo apt-get install -y \
@@ -156,11 +159,6 @@ jobs:
         echo "LIBCLANG_PATH=/usr/lib/llvm-${LLVM_VERSION}/lib" >> "$GITHUB_ENV"
       clang_tidy_configure_command: cmake --preset linux-release
       clang_tidy_generate_command: cmake --build build-release --target livekit_proto
-      clang_tidy_build_dir: build-release
-      clang_tidy_file_regex: '^(?!.*/(_deps|build-[^/]*|client-sdk-rust|cpp-example-collection|vcpkg_installed|docker|docs|data)/).*/src/(?!tests/).*\.(c|cpp|cc|cxx)$'
-      clang_tidy_header_filter: '.*/(include/livekit|src)/.*\.(h|hpp)$'
-      clang_tidy_exclude_header_filter: '(.*/src/tests/.*)|(.*/_deps/.*)|(.*/build-[^/]*/.*)'
-      clang_tidy_require_generated_protobuf: build-release/generated
 
   generate-docs:
     name: Generate Docs

cpp-tools

@@ -59,34 +59,34 @@ Install the shared configuration symlinks from the repository root:
    ./build.sh release
    ```
 
-2. Run the shared script with the same file set, regex filters, and
-   `.clang-tidy` config as CI:
+2. Run the project wrapper. It supplies the same build directory and filters
+   as CI, then delegates diagnostics and summaries to `cpp-tools`:
 
    ```bash
-   ./cpp-tools/clang-tidy.sh \
-     --build-dir build-release \
-     --file-regex '^(?!.*/(_deps|build-[^/]*|client-sdk-rust|cpp-example-collection|vcpkg_installed|docker|docs|data)/).*/src/(?!tests/).*\.(c|cpp|cc|cxx)$' \
-     --header-filter '.*/(include/livekit|src)/.*\.(h|hpp)$' \
-     --exclude-header-filter '(.*/src/tests/.*)|(.*/_deps/.*)|(.*/build-[^/]*/.*)' \
-     --require-generated-protobuf build-release/generated
+   ./scripts/clang-tidy.sh
    ```
 
 Pass source files positionally to limit analysis, `-j N` to override the worker
-count, or `--fix` to apply fixes.
+count, `--fail-on-warning` for a strict local run, or `--fix` to apply fixes:
+
+```bash
+./scripts/clang-tidy.sh src/room.cpp
+./scripts/clang-tidy.sh --fail-on-warning
+```
 
 Output is captured to `clang-tidy.log` at the repo root, since the terminal
 buffer often can't hold all of it.
 
 ### Run `clang-format`
 
 ```bash
-./cpp-tools/clang-format.sh --path src --path include --path benchmarks
+./scripts/clang-format.sh
 ```
 
 ```bash
-./cpp-tools/clang-format.sh --path src --path include --path benchmarks --fix
-./cpp-tools/clang-format.sh src/room.cpp include/livekit/room.h
-./cpp-tools/clang-format.sh --fix src/room.cpp
+./scripts/clang-format.sh --fix
+./scripts/clang-format.sh src/room.cpp include/livekit/room.h
+./scripts/clang-format.sh --fix src/room.cpp
 ```
 
 Output is captured to `clang-format.log` at the repo root.

docs/tools.md

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+#
+# Copyright 2026 LiveKit
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -euo pipefail
+
+repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
+shared_script="${repo_root}/cpp-tools/clang-format.sh"
+config="${repo_root}/.clang-format"
+expected_config="cpp-tools/.clang-format"
+
+if [[ ! -x "${shared_script}" ]]; then
+  echo "ERROR: cpp-tools/clang-format.sh is unavailable." >&2
+  echo "Run: git submodule update --init cpp-tools" >&2
+  exit 1
+fi
+
+if [[ ! -L "${config}" ]] || [[ "$(readlink "${config}")" != "${expected_config}" ]]; then
+  echo "ERROR: the project .clang-format link is not installed." >&2
+  echo "Run: ./cpp-tools/install.sh clang-format" >&2
+  exit 1
+fi
+
+export CLANG_FORMAT_FIX_COMMAND="./scripts/clang-format.sh --fix"
+exec "${shared_script}" \
+  --repo-root "${repo_root}" \
+  --path src \
+  --path include \
+  --path benchmarks \
+  "$@"

scripts/clang-format.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+#
+# Copyright 2026 LiveKit
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -euo pipefail
+
+repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
+shared_script="${repo_root}/cpp-tools/clang-tidy.sh"
+config="${repo_root}/.clang-tidy"
+expected_config="cpp-tools/.clang-tidy"
+
+if [[ ! -x "${shared_script}" ]]; then
+  echo "ERROR: cpp-tools/clang-tidy.sh is unavailable." >&2
+  echo "Run: git submodule update --init cpp-tools" >&2
+  exit 1
+fi
+
+if [[ ! -L "${config}" ]] || [[ "$(readlink "${config}")" != "${expected_config}" ]]; then
+  echo "ERROR: the project .clang-tidy link is not installed." >&2
+  echo "Run: ./cpp-tools/install.sh clang-tidy" >&2
+  exit 1
+fi
+
+exec "${shared_script}" \
+  --repo-root "${repo_root}" \
+  --build-dir build-release \
+  --file-regex '^(?!.*/(_deps|build-[^/]*|client-sdk-rust|cpp-example-collection|vcpkg_installed|docker|docs|data)/).*/src/(?!tests/).*\.(c|cpp|cc|cxx)$' \
+  --header-filter '.*/(include/livekit|src)/.*\.(h|hpp)$' \
+  --exclude-header-filter '(.*/src/tests/.*)|(.*/_deps/.*)|(.*/build-[^/]*/.*)' \
+  "$@"