diff --git a/scripts/clang-tidy.sh b/scripts/clang-tidy.sh
index 2d520419..9ff1d67e 100755
--- a/scripts/clang-tidy.sh
+++ b/scripts/clang-tidy.sh
@@ -20,10 +20,11 @@
 #
 # Usage (from anywhere; the script self-anchors to the repo root):
 #   ./scripts/clang-tidy.sh                    # run on full src/ tree
+#   ./scripts/clang-tidy.sh src/room.cpp       # run on a single file
 #   ./scripts/clang-tidy.sh -j 4               # override parallelism
 #   ./scripts/clang-tidy.sh --github-actions   # force GitHub Actions annotation mode
 #   ./scripts/clang-tidy.sh --fail-on-warning  # exit non-zero on any finding (warning OR error)
-#   ./scripts/clang-tidy.sh -fix               # forwarded to run-clang-tidy
+#   ./scripts/clang-tidy.sh --fix              # apply fixes in place
 #
 # Every run prints a concise stdout summary at the end with the warning and
 # error counts (and a per-check breakdown when there are findings).
@@ -60,7 +61,7 @@ cd "${script_dir}/.."
 # users who hit a pre-flight error or a bad argument get pointed at this.
 usage() {
   cat <<'EOF'
-Usage: ./scripts/clang-tidy.sh [OPTIONS] [run-clang-tidy args...]
+Usage: ./scripts/clang-tidy.sh [OPTIONS] [FILE...] [run-clang-tidy args...]
 
 Run clang-tidy locally or in CI using the same file set and config that the
 repo's CI workflow uses. Picks up checks from the repo-root .clang-tidy.
@@ -68,6 +69,8 @@ repo's CI workflow uses. Picks up checks from the repo-root .clang-tidy.
 Options:
   -h, --help, -?
         Show this help and exit.
+  --fix
+        Apply fixes in place (forwarded to run-clang-tidy as -fix).
   --github-actions, --gh
         Force GitHub Actions annotation + step-summary mode.
         Auto-detected when GITHUB_ACTIONS=true.
@@ -76,17 +79,24 @@ Options:
         non-zero on their own). Off by default for local edit/run cycles;
         CI opts in via the workflow file.
 
+Positional arguments:
+  FILE...
+        Explicit list of files to analyze. When omitted, the script walks
+        the tracked first-party src/ tree (excluding src/tests/). Pass paths
+        to scope the run to a single file or a curated set, e.g.:
+            ./scripts/clang-tidy.sh <path-to-file.cpp>
+
 Any other arguments are forwarded verbatim to run-clang-tidy. Common ones:
   -j N        worker count (defaults to nproc / sysctl hw.ncpu)
-  -fix        apply fixes in place
   -checks=... override the .clang-tidy check list for this run
 
 Examples:
   ./scripts/clang-tidy.sh                    # full src/ tree
+  ./scripts/clang-tidy.sh <path-to-file.cpp> # single file
   ./scripts/clang-tidy.sh -j 4               # override parallelism
   ./scripts/clang-tidy.sh --github-actions   # force CI annotation mode
   ./scripts/clang-tidy.sh --fail-on-warning  # exit non-zero on any finding
-  ./scripts/clang-tidy.sh -fix               # forwarded to run-clang-tidy
+  ./scripts/clang-tidy.sh --fix              # apply fixes in place
 
 Pre-requisites:
   CMake must have generated build-release/compile_commands.json AND the
@@ -127,6 +137,7 @@ fi
 FAIL_ON_WARNING=0
 
 forward_args=()
+explicit_files=()
 while (($#)); do
   case "$1" in
     -h|--help|-\?)
@@ -134,6 +145,13 @@ while (($#)); do
       __tidy_hint_active=0
       exit 0
       ;;
+    --fix)
+      # Unify with clang-format.sh's --fix spelling. run-clang-tidy only
+      # understands the single-dash -fix, so normalize every accepted form
+      # to that when forwarding.
+      forward_args+=("-fix")
+      shift
+      ;;
     --github-actions|--gh)
       CI_MODE=1
       shift
@@ -158,7 +176,16 @@ while (($#)); do
       exit 2
       ;;
     *)
-      forward_args+=("$1")
+      # A positional arg naming an existing file is an explicit target to
+      # analyze; anything else (e.g. the value after -j, a -checks=... flag)
+      # is forwarded verbatim to run-clang-tidy. When explicit files are
+      # given they replace the default src/ FILE_REGEX below so the run is
+      # scoped to exactly those files.
+      if [[ -f "$1" ]]; then
+        explicit_files+=("$1")
+      else
+        forward_args+=("$1")
+      fi
       shift
       ;;
   esac
@@ -347,17 +374,21 @@ write_step_summary() {
   }
 
   {
-    echo "## Analysis results"
-    echo
-    echo "| Severity | Count |"
-    echo "|----------|-------|"
-    # Same GFM shortcodes used in the detailed findings table below, so the
-    # count summary and per-finding severity column read consistently.
-    echo "| :x: Error | ${errors} |"
-    echo "| :warning: Warning | ${warnings} |"
+    echo "## clang-tidy results"
     echo
+    if (( total == 0 )); then
+      # Mirror clang-format.sh's clean-run summary exactly so both CI jobs
+      # surface the same green check line.
+      echo ":white_check_mark: All files passed the configured checks."
+    else
+      echo "| Severity | Count |"
+      echo "|----------|-------|"
+      # Same GFM shortcodes used in the detailed findings table below, so the
+      # count summary and per-finding severity column read consistently.
+      echo "| :x: Error | ${errors} |"
+      echo "| :warning: Warning | ${warnings} |"
+      echo
 
-    if (( total > 0 )); then
       echo "### Top checks"
       echo
       echo '| Check | Count |'
@@ -478,6 +509,16 @@ log="clang-tidy.log"
 # so suppress the "see --help" hint installed via the EXIT trap above.
 __tidy_hint_active=0
 
+# Scope the run to the user's explicit files when any were passed; otherwise
+# fall back to the default src/ tree regex. run-clang-tidy treats each
+# positional argument as a regex matched against compile_commands.json paths,
+# so a plain path like src/room.cpp narrows the run to that translation unit.
+if (( ${#explicit_files[@]} > 0 )); then
+  tidy_targets=("${explicit_files[@]}")
+else
+  tidy_targets=("${FILE_REGEX}")
+fi
+
 set +e
 # run-clang-tidy is a Python script that doesn't flush stdout in its per-file
 # loop; it only flushes once at exit. When its stdout is a pipe (the `| tee`
@@ -496,7 +537,7 @@ PYTHONUNBUFFERED=1 run-clang-tidy \
   -j "${jobs}" \
   ${extra_args[@]+"${extra_args[@]}"} \
   ${forward_args[@]+"${forward_args[@]}"} \
-  "${FILE_REGEX}" \
+  "${tidy_targets[@]}" \
   2>&1 | tee "${log}"
 rc="${PIPESTATUS[0]}"
 set -e