got a salsa cycle

getting the first new loop test working
Claude getting started, no inference yet
2026-01-13 23:39:41 -08:00 · 2026-01-13 16:54:01 -08:00 · 2026-01-13 15:48:04 -08:00 · 2026-01-13 11:27:12 -08:00 · 2026-01-13 17:29:08 +00:00 · 2026-01-13 16:15:51 +00:00
1661 changed files with 50876 additions and 17950 deletions
--- a/.devcontainer/post-create.sh
+++ b/.devcontainer/post-create.sh
@@ -5,4 +5,4 @@ rustup component add clippy rustfmt
 cargo install cargo-insta
 cargo fetch

-pip install maturin pre-commit
+pip install maturin prek
--- a/.gitattributes
+++ b/.gitattributes
@@ -22,6 +22,7 @@ crates/ruff_linter/resources/test/fixtures/pyupgrade/UP018_CR.py text eol=cr
 crates/ruff_linter/resources/test/fixtures/pyupgrade/UP018_LF.py text eol=lf

 crates/ruff_python_parser/resources/inline linguist-generated=true
+crates/ty_python_semantic/resources/mdtest/external/*.lock linguist-generated=true

 ruff.schema.json -diff linguist-generated=true text=auto eol=lf
 ty.schema.json -diff linguist-generated=true text=auto eol=lf
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -20,9 +20,11 @@
 # ty
 /crates/ty* @carljm @MichaReiser @AlexWaygood @sharkdp @dcreager
 /crates/ruff_db/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty_project/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty_server/ @carljm @MichaReiser @sharkdp @dcreager
+/crates/ty_project/ @carljm @MichaReiser @sharkdp @dcreager @Gankra
+/crates/ty_ide/ @carljm @MichaReiser @AlexWaygood @sharkdp @dcreager @Gankra
+/crates/ty_server/ @carljm @MichaReiser @sharkdp @dcreager @Gankra
 /crates/ty/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty_wasm/ @carljm @MichaReiser @sharkdp @dcreager
+/crates/ty_wasm/ @carljm @MichaReiser @sharkdp @dcreager @Gankra
 /scripts/ty_benchmark/ @carljm @MichaReiser @AlexWaygood @sharkdp @dcreager
-/crates/ty_python_semantic @carljm @AlexWaygood @sharkdp @dcreager
+/crates/ty_python_semantic/ @carljm @AlexWaygood @sharkdp @dcreager
+/crates/ty_module_resolver/ @carljm @MichaReiser @AlexWaygood @Gankra
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -1,13 +1,20 @@
-# Configuration for the actionlint tool, which we run via pre-commit
+# Configuration for the actionlint tool, which we run via prek
 # to verify the correctness of the syntax in our GitHub Actions workflows.

 self-hosted-runner:
  # Various runners we use that aren't recognized out-of-the-box by actionlint:
  labels:
+    - depot-ubuntu-24.04-4
    - depot-ubuntu-latest-8
    - depot-ubuntu-22.04-16
    - depot-ubuntu-22.04-32
    - depot-windows-2022-16
+    - depot-ubuntu-22.04-arm-4
    - github-windows-2025-x86_64-8
    - github-windows-2025-x86_64-16
    - codspeed-macro
+
+paths:
+  ".github/workflows/mypy_primer.yaml":
+    ignore:
+      - 'constant expression "false" in condition. remove the if: section'
--- a/.github/mypy-primer-ty.toml
+++ b/.github/mypy-primer-ty.toml
@@ -4,5 +4,6 @@
 # Enable off-by-default rules.
 [rules]
 possibly-unresolved-reference = "warn"
-unused-ignore-comment = "warn"
+possibly-missing-import = "warn"
 division-by-zero = "warn"
+unsupported-dynamic-base = "warn"
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -76,9 +76,9 @@
      enabled: false,
    },
    {
-      groupName: "pre-commit dependencies",
+      groupName: "prek dependencies",
      matchManagers: ["pre-commit"],
-      description: "Weekly update of pre-commit dependencies",
+      description: "Weekly update of prek dependencies",
    },
    {
      groupName: "NPM Development dependencies",
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -39,7 +39,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          submodules: recursive
          persist-credentials: false
@@ -51,6 +51,7 @@ jobs:
      - name: "Build sdist"
        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
        with:
+          maturin-version: v1.9.6
          command: sdist
          args: --out dist
      - name: "Test sdist"
@@ -59,7 +60,7 @@ jobs:
          "${MODULE_NAME}" --help
          python -m "${MODULE_NAME}" --help
      - name: "Upload sdist"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: wheels-sdist
          path: dist
@@ -68,7 +69,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
    runs-on: macos-14
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          submodules: recursive
          persist-credentials: false
@@ -81,10 +82,11 @@ jobs:
      - name: "Build wheels - x86_64"
        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
        with:
+          maturin-version: v1.9.6
          target: x86_64
          args: --release --locked --out dist
      - name: "Upload wheels"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: wheels-macos-x86_64
          path: dist
@@ -99,7 +101,7 @@ jobs:
          tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
      - name: "Upload binary"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: artifacts-macos-x86_64
          path: |
@@ -110,7 +112,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
    runs-on: macos-14
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          submodules: recursive
          persist-credentials: false
@@ -123,6 +125,7 @@ jobs:
      - name: "Build wheels - aarch64"
        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
        with:
+          maturin-version: v1.9.6
          target: aarch64
          args: --release --locked --out dist
      - name: "Test wheel - aarch64"
@@ -131,7 +134,7 @@ jobs:
          ruff --help
          python -m ruff --help
      - name: "Upload wheels"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: wheels-aarch64-apple-darwin
          path: dist
@@ -146,7 +149,7 @@ jobs:
          tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
      - name: "Upload binary"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: artifacts-aarch64-apple-darwin
          path: |
@@ -166,7 +169,7 @@ jobs:
          - target: aarch64-pc-windows-msvc
            arch: x64
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          submodules: recursive
          persist-credentials: false
@@ -179,6 +182,7 @@ jobs:
      - name: "Build wheels"
        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
        with:
+          maturin-version: v1.9.6
          target: ${{ matrix.platform.target }}
          args: --release --locked --out dist
        env:
@@ -192,7 +196,7 @@ jobs:
          "${MODULE_NAME}" --help
          python -m "${MODULE_NAME}" --help
      - name: "Upload wheels"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: wheels-${{ matrix.platform.target }}
          path: dist
@@ -203,7 +207,7 @@ jobs:
          7z a $ARCHIVE_FILE ./target/${{ matrix.platform.target }}/release/ruff.exe
          sha256sum $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
      - name: "Upload binary"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: artifacts-${{ matrix.platform.target }}
          path: |
@@ -219,7 +223,7 @@ jobs:
          - x86_64-unknown-linux-gnu
          - i686-unknown-linux-gnu
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          submodules: recursive
          persist-credentials: false
@@ -232,6 +236,7 @@ jobs:
      - name: "Build wheels"
        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
        with:
+          maturin-version: v1.9.6
          target: ${{ matrix.target }}
          manylinux: auto
          args: --release --locked --out dist
@@ -242,7 +247,7 @@ jobs:
          "${MODULE_NAME}" --help
          python -m "${MODULE_NAME}" --help
      - name: "Upload wheels"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: wheels-${{ matrix.target }}
          path: dist
@@ -260,7 +265,7 @@ jobs:
          tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
      - name: "Upload binary"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: artifacts-${{ matrix.target }}
          path: |
@@ -296,7 +301,7 @@ jobs:
            arch: riscv64

    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          submodules: recursive
          persist-credentials: false
@@ -308,6 +313,7 @@ jobs:
      - name: "Build wheels"
        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
        with:
+          maturin-version: v1.9.6
          target: ${{ matrix.platform.target }}
          manylinux: auto
          docker-options: ${{ matrix.platform.maturin_docker_options }}
@@ -327,7 +333,7 @@ jobs:
            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
            ruff --help
      - name: "Upload wheels"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: wheels-${{ matrix.platform.target }}
          path: dist
@@ -345,7 +351,7 @@ jobs:
          tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
      - name: "Upload binary"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: artifacts-${{ matrix.platform.target }}
          path: |
@@ -361,7 +367,7 @@ jobs:
          - x86_64-unknown-linux-musl
          - i686-unknown-linux-musl
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          submodules: recursive
          persist-credentials: false
@@ -374,6 +380,7 @@ jobs:
      - name: "Build wheels"
        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
        with:
+          maturin-version: v1.9.6
          target: ${{ matrix.target }}
          manylinux: musllinux_1_2
          args: --release --locked --out dist
@@ -389,7 +396,7 @@ jobs:
            .venv/bin/pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
            .venv/bin/${{ env.MODULE_NAME }} --help
      - name: "Upload wheels"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: wheels-${{ matrix.target }}
          path: dist
@@ -407,7 +414,7 @@ jobs:
          tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
      - name: "Upload binary"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: artifacts-${{ matrix.target }}
          path: |
@@ -427,7 +434,7 @@ jobs:
            arch: armv7

    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          submodules: recursive
          persist-credentials: false
@@ -439,6 +446,7 @@ jobs:
      - name: "Build wheels"
        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
        with:
+          maturin-version: v1.9.6
          target: ${{ matrix.platform.target }}
          manylinux: musllinux_1_2
          args: --release --locked --out dist
@@ -456,7 +464,7 @@ jobs:
            .venv/bin/pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
            .venv/bin/${{ env.MODULE_NAME }} --help
      - name: "Upload wheels"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: wheels-${{ matrix.platform.target }}
          path: dist
@@ -474,7 +482,7 @@ jobs:
          tar czvf $ARCHIVE_FILE $ARCHIVE_NAME
          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
      - name: "Upload binary"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: artifacts-${{ matrix.platform.target }}
          path: |
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -20,6 +20,12 @@ on:
 env:
  RUFF_BASE_IMG: ghcr.io/${{ github.repository_owner }}/ruff

+permissions:
+  contents: read
+  # TODO(zanieb): Ideally, this would be `read` on dry-run but that will require
+  # significant changes to the workflow.
+  packages: write # zizmor: ignore[excessive-permissions]
+
 jobs:
  docker-build:
    name: Build Docker image (ghcr.io/astral-sh/ruff) for ${{ matrix.platform }}
@@ -33,12 +39,12 @@ jobs:
          - linux/amd64
          - linux/arm64
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          submodules: recursive
          persist-credentials: false

-      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+      - uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0

      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
        with:
@@ -63,7 +69,7 @@ jobs:

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
        with:
          images: ${{ env.RUFF_BASE_IMG }}
          # Defining this makes sure the org.opencontainers.image.version OCI label becomes the actual release version and not the branch name
@@ -96,7 +102,7 @@ jobs:
          touch "/tmp/digests/${digest#sha256:}"

      - name: Upload digests
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: digests-${{ env.PLATFORM_TUPLE }}
          path: /tmp/digests/*
@@ -113,17 +119,17 @@ jobs:
    if: ${{ inputs.plan != '' && !fromJson(inputs.plan).announcement_tag_is_implicit }}
    steps:
      - name: Download digests
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
        with:
          path: /tmp/digests
          pattern: digests-*
          merge-multiple: true

-      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+      - uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
        with:
          images: ${{ env.RUFF_BASE_IMG }}
          # Order is on purpose such that the label org.opencontainers.image.version has the first pattern with the full version
@@ -167,7 +173,7 @@ jobs:
          - debian:bookworm-slim,bookworm-slim,debian-slim
          - buildpack-deps:bookworm,bookworm,debian
    steps:
-      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+      - uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0

      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
        with:
@@ -219,7 +225,7 @@ jobs:

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
        # ghcr.io prefers index level annotations
        env:
          DOCKER_METADATA_ANNOTATIONS_LEVELS: index
@@ -256,17 +262,17 @@ jobs:
    if: ${{ inputs.plan != '' && !fromJson(inputs.plan).announcement_tag_is_implicit }}
    steps:
      - name: Download digests
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
        with:
          path: /tmp/digests
          pattern: digests-*
          merge-multiple: true

-      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+      - uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
        env:
          DOCKER_METADATA_ANNOTATIONS_LEVELS: index
        with:
--- a/.github/workflows/build-wasm.yml
+++ b/.github/workflows/build-wasm.yml
@@ -0,0 +1,58 @@
+# Build ruff_wasm for npm.
+#
+# Assumed to run as a subworkflow of .github/workflows/release.yml; specifically, as a local
+# artifacts job within `cargo-dist`.
+name: "Build wasm"
+
+on:
+  workflow_call:
+    inputs:
+      plan:
+        required: true
+        type: string
+  pull_request:
+    paths:
+      - .github/workflows/build-wasm.yml
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions: {}
+
+env:
+  CARGO_INCREMENTAL: 0
+  CARGO_NET_RETRY: 10
+  CARGO_TERM_COLOR: always
+  RUSTUP_MAX_RETRIES: 10
+
+jobs:
+  build:
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-build') }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: [web, bundler, nodejs]
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        with:
+          persist-credentials: false
+      - name: "Install Rust toolchain"
+        run: rustup target add wasm32-unknown-unknown
+      - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa # v0.4.0
+        with:
+          version: v0.13.1
+      - uses: jetli/wasm-bindgen-action@20b33e20595891ab1a0ed73145d8a21fc96e7c29 # v0.2.0
+      - name: "Run wasm-pack build"
+        run: wasm-pack build --target ${{ matrix.target }} crates/ruff_wasm
+      - name: "Rename generated package"
+        run: | # Replace the package name w/ jq
+          jq '.name="@astral-sh/ruff-wasm-${{ matrix.target }}"' crates/ruff_wasm/pkg/package.json > /tmp/package.json
+          mv /tmp/package.json crates/ruff_wasm/pkg
+      - run: cp LICENSE crates/ruff_wasm/pkg # wasm-pack does not put the LICENSE file in the pkg
+      - name: "Upload wasm artifact"
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        with:
+          name: artifacts-wasm-${{ matrix.target }}
+          path: crates/ruff_wasm/pkg
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -49,8 +49,10 @@ jobs:
      py-fuzzer: ${{ steps.check_py_fuzzer.outputs.changed }}
      # Flag that is set to "true" when code related to the playground changes.
      playground: ${{ steps.check_playground.outputs.changed }}
+      # Flag that is set to "true" when code related to the benchmarks changes.
+      benchmarks: ${{ steps.check_benchmarks.outputs.changed }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          fetch-depth: 0
          persist-credentials: false
@@ -95,6 +97,7 @@ jobs:
            ':!crates/ruff_python_formatter/**' \
            ':!crates/ruff_formatter/**' \
            ':!crates/ruff_dev/**' \
+            ':!crates/ruff_benchmark/**' \
            ':scripts/*' \
            ':python/**' \
            ':.github/workflows/ci.yaml' \
@@ -202,6 +205,21 @@ jobs:
            ':crates/ruff_python_trivia/**' \
            ':crates/ruff_source_file/**' \
            ':crates/ruff_text_size/**' \
+            ':.github/workflows/ci.yaml' \
+          ; then
+              echo "changed=false" >> "$GITHUB_OUTPUT"
+          else
+              echo "changed=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Check if the benchmark code changed
+        id: check_benchmarks
+        env:
+          MERGE_BASE: ${{ steps.merge_base.outputs.sha }}
+        run: |
+          if git diff --quiet "${MERGE_BASE}...HEAD" -- \
+            ':Cargo.toml' \
+            ':Cargo.lock' \
            ':crates/ruff_benchmark/**' \
            ':.github/workflows/ci.yaml' \
          ; then
@@ -215,7 +233,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
      - name: "Install Rust toolchain"
@@ -229,7 +247,7 @@ jobs:
    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
@@ -251,7 +269,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
@@ -263,15 +281,15 @@ jobs:
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        uses: taiki-e/install-action@0e76c5c569f13f7eb21e8e5b26fe710062b57b62 # v2.65.13
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        uses: taiki-e/install-action@0e76c5c569f13f7eb21e8e5b26fe710062b57b62 # v2.65.13
        with:
          tool: cargo-insta
      - name: "Install uv"
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
        with:
          enable-cache: "true"
      - name: ty mdtests (GitHub annotations)
@@ -314,7 +332,7 @@ jobs:
      (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main')
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
@@ -325,11 +343,11 @@ jobs:
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        uses: taiki-e/install-action@0e76c5c569f13f7eb21e8e5b26fe710062b57b62 # v2.65.13
        with:
          tool: cargo-nextest
      - name: "Install uv"
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
        with:
          enable-cache: "true"
      - name: "Run tests"
@@ -349,7 +367,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
@@ -358,11 +376,11 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        uses: taiki-e/install-action@0e76c5c569f13f7eb21e8e5b26fe710062b57b62 # v2.65.13
        with:
          tool: cargo-nextest
      - name: "Install uv"
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
        with:
          enable-cache: "true"
      - name: "Run tests"
@@ -377,7 +395,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
@@ -385,9 +403,9 @@ jobs:
          save-if: ${{ github.ref == 'refs/heads/main' }}
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
        with:
-          node-version: 22
+          node-version: 24
          cache: "npm"
          cache-dependency-path: playground/package-lock.json
      - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa # v0.4.0
@@ -409,7 +427,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
      - uses: SebRollen/toml-action@b1b3628f55fc3a28208d4203ada8b737e9687876 # v1.2.0
@@ -438,7 +456,7 @@ jobs:
    if: ${{ github.ref == 'refs/heads/main' || needs.determine_changes.outputs.fuzz == 'true' || needs.determine_changes.outputs.code == 'true' }}
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
@@ -450,7 +468,7 @@ jobs:
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
      - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@3fc81674af4165a753833a94cae9f91d8849049f # v1.16.2
+        uses: cargo-bins/cargo-binstall@80aaafe04903087c333980fa2686259ddd34b2d9 # v1.16.6
      - name: "Install cargo-fuzz"
        # Download the latest version from quick install and not the github releases because github releases only has MUSL targets.
        run: cargo binstall cargo-fuzz --force  --disable-strategies crate-meta-data --no-confirm
@@ -465,10 +483,10 @@ jobs:
    env:
      FORCE_COLOR: 1
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          shared-key: ruff-linux-debug
@@ -497,13 +515,13 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 5
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
      - name: "Install Rust toolchain"
        run: rustup component add rustfmt
      # Run all code generation scripts, and verify that the current output is
@@ -530,15 +548,20 @@ jobs:
    needs: determine_changes
    # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
    # Ecosystem check needs linter and/or formatter changes.
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && needs.determine_changes.outputs.code == 'true' }}
+    if: |
+      !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' &&
+      (
+        needs.determine_changes.outputs.linter == 'true' ||
+        needs.determine_changes.outputs.formatter == 'true'
+      )
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          ref: ${{ github.event.pull_request.base.ref }}
          persist-credentials: false

-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          activate-environment: true
@@ -559,7 +582,7 @@ jobs:
          cargo build --bin ruff
          mv target/debug/ruff target/debug/ruff-baseline

-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
          clean: false
@@ -625,7 +648,7 @@ jobs:

      # NOTE: astral-sh-bot uses this artifact to post comments on PRs.
      # Make sure to update the bot if you rename the artifact.
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        name: Upload Results
        with:
          name: ecosystem-result
@@ -640,11 +663,11 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && (needs.determine_changes.outputs.ty == 'true' || needs.determine_changes.outputs.py-fuzzer == 'true') }}
    timeout-minutes: ${{ github.repository == 'astral-sh/ruff' && 10 || 20 }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          fetch-depth: 0
          persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
@@ -687,10 +710,10 @@ jobs:
    needs: determine_changes
    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
-      - uses: cargo-bins/cargo-binstall@3fc81674af4165a753833a94cae9f91d8849049f # v1.16.2
+      - uses: cargo-bins/cargo-binstall@80aaafe04903087c333980fa2686259ddd34b2d9 # v1.16.6
      - run: cargo binstall --no-confirm cargo-shear
      - run: cargo shear

@@ -700,10 +723,10 @@ jobs:
    needs: determine_changes
    if: ${{ needs.determine_changes.outputs.ty == 'true' || github.ref == 'refs/heads/main' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
@@ -722,7 +745,7 @@ jobs:
    timeout-minutes: 20
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
@@ -746,32 +769,29 @@ jobs:
      - name: "Remove wheels from cache"
        run: rm -rf target/wheels

-  pre-commit:
-    name: "pre-commit"
+  prek:
+    name: "prek"
    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-16' || 'ubuntu-latest' }}
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
+      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+          node-version: 24
+      - name: "Cache prek"
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
-          node-version: 22
-      - name: "Cache pre-commit"
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
-        with:
-          path: ~/.cache/pre-commit
-          key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: "Run pre-commit"
+          path: ~/.cache/prek
+          key: prek-${{ hashFiles('.pre-commit-config.yaml') }}
+      - name: "Run prek"
        run: |
          echo '```console' > "$GITHUB_STEP_SUMMARY"
-          # Enable color output for pre-commit and remove it for the summary
-          # Use --hook-stage=manual to enable slower pre-commit hooks that are skipped by default
-          SKIP=cargo-fmt,clippy,dev-generate-all uvx --python="${PYTHON_VERSION}" pre-commit run --all-files --show-diff-on-failure --color=always --hook-stage=manual | \
+          # Enable color output for prek and remove it for the summary
+          # Use --hook-stage=manual to enable slower hooks that are skipped by default
+          SKIP=rustfmt uvx prek run --all-files --show-diff-on-failure --color always --hook-stage manual | \
            tee >(sed -E 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})*)?[mGK]//g' >> "$GITHUB_STEP_SUMMARY") >&1
          exit_code="${PIPESTATUS[0]}"
          echo '```' >> "$GITHUB_STEP_SUMMARY"
@@ -782,7 +802,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
@@ -791,7 +811,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: Install uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
        with:
          python-version: 3.13
          activate-environment: true
@@ -813,7 +833,7 @@ jobs:
    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.formatter == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
@@ -839,7 +859,7 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        name: "Checkout ruff source"
        with:
          persist-credentials: false
@@ -855,7 +875,7 @@ jobs:
      - name: Build Ruff binary
        run: cargo build -p ruff --bin ruff

-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        name: "Checkout ruff-lsp source"
        with:
          persist-credentials: false
@@ -890,7 +910,7 @@ jobs:
      - determine_changes
    if: ${{ (needs.determine_changes.outputs.playground == 'true') }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
      - name: "Install Rust toolchain"
@@ -898,9 +918,9 @@ jobs:
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
        with:
-          node-version: 22
+          node-version: 24
          cache: "npm"
          cache-dependency-path: playground/package-lock.json
      - uses: jetli/wasm-bindgen-action@20b33e20595891ab1a0ed73145d8a21fc96e7c29 # v0.2.0
@@ -926,7 +946,9 @@ jobs:
      (
        github.ref == 'refs/heads/main' ||
        needs.determine_changes.outputs.formatter == 'true' ||
-        needs.determine_changes.outputs.linter == 'true'
+        needs.determine_changes.outputs.linter == 'true' ||
+        needs.determine_changes.outputs.parser == 'true' ||
+        needs.determine_changes.outputs.benchmarks == 'true'
      )
    timeout-minutes: 20
    permissions:
@@ -934,112 +956,198 @@ jobs:
      id-token: write # required for OIDC authentication with CodSpeed
    steps:
      - name: "Checkout Branch"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false

      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0

      - name: "Install Rust toolchain"
        run: rustup show

      - name: "Install codspeed"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        uses: taiki-e/install-action@0e76c5c569f13f7eb21e8e5b26fe710062b57b62 # v2.65.13
        with:
          tool: cargo-codspeed

      - name: "Build benchmarks"
-        run: cargo codspeed build --features "codspeed,instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench formatter --bench lexer --bench linter --bench parser
+        run: cargo codspeed build --features "codspeed,ruff_instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench formatter --bench lexer --bench linter --bench parser

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
+        uses: CodSpeedHQ/action@dbda7111f8ac363564b0c51b992d4ce76bb89f2f # v4.5.2
        with:
          mode: simulation
          run: cargo codspeed run

-  benchmarks-instrumented-ty:
-    name: "benchmarks instrumented (ty)"
-    runs-on: ubuntu-24.04
+  benchmarks-instrumented-ty-build:
+    name: "benchmarks instrumented ty (build)"
+    runs-on: depot-ubuntu-24.04-4
    needs: determine_changes
    if: |
      github.repository == 'astral-sh/ruff' &&
      (
        github.ref == 'refs/heads/main' ||
-        needs.determine_changes.outputs.ty == 'true'
+        needs.determine_changes.outputs.ty == 'true' ||
+        needs.determine_changes.outputs.benchmarks == 'true'
      )
    timeout-minutes: 20
-    permissions:
-      contents: read # required for actions/checkout
-      id-token: write # required for OIDC authentication with CodSpeed
    steps:
      - name: "Checkout Branch"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false

      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4

      - name: "Install Rust toolchain"
        run: rustup show

      - name: "Install codspeed"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        uses: taiki-e/install-action@0e76c5c569f13f7eb21e8e5b26fe710062b57b62 # v2.65.13
        with:
          tool: cargo-codspeed

      - name: "Build benchmarks"
-        run: cargo codspeed build --features "codspeed,instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench ty
+        run: cargo codspeed build -m instrumentation --features "codspeed,ty_instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench ty
+
+      - name: "Upload benchmark binary"
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        with:
+          name: benchmarks-instrumented-ty-binary
+          path: target/codspeed/simulation/ruff_benchmark
+          retention-days: 1
+
+  benchmarks-instrumented-ty-run:
+    name: "benchmarks instrumented ty (${{ matrix.benchmark }})"
+    runs-on: ubuntu-24.04
+    needs: benchmarks-instrumented-ty-build
+    timeout-minutes: 20
+    permissions:
+      contents: read # required for actions/checkout
+      id-token: write # required for OIDC authentication with CodSpeed
+    strategy:
+      fail-fast: false
+      matrix:
+        benchmark:
+          - "check_file|micro|anyio"
+          - "attrs|hydra|datetype"
+    steps:
+      - name: "Checkout Branch"
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        with:
+          persist-credentials: false
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
+
+      - name: "Install codspeed"
+        uses: taiki-e/install-action@0e76c5c569f13f7eb21e8e5b26fe710062b57b62 # v2.65.13
+        with:
+          tool: cargo-codspeed
+
+      - name: "Download benchmark binary"
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        with:
+          name: benchmarks-instrumented-ty-binary
+          path: target/codspeed/simulation/ruff_benchmark
+
+      - name: "Restore binary permissions"
+        run: chmod +x target/codspeed/simulation/ruff_benchmark/ty

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
+        uses: CodSpeedHQ/action@dbda7111f8ac363564b0c51b992d4ce76bb89f2f # v4.5.2
        with:
          mode: simulation
-          run: cargo codspeed run
+          run: cargo codspeed run --bench ty "${{ matrix.benchmark }}"

-  benchmarks-walltime:
-    name: "benchmarks walltime (${{ matrix.benchmarks }})"
-    runs-on: codspeed-macro
+  benchmarks-walltime-build:
+    name: "benchmarks walltime (build)"
+    # We only run this job if `github.repository == 'astral-sh/ruff'`,
+    # so hardcoding depot here is fine
+    runs-on: depot-ubuntu-22.04-arm-4
    needs: determine_changes
-    if: ${{ github.repository == 'astral-sh/ruff' && !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.ty == 'true' || github.ref == 'refs/heads/main') }}
+    if: |
+      github.repository == 'astral-sh/ruff' &&
+      (
+        !contains(github.event.pull_request.labels.*.name, 'no-test') &&
+        (
+          needs.determine_changes.outputs.ty == 'true' ||
+          needs.determine_changes.outputs.benchmarks == 'true' ||
+          github.ref == 'refs/heads/main'
+        )
+      )
+    timeout-minutes: 20
+    steps:
+      - name: "Checkout Branch"
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        with:
+          persist-credentials: false
+
+      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
+
+      - name: "Install Rust toolchain"
+        run: rustup show
+
+      - name: "Install codspeed"
+        uses: taiki-e/install-action@0e76c5c569f13f7eb21e8e5b26fe710062b57b62 # v2.65.13
+        with:
+          tool: cargo-codspeed
+
+      - name: "Build benchmarks"
+        run: cargo codspeed build -m walltime --features "codspeed,ty_walltime" --profile profiling --no-default-features -p ruff_benchmark
+
+      - name: "Upload benchmark binary"
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        with:
+          name: benchmarks-walltime-binary
+          path: target/codspeed/walltime/ruff_benchmark
+          retention-days: 1
+
+  benchmarks-walltime-run:
+    name: "benchmarks walltime (${{ matrix.benchmark }})"
+    runs-on: codspeed-macro
+    needs: benchmarks-walltime-build
    timeout-minutes: 20
    permissions:
      contents: read # required for actions/checkout
      id-token: write # required for OIDC authentication with CodSpeed
    strategy:
      matrix:
-        benchmarks:
-          - "medium|multithreaded"
-          - "small|large"
+        benchmark:
+          - colour_science
+          - "pandas|tanjun|altair"
+          - "static_frame|sympy"
+          - "pydantic|multithreaded|freqtrade"
    steps:
      - name: "Checkout Branch"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false

-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
-        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
-
-      - name: "Install Rust toolchain"
-        run: rustup show
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0

      - name: "Install codspeed"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
+        uses: taiki-e/install-action@0e76c5c569f13f7eb21e8e5b26fe710062b57b62 # v2.65.13
        with:
          tool: cargo-codspeed

-      - name: "Build benchmarks"
-        run: cargo codspeed build --features "codspeed,walltime" --profile profiling --no-default-features -p ruff_benchmark
+      - name: "Download benchmark binary"
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        with:
+          name: benchmarks-walltime-binary
+          path: target/codspeed/walltime/ruff_benchmark
+
+      - name: "Restore binary permissions"
+        run: chmod +x target/codspeed/walltime/ruff_benchmark/ty_walltime

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
+        uses: CodSpeedHQ/action@dbda7111f8ac363564b0c51b992d4ce76bb89f2f # v4.5.2
        env:
          # enabling walltime flamegraphs adds ~6 minutes to the CI time, and they don't
          # appear to provide much useful insight for our walltime benchmarks right now
@@ -1047,4 +1155,4 @@ jobs:
          CODSPEED_PERF_ENABLED: false
        with:
          mode: walltime
-          run: cargo codspeed run --bench ty_walltime "${{ matrix.benchmarks }}"
+          run: cargo codspeed run --bench ty_walltime -m walltime "${{ matrix.benchmark }}"
--- a/.github/workflows/daily_fuzz.yaml
+++ b/.github/workflows/daily_fuzz.yaml
@@ -31,10 +31,10 @@ jobs:
    # Don't run the cron job on forks:
    if: ${{ github.repository == 'astral-sh/ruff' || github.event_name != 'schedule' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
@@ -62,7 +62,7 @@ jobs:
    name: Create an issue if the daily fuzz surfaced any bugs
    runs-on: ubuntu-latest
    needs: fuzz
-    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && needs.fuzz.result == 'failure' }}
+    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && needs.fuzz.result != 'success' }}
    permissions:
      issues: write
    steps:
--- a/.github/workflows/mypy_primer.yaml
+++ b/.github/workflows/mypy_primer.yaml
@@ -6,6 +6,11 @@ on:
  pull_request:
    paths:
      - "crates/ty*/**"
+      - "!crates/ty_ide/**"
+      - "!crates/ty_server/**"
+      - "!crates/ty_test/**"
+      - "!crates/ty_completion_eval/**"
+      - "!crates/ty_wasm/**"
      - "crates/ruff_db"
      - "crates/ruff_python_ast"
      - "crates/ruff_python_parser"
@@ -36,14 +41,14 @@ jobs:
    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          path: ruff
          fetch-depth: 0
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0

      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
@@ -65,7 +70,7 @@ jobs:
      # NOTE: astral-sh-bot uses this artifact to post comments on PRs.
      # Make sure to update the bot if you rename the artifact.
      - name: Upload diff
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: mypy_primer_diff
          path: mypy_primer.diff
@@ -75,14 +80,14 @@ jobs:
    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          path: ruff
          fetch-depth: 0
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0

      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
@@ -103,7 +108,7 @@ jobs:
          scripts/mypy_primer.sh

      - name: Upload diff
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: mypy_primer_memory_diff
          path: mypy_primer_memory.diff
@@ -117,14 +122,14 @@ jobs:
    # TODO: Enable once we fixed the non-deterministic diagnostics
    if: false
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          path: ruff
          fetch-depth: 0
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0

      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -17,11 +17,14 @@ on:
        required: true
        type: string

+permissions:
+  contents: read
+
 jobs:
  mkdocs:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          ref: ${{ inputs.ref }}
          persist-credentials: true
--- a/.github/workflows/publish-playground.yml
+++ b/.github/workflows/publish-playground.yml
@@ -26,14 +26,14 @@ jobs:
    env:
      CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
        with:
-          node-version: 22
+          node-version: 24
          package-manager-cache: false
      - uses: jetli/wasm-bindgen-action@20b33e20595891ab1a0ed73145d8a21fc96e7c29 # v0.2.0
      - name: "Install Node dependencies"
--- a/.github/workflows/publish-pypi.yml
+++ b/.github/workflows/publish-pypi.yml
@@ -22,8 +22,8 @@ jobs:
      id-token: write
    steps:
      - name: "Install uv"
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
-      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
+      - uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
        with:
          pattern: wheels-*
          path: wheels
--- a/.github/workflows/publish-ty-playground.yml
+++ b/.github/workflows/publish-ty-playground.yml
@@ -30,14 +30,14 @@ jobs:
    env:
      CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
        with:
-          node-version: 22
+          node-version: 24
          package-manager-cache: false
      - uses: jetli/wasm-bindgen-action@20b33e20595891ab1a0ed73145d8a21fc96e7c29 # v0.2.0
      - name: "Install Node dependencies"
--- a/.github/workflows/publish-wasm.yml
+++ b/.github/workflows/publish-wasm.yml
@@ -1,25 +1,18 @@
-# Build and publish ruff-api for wasm.
+# Publish ruff_wasm to npm.
 #
 # Assumed to run as a subworkflow of .github/workflows/release.yml; specifically, as a publish
 # job within `cargo-dist`.
-name: "Build and publish wasm"
+name: "Publish wasm"

 on:
-  workflow_dispatch:
  workflow_call:
    inputs:
      plan:
        required: true
        type: string

-env:
-  CARGO_INCREMENTAL: 0
-  CARGO_NET_RETRY: 10
-  CARGO_TERM_COLOR: always
-  RUSTUP_MAX_RETRIES: 10
-
 jobs:
-  ruff_wasm:
+  publish:
    runs-on: ubuntu-latest
    permissions:
      contents: read
@@ -29,31 +22,19 @@ jobs:
        target: [web, bundler, nodejs]
      fail-fast: false
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
        with:
-          persist-credentials: false
-      - name: "Install Rust toolchain"
-        run: rustup target add wasm32-unknown-unknown
-      - uses: jetli/wasm-pack-action@0d096b08b4e5a7de8c28de67e11e945404e9eefa # v0.4.0
+          name: artifacts-wasm-${{ matrix.target }}
+          path: pkg
+      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
        with:
-          version: v0.13.1
-      - uses: jetli/wasm-bindgen-action@20b33e20595891ab1a0ed73145d8a21fc96e7c29 # v0.2.0
-      - name: "Run wasm-pack build"
-        run: wasm-pack build --target ${{ matrix.target }} crates/ruff_wasm
-      - name: "Rename generated package"
-        run: | # Replace the package name w/ jq
-          jq '.name="@astral-sh/ruff-wasm-${{ matrix.target }}"' crates/ruff_wasm/pkg/package.json > /tmp/package.json
-          mv /tmp/package.json crates/ruff_wasm/pkg
-      - run: cp LICENSE crates/ruff_wasm/pkg # wasm-pack does not put the LICENSE file in the pkg
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
-        with:
-          node-version: 22
+          node-version: 24
          registry-url: "https://registry.npmjs.org"
      - name: "Publish (dry-run)"
        if: ${{ inputs.plan == '' || fromJson(inputs.plan).announcement_tag_is_implicit }}
-        run: npm publish --dry-run crates/ruff_wasm/pkg
+        run: npm publish --dry-run pkg
      - name: "Publish"
        if: ${{ inputs.plan != '' && !fromJson(inputs.plan).announcement_tag_is_implicit }}
-        run: npm publish --provenance --access public crates/ruff_wasm/pkg
+        run: npm publish --provenance --access public pkg
        env:
          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -60,7 +60,7 @@ jobs:
    env:
      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
        with:
          persist-credentials: false
          submodules: recursive
@@ -70,7 +70,7 @@ jobs:
        shell: bash
        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.2/cargo-dist-installer.sh | sh"
      - name: Cache dist
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
        with:
          name: cargo-dist-cache
          path: ~/.cargo/bin/dist
@@ -86,7 +86,7 @@ jobs:
          cat plan-dist-manifest.json
          echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT"
      - name: "Upload dist-manifest.json"
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
        with:
          name: artifacts-plan-dist-manifest
          path: plan-dist-manifest.json
@@ -112,30 +112,40 @@ jobs:
      "contents": "read"
      "packages": "write"

+  custom-build-wasm:
+    needs:
+      - plan
+    if: ${{ needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload' || inputs.tag == 'dry-run' }}
+    uses: ./.github/workflows/build-wasm.yml
+    with:
+      plan: ${{ needs.plan.outputs.val }}
+    secrets: inherit
+
  # Build and package all the platform-agnostic(ish) things
  build-global-artifacts:
    needs:
      - plan
      - custom-build-binaries
      - custom-build-docker
+      - custom-build-wasm
    runs-on: "depot-ubuntu-latest-4"
    env:
      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
        with:
          persist-credentials: false
          submodules: recursive
      - name: Install cached dist
-        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
        with:
          name: cargo-dist-cache
          path: ~/.cargo/bin/
      - run: chmod +x ~/.cargo/bin/dist
      # Get all the local artifacts for the global tasks to use (for e.g. checksums)
      - name: Fetch local artifacts
-        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
        with:
          pattern: artifacts-*
          path: target/distrib/
@@ -153,7 +163,7 @@ jobs:

          cp dist-manifest.json "$BUILD_MANIFEST_NAME"
      - name: "Upload artifacts"
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
        with:
          name: artifacts-build-global
          path: |
@@ -165,28 +175,29 @@ jobs:
      - plan
      - custom-build-binaries
      - custom-build-docker
+      - custom-build-wasm
      - build-global-artifacts
    # Only run if we're "publishing", and only if plan, local and global didn't fail (skipped is fine)
-    if: ${{ always() && needs.plan.result == 'success' && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-binaries.result == 'skipped' || needs.custom-build-binaries.result == 'success') && (needs.custom-build-docker.result == 'skipped' || needs.custom-build-docker.result == 'success') }}
+    if: ${{ always() && needs.plan.result == 'success' && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-binaries.result == 'skipped' || needs.custom-build-binaries.result == 'success') && (needs.custom-build-docker.result == 'skipped' || needs.custom-build-docker.result == 'success') && (needs.custom-build-wasm.result == 'skipped' || needs.custom-build-wasm.result == 'success') }}
    env:
      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    runs-on: "depot-ubuntu-latest-4"
    outputs:
      val: ${{ steps.host.outputs.manifest }}
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
        with:
          persist-credentials: false
          submodules: recursive
      - name: Install cached dist
-        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
        with:
          name: cargo-dist-cache
          path: ~/.cargo/bin/
      - run: chmod +x ~/.cargo/bin/dist
      # Fetch artifacts from scratch-storage
      - name: Fetch artifacts
-        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
        with:
          pattern: artifacts-*
          path: target/distrib/
@@ -200,7 +211,7 @@ jobs:
          cat dist-manifest.json
          echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
      - name: "Upload dist-manifest.json"
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
        with:
          # Overwrite the previous copy
          name: artifacts-dist-manifest
@@ -250,13 +261,13 @@ jobs:
    env:
      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
        with:
          persist-credentials: false
          submodules: recursive
      # Create a GitHub Release while uploading all files to it
      - name: "Download GitHub Artifacts"
-        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
        with:
          pattern: artifacts-*
          path: artifacts
--- a/.github/workflows/sync_typeshed.yaml
+++ b/.github/workflows/sync_typeshed.yaml
@@ -16,8 +16,7 @@ name: Sync typeshed
 # 3. Once the Windows worker is done, a MacOS worker:
 #    a. Checks out the branch created by the Linux worker
 #    b. Syncs all docstrings available on MacOS that are not available on Linux or Windows
-#    c. Attempts to update any snapshots that might have changed
-#       (this sub-step is allowed to fail)
+#    c. Formats the code again
 #    d. Commits the changes and pushes them to the same upstream branch
 #    e. Creates a PR against the `main` branch using the branch all three workers have pushed to
 # 4. If any of steps 1-3 failed, an issue is created in the `astral-sh/ruff` repository
@@ -62,12 +61,12 @@ jobs:
    permissions:
      contents: write
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        name: Checkout Ruff
        with:
          path: ruff
          persist-credentials: true
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        name: Checkout typeshed
        with:
          repository: python/typeshed
@@ -77,7 +76,7 @@ jobs:
        run: |
          git config --global user.name typeshedbot
          git config --global user.email '<>'
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
      - name: Sync typeshed stubs
        run: |
          rm -rf "ruff/${VENDORED_TYPESHED}"
@@ -126,12 +125,12 @@ jobs:
    permissions:
      contents: write
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        name: Checkout Ruff
        with:
          persist-credentials: true
          ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
      - name: Setup git
        run: |
          git config --global user.name typeshedbot
@@ -165,12 +164,12 @@ jobs:
      contents: write
      pull-requests: write
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        name: Checkout Ruff
        with:
          persist-credentials: true
          ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
      - name: Setup git
        run: |
          git config --global user.name typeshedbot
@@ -198,42 +197,6 @@ jobs:
        run: |
          rm "${VENDORED_TYPESHED}/pyproject.toml"
          git commit -am "Remove pyproject.toml file"
-      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
-      - name: "Install Rust toolchain"
-        if: ${{ success() }}
-        run: rustup show
-      - name: "Install mold"
-        if: ${{ success() }}
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
-      - name: "Install cargo nextest"
-        if: ${{ success() }}
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
-        with:
-          tool: cargo-nextest
-      - name: "Install cargo insta"
-        if: ${{ success() }}
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
-        with:
-          tool: cargo-insta
-      - name: Update snapshots
-        if: ${{ success() }}
-        run: |
-          cargo r \
-          --profile=profiling \
-          -p ty_completion_eval \
-          -- all --tasks ./crates/ty_completion_eval/completion-evaluation-tasks.csv
-
-          # The `cargo insta` docs indicate that `--unreferenced=delete` might be a good option,
-          # but from local testing it appears to just revert all changes made by `cargo insta test --accept`.
-          #
-          # If there were only snapshot-related failures, `cargo insta test --accept` will have exit code 0,
-          # but if there were also other mdtest failures (for example), it will return a nonzero exit code.
-          # We don't care about other tests failing here, we just want snapshots updated where possible,
-          # so we use `|| true` here to ignore the exit code.
-          cargo insta test --accept --color=always --all-features --test-runner=nextest || true
-      - name: Commit snapshot changes
-        if: ${{ success() }}
-        run: git commit -am "Update snapshots" || echo "No snapshot changes to commit"
      - name: Push changes upstream and create a PR
        if: ${{ success() }}
        run: |
@@ -245,7 +208,7 @@ jobs:
    name: Create an issue if the typeshed sync failed
    runs-on: ubuntu-latest
    needs: [sync, docstrings-windows, docstrings-macos-and-pr]
-    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && (needs.sync.result == 'failure' || needs.docstrings-windows.result == 'failure' || needs.docstrings-macos-and-pr.result == 'failure') }}
+    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && (needs.sync.result != 'success' || needs.docstrings-windows.result != 'success' || needs.docstrings-macos-and-pr.result != 'success') }}
    permissions:
      issues: write
    steps:
--- a/.github/workflows/ty-ecosystem-analyzer.yaml
+++ b/.github/workflows/ty-ecosystem-analyzer.yaml
@@ -4,7 +4,13 @@ permissions: {}

 on:
  pull_request:
-    types: [labeled]
+    # The default for `pull_request` is to trigger on `synchronize`, `opened` and `reopened`.
+    # We also add `labeled` here so that the workflow triggers when a label is initially added.
+    types:
+      - labeled
+      - synchronize
+      - opened
+      - reopened

 concurrency:
  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
@@ -17,30 +23,29 @@ env:
  RUSTUP_MAX_RETRIES: 10
  RUST_BACKTRACE: 1
  REF_NAME: ${{ github.ref_name }}
-  CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}

 jobs:
  ty-ecosystem-analyzer:
    name: Compute diagnostic diff
    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
    timeout-minutes: 20
-    if: contains(github.event.label.name, 'ecosystem-analyzer')
+    if: contains( github.event.pull_request.labels.*.name, 'ecosystem-analyzer')
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          path: ruff
          fetch-depth: 0
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
        with:
-          enable-cache: true # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
+          enable-cache: true

      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          workspaces: "ruff"
-          lookup-only: false # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
+          lookup-only: false

      - name: Install Rust toolchain
        run: rustup show
@@ -67,7 +72,7 @@ jobs:

          cd ..

-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@55df3c868f3fa9ab34cff0498dd6106722aac205"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@2e1816eac09c90140b1ba51d19afc5f59da460f5"

          ecosystem-analyzer \
            --repository ruff \
@@ -112,39 +117,30 @@ jobs:

          cat diff-statistics.md >> "$GITHUB_STEP_SUMMARY"

-      - name: "Deploy to Cloudflare Pages"
-        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        id: deploy
-        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3.14.1
+      # NOTE: astral-sh-bot uses this artifact to post comments on PRs.
+      # Make sure to update the bot if you rename the artifact.
+      - name: "Upload full report"
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
-          apiToken: ${{ secrets.CF_API_TOKEN }}
-          accountId: ${{ secrets.CF_ACCOUNT_ID }}
-          command: pages deploy dist --project-name=ty-ecosystem --branch ${{ github.head_ref }} --commit-hash ${GITHUB_SHA}
-
-      - name: "Append deployment URL"
-        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        env:
-          DEPLOYMENT_URL: ${{ steps.deploy.outputs.pages-deployment-alias-url }}
-        run: |
-          echo >> comment.md
-          echo "**[Full report with detailed diff]($DEPLOYMENT_URL/diff)** ([timing results]($DEPLOYMENT_URL/timing))" >> comment.md
+          name: full-report
+          path: dist/

      # NOTE: astral-sh-bot uses this artifact to post comments on PRs.
      # Make sure to update the bot if you rename the artifact.
      - name: Upload comment
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: comment.md
          path: comment.md

      - name: Upload diagnostics diff
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: diff.html
          path: dist/diff.html

      - name: Upload timing diff
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: timing.html
          path: dist/timing.html
--- a/.github/workflows/ty-ecosystem-report.yaml
+++ b/.github/workflows/ty-ecosystem-report.yaml
@@ -1,3 +1,7 @@
+# This workflow is a cron job that generates a report describing
+# all diagnostics ty emits across the whole ecosystem. The report
+# is uploaded to https://ty-ecosystem-ext.pages.dev/ on a weekly basis.
+
 name: ty ecosystem-report

 permissions: {}
@@ -14,7 +18,6 @@ env:
  CARGO_TERM_COLOR: always
  RUSTUP_MAX_RETRIES: 10
  RUST_BACKTRACE: 1
-  CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}

 jobs:
  ty-ecosystem-report:
@@ -22,21 +25,21 @@ jobs:
    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
    timeout-minutes: 20
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          path: ruff
          fetch-depth: 0
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
        with:
-          enable-cache: true # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
+          enable-cache: true

      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          workspaces: "ruff"
-          lookup-only: false # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact
+          lookup-only: false

      - name: Install Rust toolchain
        run: rustup show
@@ -52,7 +55,7 @@ jobs:

          cd ..

-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@55df3c868f3fa9ab34cff0498dd6106722aac205"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@2e1816eac09c90140b1ba51d19afc5f59da460f5"

          ecosystem-analyzer \
            --verbose \
@@ -70,11 +73,10 @@ jobs:
            ecosystem-diagnostics.json \
            --output dist/index.html

-      - name: "Deploy to Cloudflare Pages"
-        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        id: deploy
-        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3.14.1
+      # NOTE: astral-sh-bot uses this artifact to publish the ecosystem report.
+      # Make sure to update the bot if you rename the artifact.
+      - name: "Upload ecosystem report"
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
-          apiToken: ${{ secrets.CF_API_TOKEN }}
-          accountId: ${{ secrets.CF_ACCOUNT_ID }}
-          command: pages deploy dist --project-name=ty-ecosystem --branch main --commit-hash ${GITHUB_SHA}
+          name: full-report
+          path: dist/
--- a/.github/workflows/typing_conformance.yaml
+++ b/.github/workflows/typing_conformance.yaml
@@ -6,6 +6,11 @@ on:
  pull_request:
    paths:
      - "crates/ty*/**"
+      - "!crates/ty_ide/**"
+      - "!crates/ty_server/**"
+      - "!crates/ty_test/**"
+      - "!crates/ty_completion_eval/**"
+      - "!crates/ty_wasm/**"
      - "crates/ruff_db"
      - "crates/ruff_python_ast"
      - "crates/ruff_python_parser"
@@ -32,13 +37,13 @@ jobs:
    runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-ubuntu-22.04-32' || 'ubuntu-latest' }}
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          path: ruff
          fetch-depth: 0
          persist-credentials: false

-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          repository: python/typing
          ref: ${{ env.CONFORMANCE_SUITE_COMMIT }}
@@ -54,9 +59,6 @@ jobs:

      - name: Compute diagnostic diff
        shell: bash
-        env:
-          # TODO: Remove this once we fixed the remaining panics in the conformance suite.
-          TY_MAX_PARALLELISM: 1
        run: |
          RUFF_DIR="$GITHUB_WORKSPACE/ruff"

@@ -99,7 +101,7 @@ jobs:
      # NOTE: astral-sh-bot uses this artifact to post comments on PRs.
      # Make sure to update the bot if you rename the artifact.
      - name: Upload diff
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: typing_conformance_diagnostics_diff
          path: typing_conformance_diagnostics.diff
@@ -107,7 +109,7 @@ jobs:
      # NOTE: astral-sh-bot uses this artifact to post comments on PRs.
      # Make sure to update the bot if you rename the artifact.
      - name: Upload conformance suite commit
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: conformance-suite-commit
          path: conformance-suite-commit
--- a/.github/zizmor.yml
+++ b/.github/zizmor.yml
@@ -1,23 +0,0 @@
-# Configuration for the zizmor static analysis tool, run via pre-commit in CI
-# https://docs.zizmor.sh/configuration/
-#
-# TODO: can we remove the ignores here so that our workflows are more secure?
-rules:
-  cache-poisoning:
-    ignore:
-      - build-docker.yml
-  excessive-permissions:
-    # it's hard to test what the impact of removing these ignores would be
-    # without actually running the release workflow...
-    ignore:
-      - build-docker.yml
-      - publish-docs.yml
-  secrets-inherit:
-    # `cargo dist` makes extensive use of `secrets: inherit`,
-    # and we can't easily fix that until an upstream release changes that.
-    disable: true
-  template-injection:
-    ignore:
-      # like with `secrets-inherit`, `cargo dist` introduces some
-      # template injections. We've manually audited these usages for safety.
-      - release.yml
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -21,32 +21,91 @@ exclude: |
  )$

 repos:
+  # Priority 0: Read-only hooks; hooks that modify disjoint file types.
  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
    hooks:
      - id: check-merge-conflict
+        priority: 0

  - repo: https://github.com/abravalheri/validate-pyproject
    rev: v0.24.1
    hooks:
      - id: validate-pyproject
+        priority: 0
+
+  - repo: https://github.com/crate-ci/typos
+    rev: v1.41.0
+    hooks:
+      - id: typos
+        priority: 0
+
+  - repo: local
+    hooks:
+      - id: rustfmt
+        name: rustfmt
+        entry: rustfmt
+        language: system
+        types: [rust]
+        priority: 0
+
+  # Prettier
+  - repo: https://github.com/rbubley/mirrors-prettier
+    rev: v3.7.4
+    hooks:
+      - id: prettier
+        types: [yaml]
+        priority: 0
+
+  # zizmor detects security vulnerabilities in GitHub Actions workflows.
+  # Additional configuration for the tool is found in `.github/zizmor.yml`
+  - repo: https://github.com/zizmorcore/zizmor-pre-commit
+    rev: v1.19.0
+    hooks:
+      - id: zizmor
+        priority: 0
+
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.36.0
+    hooks:
+      - id: check-github-workflows
+        priority: 0
+
+  - repo: https://github.com/shellcheck-py/shellcheck-py
+    rev: v0.11.0.1
+    hooks:
+      - id: shellcheck
+        priority: 0

  - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.22
+    rev: 1.0.0
    hooks:
      - id: mdformat
        language: python # means renovate will also update `additional_dependencies`
        additional_dependencies:
-          - mdformat-mkdocs==4.0.0
-          - mdformat-footnote==0.1.1
+          - mdformat-mkdocs==5.0.0
+          - mdformat-footnote==0.1.2
        exclude: |
          (?x)^(
            docs/formatter/black\.md
            | docs/\w+\.md
          )$
+        priority: 0

+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.14.10
+    hooks:
+      - id: ruff-format
+        priority: 0
+      - id: ruff-check
+        args: [--fix, --exit-non-zero-on-fix]
+        types_or: [python, pyi]
+        require_serial: true
+        priority: 1
+
+  # Priority 1: Second-pass fixers (e.g., markdownlint-fix runs after mdformat).
  - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.45.0
+    rev: v0.47.0
    hooks:
      - id: markdownlint-fix
        exclude: |
@@ -54,9 +113,11 @@ repos:
            docs/formatter/black\.md
            | docs/\w+\.md
          )$
+        priority: 1

+  # Priority 2: blacken-docs runs after markdownlint-fix (both modify markdown).
  - repo: https://github.com/adamchainz/blacken-docs
-    rev: 1.19.1
+    rev: 1.20.0
    hooks:
      - id: blacken-docs
        language: python # means renovate will also update `additional_dependencies`
@@ -67,74 +128,27 @@ repos:
            .*?invalid(_.+)*_syntax\.md
          )$
        additional_dependencies:
-          - black==25.1.0
-
-  - repo: https://github.com/crate-ci/typos
-    rev: v1.34.0
-    hooks:
-      - id: typos
-
-  - repo: local
-    hooks:
-      - id: cargo-fmt
-        name: cargo fmt
-        entry: cargo fmt --
-        language: system
-        types: [rust]
-        pass_filenames: false # This makes it a lot faster
-
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.7
-    hooks:
-      - id: ruff-format
-      - id: ruff-check
-        args: [--fix, --exit-non-zero-on-fix]
-        types_or: [python, pyi]
-        require_serial: true
-
-  # Prettier
-  - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.6.2
-    hooks:
-      - id: prettier
-        types: [yaml]
-
-  # zizmor detects security vulnerabilities in GitHub Actions workflows.
-  # Additional configuration for the tool is found in `.github/zizmor.yml`
-  - repo: https://github.com/zizmorcore/zizmor-pre-commit
-    rev: v1.16.0
-    hooks:
-      - id: zizmor
-
-  - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.33.2
-    hooks:
-      - id: check-github-workflows
+          - black==25.12.0
+        priority: 2

  # `actionlint` hook, for verifying correct syntax in GitHub Actions workflows.
  # Some additional configuration for `actionlint` can be found in `.github/actionlint.yaml`.
  - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.7
+    rev: v1.7.10
    hooks:
      - id: actionlint
        stages:
          # This hook is disabled by default, since it's quite slow.
-          # To run all hooks *including* this hook, use `uvx pre-commit run -a --hook-stage=manual`.
-          # To run *just* this hook, use `uvx pre-commit run -a actionlint --hook-stage=manual`.
+          # To run all hooks *including* this hook, use `uvx prek run -a --hook-stage=manual`.
+          # To run *just* this hook, use `uvx prek run -a actionlint --hook-stage=manual`.
          - manual
        args:
          - "-ignore=SC2129" # ignorable stylistic lint from shellcheck
          - "-ignore=SC2016" # another shellcheck lint: seems to have false positives?
+        language: golang # means renovate will also update `additional_dependencies`
        additional_dependencies:
          # actionlint has a shellcheck integration which extracts shell scripts in `run:` steps from GitHub Actions
          # and checks these with shellcheck. This is arguably its most useful feature,
          # but the integration only works if shellcheck is installed
-          - "github.com/wasilibs/go-shellcheck/cmd/shellcheck@v0.10.0"
-
-  - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.10.0.1
-    hooks:
-      - id: shellcheck
-
-ci:
-  skip: [cargo-fmt, dev-generate-all]
+          - "github.com/wasilibs/go-shellcheck/cmd/shellcheck@v0.11.1"
+        priority: 0
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,112 @@
 # Changelog

+## 0.14.11
+
+Released on 2026-01-08.
+
+### Preview features
+
+- Consolidate diagnostics for matched disable/enable suppression comments ([#22099](https://github.com/astral-sh/ruff/pull/22099))
+- Report diagnostics for invalid/unmatched range suppression comments ([#21908](https://github.com/astral-sh/ruff/pull/21908))
+- \[`airflow`\] Passing positional argument into `airflow.lineage.hook.HookLineageCollector.create_asset` is not allowed (`AIR303`) ([#22046](https://github.com/astral-sh/ruff/pull/22046))
+- \[`refurb`\] Mark `FURB192` fix as always unsafe ([#22210](https://github.com/astral-sh/ruff/pull/22210))
+- \[`ruff`\] Add `non-empty-init-module` (`RUF067`) ([#22143](https://github.com/astral-sh/ruff/pull/22143))
+
+### Bug fixes
+
+- Fix GitHub format for multi-line diagnostics ([#22108](https://github.com/astral-sh/ruff/pull/22108))
+- \[`flake8-unused-arguments`\] Mark `**kwargs` in `TypeVar` as used (`ARG001`) ([#22214](https://github.com/astral-sh/ruff/pull/22214))
+
+### Rule changes
+
+- Add `help:` subdiagnostics for several Ruff rules that can sometimes appear to disagree with `ty` ([#22331](https://github.com/astral-sh/ruff/pull/22331))
+- \[`pylint`\] Demote `PLW1510` fix to display-only ([#22318](https://github.com/astral-sh/ruff/pull/22318))
+- \[`pylint`\] Ignore identical members (`PLR1714`) ([#22220](https://github.com/astral-sh/ruff/pull/22220))
+- \[`pylint`\] Improve diagnostic range for `PLC0206` ([#22312](https://github.com/astral-sh/ruff/pull/22312))
+- \[`ruff`\] Improve fix title for `RUF102` invalid rule code ([#22100](https://github.com/astral-sh/ruff/pull/22100))
+- \[`flake8-simplify`\]: Avoid unnecessary builtins import for `SIM105` ([#22358](https://github.com/astral-sh/ruff/pull/22358))
+
+### Configuration
+
+- Allow Python 3.15 as valid `target-version` value in preview ([#22419](https://github.com/astral-sh/ruff/pull/22419))
+- Check `required-version` before parsing rules ([#22410](https://github.com/astral-sh/ruff/pull/22410))
+- Include configured `src` directories when resolving graphs ([#22451](https://github.com/astral-sh/ruff/pull/22451))
+
+### Documentation
+
+- Update `T201` suggestion to not use root logger to satisfy `LOG015` ([#22059](https://github.com/astral-sh/ruff/pull/22059))
+- Fix `iter` example in unsafe fixes doc ([#22118](https://github.com/astral-sh/ruff/pull/22118))
+- \[`flake8_print`\] better suggestion for `basicConfig` in `T201` docs ([#22101](https://github.com/astral-sh/ruff/pull/22101))
+- \[`pylint`\] Restore the fix safety docs for `PLW0133` ([#22211](https://github.com/astral-sh/ruff/pull/22211))
+- Fix Jupyter notebook discovery info for editors ([#22447](https://github.com/astral-sh/ruff/pull/22447))
+
+### Contributors
+
+- [@charliermarsh](https://github.com/charliermarsh)
+- [@ntBre](https://github.com/ntBre)
+- [@cenviity](https://github.com/cenviity)
+- [@njhearp](https://github.com/njhearp)
+- [@cbachhuber](https://github.com/cbachhuber)
+- [@jelle-openai](https://github.com/jelle-openai)
+- [@AlexWaygood](https://github.com/AlexWaygood)
+- [@ValdonVitija](https://github.com/ValdonVitija)
+- [@BurntSushi](https://github.com/BurntSushi)
+- [@Jkhall81](https://github.com/Jkhall81)
+- [@PeterJCLaw](https://github.com/PeterJCLaw)
+- [@harupy](https://github.com/harupy)
+- [@amyreese](https://github.com/amyreese)
+- [@sjyangkevin](https://github.com/sjyangkevin)
+- [@woodruffw](https://github.com/woodruffw)
+
+## 0.14.10
+
+Released on 2025-12-18.
+
+### Preview features
+
+- [formatter] Fluent formatting of method chains ([#21369](https://github.com/astral-sh/ruff/pull/21369))
+- [formatter] Keep lambda parameters on one line and parenthesize the body if it expands ([#21385](https://github.com/astral-sh/ruff/pull/21385))
+- \[`flake8-implicit-str-concat`\] New rule to prevent implicit string concatenation in collections (`ISC004`) ([#21972](https://github.com/astral-sh/ruff/pull/21972))
+- \[`flake8-use-pathlib`\] Make fixes unsafe when types change in compound statements (`PTH104`, `PTH105`, `PTH109`, `PTH115`) ([#22009](https://github.com/astral-sh/ruff/pull/22009))
+- \[`refurb`\] Extend support for `Path.open` (`FURB101`, `FURB103`) ([#21080](https://github.com/astral-sh/ruff/pull/21080))
+
+### Bug fixes
+
+- \[`pyupgrade`\] Fix parsing named Unicode escape sequences (`UP032`) ([#21901](https://github.com/astral-sh/ruff/pull/21901))
+
+### Rule changes
+
+- \[`eradicate`\] Ignore `ruff:disable` and `ruff:enable` comments in `ERA001` ([#22038](https://github.com/astral-sh/ruff/pull/22038))
+- \[`flake8-pytest-style`\] Allow `match` and `check` keyword arguments without an expected exception type (`PT010`) ([#21964](https://github.com/astral-sh/ruff/pull/21964))
+- [syntax-errors] Annotated name cannot be global ([#20868](https://github.com/astral-sh/ruff/pull/20868))
+
+### Documentation
+
+- Add `uv` and `ty` to the Ruff README ([#21996](https://github.com/astral-sh/ruff/pull/21996))
+- Document known lambda formatting deviations from Black ([#21954](https://github.com/astral-sh/ruff/pull/21954))
+- Update `setup.md` ([#22024](https://github.com/astral-sh/ruff/pull/22024))
+- \[`flake8-bandit`\] Fix broken link (`S704`) ([#22039](https://github.com/astral-sh/ruff/pull/22039))
+
+### Other changes
+
+- Fix playground Share button showing "Copied!" before clipboard copy completes ([#21942](https://github.com/astral-sh/ruff/pull/21942))
+
+### Contributors
+
+- [@dylwil3](https://github.com/dylwil3)
+- [@charliecloudberry](https://github.com/charliecloudberry)
+- [@charliermarsh](https://github.com/charliermarsh)
+- [@chirizxc](https://github.com/chirizxc)
+- [@ntBre](https://github.com/ntBre)
+- [@zanieb](https://github.com/zanieb)
+- [@amyreese](https://github.com/amyreese)
+- [@hauntsaninja](https://github.com/hauntsaninja)
+- [@11happy](https://github.com/11happy)
+- [@mahiro72](https://github.com/mahiro72)
+- [@MichaReiser](https://github.com/MichaReiser)
+- [@phongddo](https://github.com/phongddo)
+- [@PeterJCLaw](https://github.com/PeterJCLaw)
+
 ## 0.14.9

 Released on 2025-12-11.
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -0,0 +1,71 @@
+# Ruff Repository
+
+This repository contains both Ruff (a Python linter and formatter) and ty (a Python type checker). The crates follow a naming convention: `ruff_*` for Ruff-specific code and `ty_*` for ty-specific code. ty reuses several Ruff crates, including the Python parser (`ruff_python_parser`) and AST definitions (`ruff_python_ast`).
+
+## Running Tests
+
+Run all tests (using `nextest` for faster execution):
+
+```sh
+cargo nextest run
+```
+
+For faster test execution, use the `fast-test` profile which enables optimizations while retaining debug info:
+
+```sh
+cargo nextest run --cargo-profile fast-test
+```
+
+Run tests for a specific crate:
+
+```sh
+cargo nextest run -p ty_python_semantic
+```
+
+Run a specific mdtest (use a substring of the test name):
+
+```sh
+MDTEST_TEST_FILTER="<filter>" cargo nextest run -p ty_python_semantic mdtest
+```
+
+Update snapshots after running tests:
+
+```sh
+cargo insta accept
+```
+
+## Running Clippy
+
+```sh
+cargo clippy --workspace --all-targets --all-features -- -D warnings
+```
+
+## Running Debug Builds
+
+Use debug builds (not `--release`) when developing, as release builds lack debug assertions and have slower compile times.
+
+Run Ruff:
+
+```sh
+cargo run --bin ruff -- check path/to/file.py
+```
+
+Run ty:
+
+```sh
+cargo run --bin ty -- check path/to/file.py
+```
+
+## Pull Requests
+
+When working on ty, PR titles should start with `[ty]` and be tagged with the `ty` GitHub label.
+
+## Development Guidelines
+
+- All changes must be tested. If you're not testing your changes, you're not done.
+- Get your tests to pass. If you didn't run the tests, your code does not work.
+- Follow existing code style. Check neighboring files for patterns.
+- Always run `uvx prek run -a` at the end of a task.
+- Avoid writing significant amounts of new code. This is often a sign that we're missing an existing method or mechanism that could help solve the problem. Look for existing utilities first.
+- Avoid falling back to patterns that require `panic!`, `unreachable!`, or `.unwrap()`. Instead, try to encode those constraints in the type system.
+- Prefer let chains (`if let` combined with `&&`) over nested `if let` statements to reduce indentation and improve readability.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -53,12 +53,12 @@ cargo install cargo-insta
 You'll need [uv](https://docs.astral.sh/uv/getting-started/installation/) (or `pipx` and `pip`) to
 run Python utility commands.

-You can optionally install pre-commit hooks to automatically run the validation checks
+You can optionally install hooks to automatically run the validation checks
 when making a commit:

 ```shell
-uv tool install pre-commit
-pre-commit install
+uv tool install prek
+prek install
 ```

 We recommend [nextest](https://nexte.st/) to run Ruff's test suite (via `cargo nextest run`),
@@ -85,7 +85,7 @@ and that it passes both the lint and test validation checks:
 ```shell
 cargo clippy --workspace --all-targets --all-features -- -D warnings  # Rust linting
 RUFF_UPDATE_SCHEMA=1 cargo test  # Rust testing and updating ruff.schema.json
-uvx pre-commit run --all-files --show-diff-on-failure  # Rust and Python formatting, Markdown and Python linting, etc.
+uvx prek run -a  # Rust and Python formatting, Markdown and Python linting, etc.
 ```

 These checks will run on GitHub Actions when you open your pull request, but running them locally
@@ -381,7 +381,7 @@ Commit each step of this process separately for easier review.

    - Often labels will be missing from pull requests they will need to be manually organized into the proper section
    - Changes should be edited to be user-facing descriptions, avoiding internal details
-    - Square brackets (eg, `[ruff]` project name) will be automatically escaped by `pre-commit`
+    - Square brackets (eg, `[ruff]` project name) will be automatically escaped by `prek`

    Additionally, for minor releases:

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,6 +17,15 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "alloca"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a7d05ea6aea7e9e64d25b9156ba2fee3fdd659e34e41063cd2fc7cd020d7f4"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "allocator-api2"
 version = "0.2.21"
@@ -137,9 +146,12 @@ dependencies = [

 [[package]]
 name = "arc-swap"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+checksum = "51d03449bb8ca2cc2ef70869af31463d1ae5ccc8fa3e334b307203fbf815207e"
+dependencies = [
+ "rustversion",
+]

 [[package]]
 name = "argfile"
@@ -208,12 +220,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"

-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
 [[package]]
 name = "bincode"
 version = "2.0.1"
@@ -280,6 +286,9 @@ name = "bitflags"
 version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+dependencies = [
+ "serde_core",
+]

 [[package]]
 name = "bitvec"
@@ -351,9 +360,9 @@ dependencies = [

 [[package]]
 name = "camino"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
+checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48"
 dependencies = [
 "serde_core",
 ]
@@ -457,9 +466,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.53"
+version = "4.5.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8"
+checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -467,9 +476,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.53"
+version = "4.5.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00"
+checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00"
 dependencies = [
 "anstream",
 "anstyle",
@@ -657,7 +666,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
 "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -666,7 +675,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -767,18 +776,20 @@ dependencies = [

 [[package]]
 name = "criterion"
-version = "0.7.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1c047a62b0cc3e145fa84415a3191f628e980b194c2755aa12300a4e6cbd928"
+checksum = "4d883447757bb0ee46f233e9dc22eb84d93a9508c9b868687b274fc431d886bf"
 dependencies = [
+ "alloca",
 "anes",
 "cast",
 "ciborium",
 "clap",
- "criterion-plot 0.6.0",
+ "criterion-plot 0.8.1",
 "itertools 0.13.0",
 "num-traits",
 "oorandom",
+ "page_size",
 "regex",
 "serde",
 "serde_json",
@@ -798,9 +809,9 @@ dependencies = [

 [[package]]
 name = "criterion-plot"
-version = "0.6.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b1bcc0dc7dfae599d84ad0b1a55f80cde8af3725da8313b528da95ef783e338"
+checksum = "ed943f81ea2faa8dcecbbfa50164acf95d555afec96a27871663b300e387b2e4"
 dependencies = [
 "cast",
 "itertools 0.13.0",
@@ -1004,27 +1015,6 @@ dependencies = [
 "crypto-common",
 ]

-[[package]]
-name = "dir-test"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62c013fe825864f3e4593f36426c1fa7a74f5603f13ca8d1af7a990c1cd94a79"
-dependencies = [
- "dir-test-macros",
-]
-
-[[package]]
-name = "dir-test-macros"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d42f54d7b4a6bc2400fe5b338e35d1a335787585375322f49c5d5fe7b243da7e"
-dependencies = [
- "glob",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "dirs"
 version = "6.0.0"
@@ -1043,7 +1033,7 @@ dependencies = [
 "libc",
 "option-ext",
 "redox_users",
- "windows-sys 0.61.0",
+ "windows-sys 0.60.2",
 ]

 [[package]]
@@ -1135,7 +1125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
 "libc",
- "windows-sys 0.61.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -1593,11 +1583,11 @@ dependencies = [

 [[package]]
 name = "imperative"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29a1f6526af721f9aec9ceed7ab8ebfca47f3399d08b80056c2acca3fcb694a9"
+checksum = "35e1d0bd9c575c52e59aad8e122a11786e852a154678d0c86e9e243d55273970"
 dependencies = [
- "phf",
+ "phf 0.13.1",
 "rust-stemmers",
 ]

@@ -1658,9 +1648,9 @@ dependencies = [

 [[package]]
 name = "insta"
-version = "1.43.2"
+version = "1.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46fdb647ebde000f43b5b53f773c30cf9b0cb4300453208713fa38b2c70935a0"
+checksum = "1b66886d14d18d420ab5052cbff544fc5d34d0b2cdd35eb5976aaa10a4a472e5"
 dependencies = [
 "console 0.15.11",
 "once_cell",
@@ -1670,6 +1660,7 @@ dependencies = [
 "ron",
 "serde",
 "similar",
+ "tempfile",
 ]

 [[package]]
@@ -1736,7 +1727,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
 "hermit-abi",
 "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -1790,9 +1781,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"

 [[package]]
 name = "jiff"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49cce2b81f2098e7e3efc35bc2e0a6b7abec9d34128283d7a26fa8f32a6dbb35"
+checksum = "a87d9b8105c23642f50cbbae03d1f75d8422c5cb98ce7ee9271f7ff7505be6b8"
 dependencies = [
 "jiff-static",
 "jiff-tzdb-platform",
@@ -1800,14 +1791,14 @@ dependencies = [
 "portable-atomic",
 "portable-atomic-util",
 "serde_core",
- "windows-sys 0.61.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
 name = "jiff-static"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69"
+checksum = "b787bebb543f8969132630c51fd0afab173a86c6abae56ff3b9e5e3e3f9f6e58"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1883,9 +1874,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

 [[package]]
 name = "libc"
-version = "0.2.177"
+version = "0.2.179"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+checksum = "c5a2d376baa530d1238d133232d15e239abad80d05838b4b59354e5268af431f"

 [[package]]
 name = "libcst"
@@ -1991,9 +1982,9 @@ dependencies = [

 [[package]]
 name = "log"
-version = "0.4.28"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"

 [[package]]
 name = "lsp-server"
@@ -2069,9 +2060,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"

 [[package]]
 name = "matchit"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea5f97102eb9e54ab99fb70bb175589073f554bdadfb74d9bd656482ea73e2a"
+checksum = "b3eede3bdf92f3b4f9dc04072a9ce5ab557d5ec9038773bf9ffcd5588b3cc05b"

 [[package]]
 name = "memchr"
@@ -2310,6 +2301,16 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "page_size"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.12.4"
@@ -2487,7 +2488,17 @@ version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
 dependencies = [
- "phf_shared",
+ "phf_shared 0.11.3",
+]
+
+[[package]]
+name = "phf"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
+dependencies = [
+ "phf_shared 0.13.1",
+ "serde",
 ]

 [[package]]
@@ -2497,7 +2508,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
 dependencies = [
 "phf_generator",
- "phf_shared",
+ "phf_shared 0.11.3",
 ]

 [[package]]
@@ -2506,7 +2517,7 @@ version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
- "phf_shared",
+ "phf_shared 0.11.3",
 "rand 0.8.5",
 ]

@@ -2519,6 +2530,15 @@ dependencies = [
 "siphasher",
 ]

+[[package]]
+name = "phf_shared"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
+dependencies = [
+ "siphasher",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.16"
@@ -2633,9 +2653,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.103"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
+checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0"
 dependencies = [
 "unicode-ident",
 ]
@@ -2897,18 +2917,21 @@ checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"

 [[package]]
 name = "ron"
-version = "0.7.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a"
+checksum = "fd490c5b18261893f14449cbd28cb9c0b637aebf161cd77900bfdedaff21ec32"
 dependencies = [
- "base64",
- "bitflags 1.3.2",
+ "bitflags 2.10.0",
+ "once_cell",
 "serde",
+ "serde_derive",
+ "typeid",
+ "unicode-ident",
 ]

 [[package]]
 name = "ruff"
-version = "0.14.9"
+version = "0.14.11"
 dependencies = [
 "anyhow",
 "argfile",
@@ -2924,6 +2947,7 @@ dependencies = [
 "filetime",
 "globwalk",
 "ignore",
+ "indexmap",
 "indoc",
 "insta",
 "insta-cmd",
@@ -3150,6 +3174,7 @@ dependencies = [
 "salsa",
 "schemars",
 "serde",
+ "ty_module_resolver",
 "ty_python_semantic",
 "zip",
 ]
@@ -3166,7 +3191,7 @@ dependencies = [

 [[package]]
 name = "ruff_linter"
-version = "0.14.9"
+version = "0.14.11"
 dependencies = [
 "aho-corasick",
 "anyhow",
@@ -3244,7 +3269,6 @@ name = "ruff_memory_usage"
 version = "0.0.0"
 dependencies = [
 "get-size2",
- "ordermap",
 ]

 [[package]]
@@ -3281,7 +3305,6 @@ dependencies = [
 "compact_str",
 "get-size2",
 "is-macro",
- "itertools 0.14.0",
 "memchr",
 "ruff_cache",
 "ruff_macros",
@@ -3525,7 +3548,7 @@ dependencies = [

 [[package]]
 name = "ruff_wasm"
-version = "0.14.9"
+version = "0.14.11"
 dependencies = [
 "console_error_panic_hook",
 "console_log",
@@ -3615,15 +3638,15 @@ checksum = "781442f29170c5c93b7185ad559492601acdc71d5bb0706f5868094f45cfcd08"

 [[package]]
 name = "rustix"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
 dependencies = [
 "bitflags 2.10.0",
 "errno",
 "libc",
 "linux-raw-sys",
- "windows-sys 0.61.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -3640,8 +3663,8 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"

 [[package]]
 name = "salsa"
-version = "0.24.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"
+version = "0.25.2"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=9860ff6ca0f1f8f3a8d6b832020002790b501254#9860ff6ca0f1f8f3a8d6b832020002790b501254"
 dependencies = [
 "boxcar",
 "compact_str",
@@ -3665,13 +3688,13 @@ dependencies = [

 [[package]]
 name = "salsa-macro-rules"
-version = "0.24.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"
+version = "0.25.2"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=9860ff6ca0f1f8f3a8d6b832020002790b501254#9860ff6ca0f1f8f3a8d6b832020002790b501254"

 [[package]]
 name = "salsa-macros"
-version = "0.24.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"
+version = "0.25.2"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=9860ff6ca0f1f8f3a8d6b832020002790b501254#9860ff6ca0f1f8f3a8d6b832020002790b501254"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3690,9 +3713,9 @@ dependencies = [

 [[package]]
 name = "schemars"
-version = "1.0.5"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1317c3bf3e7df961da95b0a56a172a02abead31276215a0497241a7624b487ce"
+checksum = "54e910108742c57a770f492731f99be216a52fadd361b06c8fb59d74ccc267d2"
 dependencies = [
 "dyn-clone",
 "ref-cast",
@@ -3703,9 +3726,9 @@ dependencies = [

 [[package]]
 name = "schemars_derive"
-version = "1.0.5"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f760a6150d45dd66ec044983c124595ae76912e77ed0b44124cb3e415cce5d9"
+checksum = "4908ad288c5035a8eb12cfdf0d49270def0a268ee162b75eeee0f85d155a7c45"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3779,15 +3802,15 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.145"
+version = "1.0.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+checksum = "3084b546a1dd6289475996f182a22aba973866ea8e8b02c51d9f46b1336a22da"
 dependencies = [
 "itoa",
 "memchr",
- "ryu",
 "serde",
 "serde_core",
+ "zmij",
 ]

 [[package]]
@@ -3803,9 +3826,9 @@ dependencies = [

 [[package]]
 name = "serde_spanned"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"
+checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
 dependencies = [
 "serde_core",
 ]
@@ -3821,9 +3844,9 @@ dependencies = [

 [[package]]
 name = "serde_with"
-version = "3.15.1"
+version = "3.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04"
+checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7"
 dependencies = [
 "serde_core",
 "serde_with_macros",
@@ -3831,9 +3854,9 @@ dependencies = [

 [[package]]
 name = "serde_with_macros"
-version = "3.15.1"
+version = "3.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955"
+checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c"
 dependencies = [
 "darling",
 "proc-macro2",
@@ -3983,15 +4006,15 @@ dependencies = [

 [[package]]
 name = "supports-hyperlinks"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804f44ed3c63152de6a9f90acbea1a110441de43006ea51bcce8f436196a288b"
+checksum = "e396b6523b11ccb83120b115a0b7366de372751aa6edf19844dfb13a6af97e91"

 [[package]]
 name = "syn"
-version = "2.0.111"
+version = "2.0.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
+checksum = "678faa00651c9eb72dd2020cbdf275d92eccb2400d568e419efdd64838145cb4"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4017,15 +4040,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"

 [[package]]
 name = "tempfile"
-version = "3.23.0"
+version = "3.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
+checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"
 dependencies = [
 "fastrand",
 "getrandom 0.3.4",
 "once_cell",
 "rustix",
- "windows-sys 0.61.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -4055,7 +4078,7 @@ checksum = "d4ea810f0692f9f51b382fff5893887bb4580f5fa246fde546e0b13e7fcee662"
 dependencies = [
 "fnv",
 "nom",
- "phf",
+ "phf 0.11.3",
 "phf_codegen",
 ]

@@ -4219,9 +4242,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "toml"
-version = "0.9.8"
+version = "0.9.10+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
+checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48"
 dependencies = [
 "indexmap",
 "serde_core",
@@ -4234,9 +4257,9 @@ dependencies = [

 [[package]]
 name = "toml_datetime"
-version = "0.7.3"
+version = "0.7.5+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
 dependencies = [
 "serde_core",
 ]
@@ -4255,24 +4278,24 @@ dependencies = [

 [[package]]
 name = "toml_parser"
-version = "1.0.4"
+version = "1.0.6+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
+checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
 dependencies = [
 "winnow",
 ]

 [[package]]
 name = "toml_writer"
-version = "1.0.4"
+version = "1.0.6+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
+checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607"

 [[package]]
 name = "tracing"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
 "log",
 "pin-project-lite",
@@ -4293,9 +4316,9 @@ dependencies = [

 [[package]]
 name = "tracing-core"
-version = "0.1.35"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
 dependencies = [
 "once_cell",
 "valuable",
@@ -4314,9 +4337,9 @@ dependencies = [

 [[package]]
 name = "tracing-indicatif"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04d4e11e0e27acef25a47f27e9435355fecdc488867fa2bc90e75b0700d2823d"
+checksum = "e1ef6990e0438749f0080573248e96631171a0b5ddfddde119aa5ba8c3a9c47e"
 dependencies = [
 "indicatif",
 "tracing",
@@ -4396,6 +4419,7 @@ dependencies = [
 "tracing-flame",
 "tracing-subscriber",
 "ty_combine",
+ "ty_module_resolver",
 "ty_project",
 "ty_python_semantic",
 "ty_server",
@@ -4410,7 +4434,6 @@ dependencies = [
 "ordermap",
 "ruff_db",
 "ruff_python_ast",
- "ty_python_semantic",
 ]

 [[package]]
@@ -4428,8 +4451,8 @@ dependencies = [
 "tempfile",
 "toml",
 "ty_ide",
+ "ty_module_resolver",
 "ty_project",
- "ty_python_semantic",
 "walkdir",
 ]

@@ -4439,6 +4462,7 @@ version = "0.0.0"
 dependencies = [
 "bitflags 2.10.0",
 "camino",
+ "compact_str",
 "get-size2",
 "insta",
 "itertools 0.14.0",
@@ -4459,11 +4483,35 @@ dependencies = [
 "salsa",
 "smallvec",
 "tracing",
+ "ty_module_resolver",
 "ty_project",
 "ty_python_semantic",
 "ty_vendored",
 ]

+[[package]]
+name = "ty_module_resolver"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "camino",
+ "compact_str",
+ "get-size2",
+ "insta",
+ "ruff_db",
+ "ruff_memory_usage",
+ "ruff_python_ast",
+ "ruff_python_stdlib",
+ "rustc-hash",
+ "salsa",
+ "strum",
+ "strum_macros",
+ "tempfile",
+ "thiserror 2.0.17",
+ "tracing",
+ "ty_vendored",
+]
+
 [[package]]
 name = "ty_project"
 version = "0.0.0"
@@ -4483,11 +4531,13 @@ dependencies = [
 "regex-automata",
 "ruff_cache",
 "ruff_db",
+ "ruff_diagnostics",
 "ruff_macros",
 "ruff_memory_usage",
 "ruff_options_metadata",
 "ruff_python_ast",
 "ruff_python_formatter",
+ "ruff_python_trivia",
 "ruff_text_size",
 "rustc-hash",
 "salsa",
@@ -4498,6 +4548,7 @@ dependencies = [
 "toml",
 "tracing",
 "ty_combine",
+ "ty_module_resolver",
 "ty_python_semantic",
 "ty_static",
 "ty_vendored",
@@ -4513,7 +4564,7 @@ dependencies = [
 "camino",
 "colored 3.0.0",
 "compact_str",
- "dir-test",
+ "datatest-stable",
 "drop_bomb",
 "get-size2",
 "glob",
@@ -4550,11 +4601,11 @@ dependencies = [
 "strsim",
 "strum",
 "strum_macros",
- "tempfile",
 "test-case",
 "thiserror 2.0.17",
 "tracing",
- "ty_python_semantic",
+ "ty_combine",
+ "ty_module_resolver",
 "ty_static",
 "ty_test",
 "ty_vendored",
@@ -4593,6 +4644,7 @@ dependencies = [
 "tracing-subscriber",
 "ty_combine",
 "ty_ide",
+ "ty_module_resolver",
 "ty_project",
 "ty_python_semantic",
 ]
@@ -4633,6 +4685,7 @@ dependencies = [
 "thiserror 2.0.17",
 "toml",
 "tracing",
+ "ty_module_resolver",
 "ty_python_semantic",
 "ty_static",
 "ty_vendored",
@@ -4680,6 +4733,12 @@ version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"

+[[package]]
+name = "typeid"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
+
 [[package]]
 name = "typenum"
 version = "1.18.0"
@@ -4767,7 +4826,7 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d1673eca9782c84de5f81b82e4109dcfb3611c8ba0d52930ec4a9478f547b2dd"
 dependencies = [
- "phf",
+ "phf 0.11.3",
 "unicode_names2_generator",
 ]

@@ -4839,9 +4898,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"

 [[package]]
 name = "uuid"
-version = "1.18.1"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
+checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a"
 dependencies = [
 "getrandom 0.3.4",
 "js-sys",
@@ -4852,9 +4911,9 @@ dependencies = [

 [[package]]
 name = "uuid-macro-internal"
-version = "1.18.1"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9384a660318abfbd7f8932c34d67e4d1ec511095f95972ddc01e19d7ba8413f"
+checksum = "39d11901c36b3650df7acb0f9ebe624f35b5ac4e1922ecd3c57f444648429594"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -5074,15 +5133,37 @@ dependencies = [
 "glob",
 ]

+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
 [[package]]
 name = "winapi-util"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.0",
+ "windows-sys 0.52.0",
 ]

+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
 [[package]]
 name = "windows-core"
 version = "0.62.0"
@@ -5466,6 +5547,12 @@ dependencies = [
 "zstd",
 ]

+[[package]]
+name = "zmij"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30e0d8dffbae3d840f64bda38e28391faef673a7b5a6017840f2a106c8145868"
+
 [[package]]
 name = "zstd"
 version = "0.11.2+zstd.1.5.2"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,6 +45,7 @@ ty = { path = "crates/ty" }
 ty_combine = { path = "crates/ty_combine" }
 ty_completion_eval = { path = "crates/ty_completion_eval" }
 ty_ide = { path = "crates/ty_ide" }
+ty_module_resolver = { path = "crates/ty_module_resolver" }
 ty_project = { path = "crates/ty_project", default-features = false }
 ty_python_semantic = { path = "crates/ty_python_semantic" }
 ty_server = { path = "crates/ty_server" }
@@ -57,8 +58,8 @@ anstream = { version = "0.6.18" }
 anstyle = { version = "1.0.10" }
 anyhow = { version = "1.0.80" }
 arc-swap = { version = "1.7.1" }
-assert_fs = { version = "1.1.0" }
 argfile = { version = "0.2.0" }
+assert_fs = { version = "1.1.0" }
 bincode = { version = "2.0.0" }
 bitflags = { version = "2.5.0" }
 bitvec = { version = "1.0.1", default-features = false, features = [
@@ -70,31 +71,31 @@ camino = { version = "1.1.7" }
 clap = { version = "4.5.3", features = ["derive"] }
 clap_complete_command = { version = "0.6.0" }
 clearscreen = { version = "4.0.0" }
-csv = { version = "1.3.1" }
-divan = { package = "codspeed-divan-compat", version = "4.0.4" }
 codspeed-criterion-compat = { version = "4.0.4", default-features = false }
 colored = { version = "3.0.0" }
+compact_str = "0.9.0"
 console_error_panic_hook = { version = "0.1.7" }
 console_log = { version = "1.0.0" }
 countme = { version = "3.0.1" }
-compact_str = "0.9.0"
-criterion = { version = "0.7.0", default-features = false }
+criterion = { version = "0.8.0", default-features = false }
 crossbeam = { version = "0.8.4" }
+csv = { version = "1.3.1" }
 dashmap = { version = "6.0.1" }
 datatest-stable = { version = "0.3.3" }
-dir-test = { version = "0.4.0" }
-dunce = { version = "1.0.5" }
+divan = { package = "codspeed-divan-compat", version = "4.0.4" }
 drop_bomb = { version = "0.1.5" }
+dunce = { version = "1.0.5" }
 etcetera = { version = "0.11.0" }
 fern = { version = "0.7.0" }
 filetime = { version = "0.2.23" }
-getrandom = { version = "0.3.1" }
 get-size2 = { version = "0.7.3", features = [
    "derive",
    "smallvec",
    "hashbrown",
    "compact-str",
+    "ordermap"
 ] }
+getrandom = { version = "0.3.1" }
 glob = { version = "0.3.1" }
 globset = { version = "0.4.14" }
 globwalk = { version = "0.9.1" }
@@ -116,8 +117,8 @@ is-macro = { version = "0.3.5" }
 is-wsl = { version = "0.4.0" }
 itertools = { version = "0.14.0" }
 jiff = { version = "0.2.0" }
-js-sys = { version = "0.3.69" }
 jod-thread = { version = "1.0.0" }
+js-sys = { version = "0.3.69" }
 libc = { version = "0.2.153" }
 libcst = { version = "1.8.4", default-features = false }
 log = { version = "0.4.17" }
@@ -139,6 +140,8 @@ pretty_assertions = "1.3.0"
 proc-macro2 = { version = "1.0.79" }
 pyproject-toml = { version = "0.13.4" }
 quick-junit = { version = "0.5.0" }
+quickcheck = { version = "1.0.3", default-features = false }
+quickcheck_macros = { version = "1.0.0" }
 quote = { version = "1.0.23" }
 rand = { version = "0.9.0" }
 rayon = { version = "1.10.0" }
@@ -147,7 +150,7 @@ regex-automata = { version = "0.4.9" }
 rustc-hash = { version = "2.0.0" }
 rustc-stable-hash = { version = "0.1.2" }
 # When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
-salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "55e5e7d32fa3fc189276f35bb04c9438f9aedbd1", default-features = false, features = [
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "9860ff6ca0f1f8f3a8d6b832020002790b501254", default-features = false, features = [
    "compact_str",
    "macros",
    "salsa_unstable",
@@ -195,9 +198,9 @@ tryfn = { version = "0.2.1" }
 typed-arena = { version = "2.0.2" }
 unic-ucd-category = { version = "0.9" }
 unicode-ident = { version = "1.0.12" }
+unicode-normalization = { version = "0.1.23" }
 unicode-width = { version = "0.2.0" }
 unicode_names2 = { version = "1.2.2" }
-unicode-normalization = { version = "0.1.23" }
 url = { version = "2.5.0" }
 uuid = { version = "1.6.1", features = ["v4", "fast-rng", "macro-diagnostics"] }
 walkdir = { version = "2.3.2" }
@@ -207,8 +210,13 @@ wild = { version = "2" }
 zip = { version = "0.6.6", default-features = false }

 [workspace.metadata.cargo-shear]
-ignored = ["getrandom", "ruff_options_metadata", "uuid", "get-size2", "ty_completion_eval"]
-
+ignored = [
+    "getrandom",
+    "ruff_options_metadata",
+    "uuid",
+    "get-size2",
+    "ty_completion_eval",
+]

 [workspace.lints.rust]
 unsafe_code = "warn"
@@ -268,17 +276,10 @@ if_not_else = "allow"
 # Diagnostics are not actionable: Enable once https://github.com/rust-lang/rust-clippy/issues/13774 is resolved.
 large_stack_arrays = "allow"

-
 [profile.release]
 lto = "fat"
 codegen-units = 16

-# Profile to build a minimally sized binary for ruff/ty
-[profile.minimal-size]
-inherits = "release"
-opt-level = "z"
-codegen-units = 1
-
 # Some crates don't change as much but benefit more from
 # more expensive optimization passes, so we selectively
 # decrease codegen-units in some cases.
@@ -289,6 +290,12 @@ codegen-units = 1
 [profile.release.package.salsa]
 codegen-units = 1

+# Profile to build a minimally sized binary for ruff/ty
+[profile.minimal-size]
+inherits = "release"
+opt-level = "z"
+codegen-units = 1
+
 [profile.dev.package.insta]
 opt-level = 3

@@ -328,6 +335,11 @@ strip = false
 debug = "full"
 lto = false

+# Profile for faster iteration: applies minimal optimizations for faster tests.
+[profile.fast-test]
+inherits = "dev"
+opt-level = 1
+
 # The profile that 'cargo dist' will build with.
 [profile.dist]
 inherits = "release"
--- a/README.md
+++ b/README.md
@@ -150,8 +150,8 @@ curl -LsSf https://astral.sh/ruff/install.sh | sh
 powershell -c "irm https://astral.sh/ruff/install.ps1 | iex"

 # For a specific version.
-curl -LsSf https://astral.sh/ruff/0.14.9/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.14.9/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.14.11/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.14.11/install.ps1 | iex"
 ```

 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -184,7 +184,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
  # Ruff version.
-  rev: v0.14.9
+  rev: v0.14.11
  hooks:
    # Run the linter.
    - id: ruff-check
--- a/_typos.toml
+++ b/_typos.toml
@@ -4,6 +4,7 @@ extend-exclude = [
    "crates/ty_vendored/vendor/**/*",
    "**/resources/**/*",
    "**/snapshots/**/*",
+    "crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/collection_literal.rs",
    # Completion tests tend to have a lot of incomplete
    # words naturally. It's annoying to have to make all
    # of them actually words. So just ignore typos here.
--- a/crates/ruff/Cargo.toml
+++ b/crates/ruff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.14.9"
+version = "0.14.11"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }
@@ -12,6 +12,13 @@ license = { workspace = true }
 readme = "../../README.md"
 default-run = "ruff"

+[package.metadata.cargo-shear]
+# Used via macro expansion.
+ignored = ["jiff"]
+
+[package.metadata.dist]
+dist = true
+
 [dependencies]
 ruff_cache = { workspace = true }
 ruff_db = { workspace = true, default-features = false, features = ["os"] }
@@ -41,6 +48,7 @@ colored = { workspace = true }
 filetime = { workspace = true }
 globwalk = { workspace = true }
 ignore = { workspace = true }
+indexmap = { workspace = true }
 is-macro = { workspace = true }
 itertools = { workspace = true }
 jiff = { workspace = true }
@@ -61,6 +69,12 @@ tracing = { workspace = true, features = ["log"] }
 walkdir = { workspace = true }
 wild = { workspace = true }

+[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), not(target_os = "aix"), not(target_os = "android"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dependencies]
+tikv-jemallocator = { workspace = true }
+
+[target.'cfg(target_os = "windows")'.dependencies]
+mimalloc = { workspace = true }
+
 [dev-dependencies]
 # Enable test rules during development
 ruff_linter = { workspace = true, features = ["clap", "test-rules"] }
@@ -76,18 +90,5 @@ ruff_python_trivia = { workspace = true }
 tempfile = { workspace = true }
 test-case = { workspace = true }

-[package.metadata.cargo-shear]
-# Used via macro expansion.
-ignored = ["jiff"]
-
-[package.metadata.dist]
-dist = true
-
-[target.'cfg(target_os = "windows")'.dependencies]
-mimalloc = { workspace = true }
-
-[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), not(target_os = "aix"), not(target_os = "android"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dependencies]
-tikv-jemallocator = { workspace = true }
-
 [lints]
 workspace = true
--- a/crates/ruff/src/commands/analyze_graph.rs
+++ b/crates/ruff/src/commands/analyze_graph.rs
@@ -2,6 +2,7 @@ use crate::args::{AnalyzeGraphArgs, ConfigArguments};
 use crate::resolve::resolve;
 use crate::{ExitStatus, resolve_default_files};
 use anyhow::Result;
+use indexmap::IndexSet;
 use log::{debug, warn};
 use path_absolutize::CWD;
 use ruff_db::system::{SystemPath, SystemPathBuf};
@@ -11,7 +12,7 @@ use ruff_linter::source_kind::SourceKind;
 use ruff_linter::{warn_user, warn_user_once};
 use ruff_python_ast::{PySourceType, SourceType};
 use ruff_workspace::resolver::{ResolvedFile, match_exclusion, python_files_in_path};
-use rustc_hash::FxHashMap;
+use rustc_hash::{FxBuildHasher, FxHashMap};
 use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};
@@ -59,17 +60,34 @@ pub(crate) fn analyze_graph(
        })
        .collect::<FxHashMap<_, _>>();

-    // Create a database from the source roots.
-    let src_roots = package_roots
-        .values()
-        .filter_map(|package| package.as_deref())
-        .filter_map(|package| package.parent())
-        .map(Path::to_path_buf)
-        .filter_map(|path| SystemPathBuf::from_path_buf(path).ok())
-        .collect();
+    // Create a database from the source roots, combining configured `src` paths with detected
+    // package roots. Configured paths are added first so they take precedence, and duplicates
+    // are removed.
+    let mut src_roots: IndexSet<SystemPathBuf, FxBuildHasher> = IndexSet::default();
+
+    // Add configured `src` paths first (for precedence), filtering to only include existing
+    // directories.
+    src_roots.extend(
+        pyproject_config
+            .settings
+            .linter
+            .src
+            .iter()
+            .filter(|path| path.is_dir())
+            .filter_map(|path| SystemPathBuf::from_path_buf(path.clone()).ok()),
+    );
+
+    // Add detected package roots.
+    src_roots.extend(
+        package_roots
+            .values()
+            .filter_map(|package| package.as_deref())
+            .filter_map(|path| path.parent())
+            .filter_map(|path| SystemPathBuf::from_path_buf(path.to_path_buf()).ok()),
+    );

    let db = ModuleDb::from_src_roots(
-        src_roots,
+        src_roots.into_iter().collect(),
        pyproject_config
            .settings
            .analyze
--- a/crates/ruff/src/commands/format.rs
+++ b/crates/ruff/src/commands/format.rs
@@ -1305,7 +1305,7 @@ mod tests {
        settings.add_filter(r"(Panicked at) [^:]+:\d+:\d+", "$1 <location>");
        let _s = settings.bind_to_scope();

-        assert_snapshot!(str::from_utf8(&buf)?, @r"
+        assert_snapshot!(str::from_utf8(&buf)?, @"
        io: test.py: Permission denied
        --> test.py:1:1

--- a/crates/ruff/src/commands/show_settings.rs
+++ b/crates/ruff/src/commands/show_settings.rs
@@ -29,10 +29,10 @@ pub(crate) fn show_settings(
        bail!("No files found under the given path");
    };

-    let settings = resolver.resolve(&path);
+    let (settings, config_path) = resolver.resolve_with_path(&path);

    writeln!(writer, "Resolved settings for: \"{}\"", path.display())?;
-    if let Some(settings_path) = pyproject_config.path.as_ref() {
+    if let Some(settings_path) = config_path {
        writeln!(writer, "Settings path: \"{}\"", settings_path.display())?;
    }
    write!(writer, "{settings}")?;
--- a/crates/ruff/src/commands/snapshots/ruffcommandschecktestE902_E902.py.snap
+++ b/crates/ruff/src/commands/snapshots/ruffcommandschecktestE902_E902.py.snap
@@ -4,4 +4,3 @@ source: crates/ruff/src/commands/check.rs
 /home/ferris/project/code.py:1:1: E902 Permission denied (os error 13)
 /home/ferris/project/notebook.ipynb:1:1: E902 Permission denied (os error 13)
 /home/ferris/project/pyproject.toml:1:1: E902 Permission denied (os error 13)
-
--- a/crates/ruff/src/snapshots/ruffversiontests__version_formatting.snap
+++ b/crates/ruff/src/snapshots/ruffversiontests__version_formatting.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/ruff/src/version.rs
 expression: version
-snapshot_kind: text
 ---
 0.0.0
--- a/crates/ruff/src/snapshots/ruffversiontests__version_formatting_with_commit_info.snap
+++ b/crates/ruff/src/snapshots/ruffversiontests__version_formatting_with_commit_info.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/ruff/src/version.rs
 expression: version
-snapshot_kind: text
 ---
 0.0.0 (53b0f5d92 2023-10-19)
--- a/crates/ruff/src/snapshots/ruffversiontests__version_formatting_with_commits_since_last_tag.snap
+++ b/crates/ruff/src/snapshots/ruffversiontests__version_formatting_with_commits_since_last_tag.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/ruff/src/version.rs
 expression: version
-snapshot_kind: text
 ---
 0.0.0+24 (53b0f5d92 2023-10-19)
--- a/crates/ruff/src/snapshots/ruffversiontests__version_serializable.snap
+++ b/crates/ruff/src/snapshots/ruffversiontests__version_serializable.snap
@@ -1,7 +1,6 @@
 ---
 source: crates/ruff/src/version.rs
 expression: version
-snapshot_kind: text
 ---
 {
  "version": "0.0.0",
--- a/crates/ruff/tests/analyze_graph.rs
+++ b/crates/ruff/tests/analyze_graph.rs
@@ -132,29 +132,29 @@ fn dependents() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().arg("--direction").arg("dependents").current_dir(&root), @r###"
-            success: true
-            exit_code: 0
-            ----- stdout -----
-            {
-              "ruff/__init__.py": [],
-              "ruff/a.py": [],
-              "ruff/b.py": [
-                "ruff/a.py"
-              ],
-              "ruff/c.py": [
-                "ruff/b.py"
-              ],
-              "ruff/d.py": [
-                "ruff/c.py"
-              ],
-              "ruff/e.py": [
-                "ruff/d.py"
-              ]
-            }
+        assert_cmd_snapshot!(command().arg("--direction").arg("dependents").current_dir(&root), @r#"
+        success: true
+        exit_code: 0
+        ----- stdout -----
+        {
+          "ruff/__init__.py": [],
+          "ruff/a.py": [],
+          "ruff/b.py": [
+            "ruff/a.py"
+          ],
+          "ruff/c.py": [
+            "ruff/b.py"
+          ],
+          "ruff/d.py": [
+            "ruff/c.py"
+          ],
+          "ruff/e.py": [
+            "ruff/d.py"
+          ]
+        }

-            ----- stderr -----
-            "###);
+        ----- stderr -----
+        "#);
    });

    Ok(())
@@ -184,21 +184,21 @@ fn string_detection() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r###"
-            success: true
-            exit_code: 0
-            ----- stdout -----
-            {
-              "ruff/__init__.py": [],
-              "ruff/a.py": [
-                "ruff/b.py"
-              ],
-              "ruff/b.py": [],
-              "ruff/c.py": []
-            }
+        assert_cmd_snapshot!(command().current_dir(&root), @r#"
+        success: true
+        exit_code: 0
+        ----- stdout -----
+        {
+          "ruff/__init__.py": [],
+          "ruff/a.py": [
+            "ruff/b.py"
+          ],
+          "ruff/b.py": [],
+          "ruff/c.py": []
+        }

-            ----- stderr -----
-            "###);
+        ----- stderr -----
+        "#);
    });

    insta::with_settings!({
@@ -319,7 +319,7 @@ fn globs() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r###"
+        assert_cmd_snapshot!(command().current_dir(&root), @r#"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -340,7 +340,7 @@ fn globs() -> Result<()> {
        }

        ----- stderr -----
-        "###);
+        "#);
    });

    Ok(())
@@ -368,7 +368,7 @@ fn exclude() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r###"
+        assert_cmd_snapshot!(command().current_dir(&root), @r#"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -381,7 +381,7 @@ fn exclude() -> Result<()> {
        }

        ----- stderr -----
-        "###);
+        "#);
    });

    Ok(())
@@ -421,7 +421,7 @@ fn wildcard() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r###"
+        assert_cmd_snapshot!(command().current_dir(&root), @r#"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -443,7 +443,7 @@ fn wildcard() -> Result<()> {
        }

        ----- stderr -----
-        "###);
+        "#);
    });

    Ok(())
@@ -639,7 +639,7 @@ fn venv() -> Result<()> {
    }, {
        assert_cmd_snapshot!(
            command().args(["--python", "none"]).arg("packages/albatross").current_dir(&root),
-            @r"
+            @"
        success: false
        exit_code: 2
        ----- stdout -----
@@ -695,7 +695,7 @@ fn notebook_basic() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r###"
+        assert_cmd_snapshot!(command().current_dir(&root), @r#"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -708,7 +708,122 @@ fn notebook_basic() -> Result<()> {
        }

        ----- stderr -----
-        "###);
+        "#);
+    });
+
+    Ok(())
+}
+
+/// Test that the `src` configuration option is respected.
+///
+/// This is useful for monorepos where there are multiple source directories that need to be
+/// included in the module resolution search path.
+#[test]
+fn src_option() -> Result<()> {
+    let tempdir = TempDir::new()?;
+    let root = ChildPath::new(tempdir.path());
+
+    // Create a lib directory with a package.
+    root.child("lib")
+        .child("mylib")
+        .child("__init__.py")
+        .write_str("def helper(): pass")?;
+
+    // Create an app directory with a file that imports from mylib.
+    root.child("app").child("__init__.py").write_str("")?;
+    root.child("app")
+        .child("main.py")
+        .write_str("from mylib import helper")?;
+
+    // Without src configured, the import from mylib won't resolve.
+    insta::with_settings!({
+        filters => INSTA_FILTERS.to_vec(),
+    }, {
+        assert_cmd_snapshot!(command().arg("app").current_dir(&root), @r#"
+        success: true
+        exit_code: 0
+        ----- stdout -----
+        {
+          "app/__init__.py": [],
+          "app/main.py": []
+        }
+
+        ----- stderr -----
+        "#);
+    });
+
+    // With src = ["lib"], the import should resolve.
+    root.child("ruff.toml").write_str(indoc::indoc! {r#"
+        src = ["lib"]
+    "#})?;
+
+    insta::with_settings!({
+        filters => INSTA_FILTERS.to_vec(),
+    }, {
+        assert_cmd_snapshot!(command().arg("app").current_dir(&root), @r#"
+        success: true
+        exit_code: 0
+        ----- stdout -----
+        {
+          "app/__init__.py": [],
+          "app/main.py": [
+            "lib/mylib/__init__.py"
+          ]
+        }
+
+        ----- stderr -----
+        "#);
+    });
+
+    Ok(())
+}
+
+/// Test that glob patterns in `src` are expanded.
+#[test]
+fn src_glob_expansion() -> Result<()> {
+    let tempdir = TempDir::new()?;
+    let root = ChildPath::new(tempdir.path());
+
+    // Create multiple lib directories with packages.
+    root.child("libs")
+        .child("lib_a")
+        .child("pkg_a")
+        .child("__init__.py")
+        .write_str("def func_a(): pass")?;
+    root.child("libs")
+        .child("lib_b")
+        .child("pkg_b")
+        .child("__init__.py")
+        .write_str("def func_b(): pass")?;
+
+    // Create an app that imports from both packages.
+    root.child("app").child("__init__.py").write_str("")?;
+    root.child("app")
+        .child("main.py")
+        .write_str("from pkg_a import func_a\nfrom pkg_b import func_b")?;
+
+    // Use a glob pattern to include all lib directories.
+    root.child("ruff.toml").write_str(indoc::indoc! {r#"
+        src = ["libs/*"]
+    "#})?;
+
+    insta::with_settings!({
+        filters => INSTA_FILTERS.to_vec(),
+    }, {
+        assert_cmd_snapshot!(command().arg("app").current_dir(&root), @r#"
+        success: true
+        exit_code: 0
+        ----- stdout -----
+        {
+          "app/__init__.py": [],
+          "app/main.py": [
+            "libs/lib_a/pkg_a/__init__.py",
+            "libs/lib_b/pkg_b/__init__.py"
+          ]
+        }
+
+        ----- stderr -----
+        "#);
    });

    Ok(())
@@ -765,7 +880,7 @@ fn notebook_with_magic() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r###"
+        assert_cmd_snapshot!(command().current_dir(&root), @r#"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -778,7 +893,7 @@ fn notebook_with_magic() -> Result<()> {
        }

        ----- stderr -----
-        "###);
+        "#);
    });

    Ok(())
--- a/crates/ruff/tests/cli/analyze_graph.rs
+++ b/crates/ruff/tests/cli/analyze_graph.rs
@@ -29,7 +29,7 @@ fn type_checking_imports() -> anyhow::Result<()> {
        ("ruff/c.py", ""),
    ])?;

-    assert_cmd_snapshot!(test.command(), @r###"
+    assert_cmd_snapshot!(test.command(), @r#"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -46,12 +46,12 @@ fn type_checking_imports() -> anyhow::Result<()> {
    }

    ----- stderr -----
-    "###);
+    "#);

    assert_cmd_snapshot!(
        test.command()
            .arg("--no-type-checking-imports"),
-        @r###"
+        @r#"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -65,7 +65,7 @@ fn type_checking_imports() -> anyhow::Result<()> {
    }

    ----- stderr -----
-    "###
+    "#
    );

    Ok(())
@@ -103,7 +103,7 @@ fn type_checking_imports_from_config() -> anyhow::Result<()> {
        ),
    ])?;

-    assert_cmd_snapshot!(test.command(), @r###"
+    assert_cmd_snapshot!(test.command(), @r#"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -117,7 +117,7 @@ fn type_checking_imports_from_config() -> anyhow::Result<()> {
    }

    ----- stderr -----
-    "###);
+    "#);

    test.write_file(
        "ruff.toml",
@@ -127,7 +127,7 @@ fn type_checking_imports_from_config() -> anyhow::Result<()> {
        "#,
    )?;

-    assert_cmd_snapshot!(test.command(), @r###"
+    assert_cmd_snapshot!(test.command(), @r#"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -144,7 +144,7 @@ fn type_checking_imports_from_config() -> anyhow::Result<()> {
    }

    ----- stderr -----
-    "###
+    "#
    );

    Ok(())
--- a/crates/ruff/tests/cli/format.rs
+++ b/crates/ruff/tests/cli/format.rs
@@ -51,7 +51,7 @@ fn default_files() -> Result<()> {

    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
-        .arg("--check"), @r"
+        .arg("--check"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -71,7 +71,7 @@ fn format_warn_stdin_filename_with_files() -> Result<()> {
    assert_cmd_snapshot!(test.format_command()
        .args(["--isolated", "--stdin-filename", "foo.py"])
        .arg("foo.py")
-        .pass_stdin("foo =     1"), @r"
+        .pass_stdin("foo =     1"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -87,7 +87,7 @@ fn format_warn_stdin_filename_with_files() -> Result<()> {
 fn nonexistent_config_file() -> Result<()> {
    let test = CliTest::new()?;
    assert_cmd_snapshot!(test.format_command()
-        .args(["--config", "foo.toml", "."]), @r"
+        .args(["--config", "foo.toml", "."]), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -111,7 +111,7 @@ fn nonexistent_config_file() -> Result<()> {
 fn config_override_rejected_if_invalid_toml() -> Result<()> {
    let test = CliTest::new()?;
    assert_cmd_snapshot!(test.format_command()
-        .args(["--config", "foo = bar", "."]), @r"
+        .args(["--config", "foo = bar", "."]), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -145,7 +145,7 @@ fn too_many_config_files() -> Result<()> {
        .arg("ruff.toml")
        .arg("--config")
        .arg("ruff2.toml")
-        .arg("."), @r"
+        .arg("."), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -168,7 +168,7 @@ fn config_file_and_isolated() -> Result<()> {
        .arg("--isolated")
        .arg("--config")
        .arg("ruff.toml")
-        .arg("."), @r"
+        .arg("."), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -390,7 +390,7 @@ fn mixed_line_endings() -> Result<()> {
    assert_cmd_snapshot!(test.format_command()
        .arg("--diff")
        .arg("--isolated")
-        .arg("."), @r"
+        .arg("."), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -446,7 +446,7 @@ OTHER = "OTHER"
        // Explicitly pass test.py, should be formatted regardless of it being excluded by format.exclude
        .arg("test.py")
        // Format all other files in the directory, should respect the `exclude` and `format.exclude` options
-        .arg("."), @r"
+        .arg("."), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -469,7 +469,7 @@ fn deduplicate_directory_and_explicit_file() -> Result<()> {
            .arg("--check")
            .arg(".")
            .arg("main.py"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -495,7 +495,7 @@ from module import =
    assert_cmd_snapshot!(test.format_command()
        .arg("--check")
        .arg("--isolated")
-        .arg("main.py"), @r"
+        .arg("main.py"), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -522,7 +522,7 @@ if __name__ == "__main__":
    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
        .arg("--check")
-        .arg("main.py"), @r"
+        .arg("main.py"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -534,7 +534,7 @@ if __name__ == "__main__":

    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
-        .arg("main.py"), @r"
+        .arg("main.py"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -545,7 +545,7 @@ if __name__ == "__main__":

    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
-        .arg("main.py"), @r"
+        .arg("main.py"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -614,7 +614,7 @@ fn output_format_notebook() -> Result<()> {

    assert_cmd_snapshot!(
        test.format_command().args(["--isolated", "--preview", "--check"]).arg(path),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -672,7 +672,7 @@ if __name__ == "__main__":
    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
        .arg("--exit-non-zero-on-format")
-        .arg("main.py"), @r"
+        .arg("main.py"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -685,7 +685,7 @@ if __name__ == "__main__":
    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
        .arg("--exit-non-zero-on-format")
-        .arg("main.py"), @r"
+        .arg("main.py"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -701,7 +701,7 @@ if __name__ == "__main__":
    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
        .arg("--exit-non-zero-on-fix")
-        .arg("main.py"), @r"
+        .arg("main.py"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -714,7 +714,7 @@ if __name__ == "__main__":
    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
        .arg("--exit-non-zero-on-fix")
-        .arg("main.py"), @r"
+        .arg("main.py"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -771,7 +771,7 @@ OTHER = "OTHER"
        // Explicitly pass test.py, should not be formatted because of --force-exclude
        .arg("test.py")
        // Format all other files in the directory, should respect the `exclude` and `format.exclude` options
-        .arg("."), @r"
+        .arg("."), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -931,7 +931,7 @@ tab-size = 2
            .pass_stdin(r"
 if True:
    pass
-    "), @r"
+    "), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1144,7 +1144,7 @@ def say_hy(name: str):
    assert_cmd_snapshot!(test.format_command()
        .arg("--config")
        .arg("ruff.toml")
-        .arg("test.py"), @r"
+        .arg("test.py"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1184,7 +1184,7 @@ def say_hy(name: str):
    assert_cmd_snapshot!(test.format_command()
        .arg("--config")
        .arg("ruff.toml")
-        .arg("test.py"), @r"
+        .arg("test.py"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1216,7 +1216,7 @@ def say_hy(name: str):
    assert_cmd_snapshot!(test.format_command()
        .arg("--config")
        .arg("ruff.toml")
-        .arg("test.py"), @r"
+        .arg("test.py"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1246,7 +1246,7 @@ fn test_diff() -> Result<()> {

    assert_cmd_snapshot!(
        test.format_command().args(["--isolated", "--diff"]).args(paths),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1311,7 +1311,7 @@ fn test_diff_no_change() -> Result<()> {
    let paths = [fixtures.join("unformatted.py")];
    assert_cmd_snapshot!(
        test.format_command().args(["--isolated", "--diff"]).args(paths),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1341,7 +1341,7 @@ fn test_diff_stdin_unformatted() -> Result<()> {
        test.format_command()
            .args(["--isolated", "--diff", "-", "--stdin-filename", "unformatted.py"])
            .pass_stdin(unformatted),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1366,7 +1366,7 @@ fn test_diff_stdin_formatted() -> Result<()> {
    let unformatted = fs::read(fixtures.join("formatted.py")).unwrap();
    assert_cmd_snapshot!(
        test.format_command().args(["--isolated", "--diff", "-"]).pass_stdin(unformatted),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1873,7 +1873,7 @@ include = ["*.ipy"]
    assert_cmd_snapshot!(test.format_command()
        .args(["--config", "ruff.toml"])
        .args(["--extension", "ipy:ipynb"])
-        .arg("."), @r"
+        .arg("."), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1938,7 +1938,7 @@ include = ["*.ipy"]
    assert_cmd_snapshot!(test.format_command()
        .args(["--config", "ruff.toml"])
        .args(["--extension", "ipy:ipynb"])
-        .arg("."), @r"
+        .arg("."), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2021,7 +2021,7 @@ def file2(arg1, arg2,):
    assert_cmd_snapshot!(test.format_command()
        .args(["--isolated", "--range=1:8-1:15"])
        .arg("file1.py")
-        .arg("file2.py"),  @r"
+        .arg("file2.py"),  @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2068,7 +2068,7 @@ fn range_start_larger_than_end() -> Result<()> {
 def foo(arg1, arg2,):
    print("Shouldn't format this" )

-"#), @r"
+"#), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2168,7 +2168,7 @@ fn range_missing_line() -> Result<()> {
 def foo(arg1, arg2,):
    print("Should format this" )

-"#), @r"
+"#), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2192,7 +2192,7 @@ fn zero_line_number() -> Result<()> {
 def foo(arg1, arg2,):
    print("Should format this" )

-"#), @r"
+"#), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2217,7 +2217,7 @@ fn column_and_line_zero() -> Result<()> {
 def foo(arg1, arg2,):
    print("Should format this" )

-"#), @r"
+"#), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2274,7 +2274,7 @@ fn range_formatting_notebook() -> Result<()> {
 "nbformat": 4,
 "nbformat_minor": 5
 }
-"#), @r"
+"#), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2355,7 +2355,7 @@ fn cookiecutter_globbing() -> Result<()> {
    ])?;

    assert_cmd_snapshot!(test.format_command()
-            .args(["--isolated", "--diff", "."]), @r"
+            .args(["--isolated", "--diff", "."]), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2374,7 +2374,7 @@ fn stable_output_format_warning() -> Result<()> {
        test.format_command()
            .args(["--output-format=full", "-"])
            .pass_stdin(""),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
--- a/crates/ruff/tests/cli/lint.rs
+++ b/crates/ruff/tests/cli/lint.rs
--- a/crates/ruff/tests/cli/snapshots/cliformatoutput_format_github.snap
+++ b/crates/ruff/tests/cli/snapshots/cliformatoutput_format_github.snap
@@ -14,6 +14,6 @@ info:
 success: false
 exit_code: 1
 ----- stdout -----
-::error title=Ruff (unformatted),file=[TMP]/input.py,line=1,col=1,endLine=2,endColumn=1::input.py:1:1: unformatted: File would be reformatted
+::error title=Ruff (unformatted),file=[TMP]/input.py,line=1,endLine=2::input.py:1:1: unformatted: File would be reformatted

 ----- stderr -----
--- a/crates/ruff/tests/cli/snapshots/clilintflake8_import_convention_unused_aliased_import.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintflake8_import_convention_unused_aliased_import.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
@@ -17,7 +17,6 @@ info:
    - "--fix"
    - "-"
  stdin: "1"
-snapshot_kind: text
 ---
 success: false
 exit_code: 2
--- a/crates/ruff/tests/cli/snapshots/clilintflake8_import_convention_unused_aliased_import_no_conflict.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintflake8_import_convention_unused_aliased_import_no_conflict.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_azure.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_azure.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_concise.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_concise.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_full.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_full.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_github.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_github.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_gitlab.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_gitlab.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_grouped.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_grouped.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_json-lines.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_json-lines.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_json.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_json.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_junit.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_junit.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_pylint.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_pylint.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_rdjson.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_rdjson.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_sarif.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_sarif.snap
@@ -12,7 +12,6 @@ info:
    - "--target-version"
    - py39
    - input.py
-snapshot_kind: text
 ---
 success: false
 exit_code: 1
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_concise.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_concise.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_full.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_full.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_grouped.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_grouped.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_extend_from_shared_config.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_extend_from_shared_config.snap
@@ -125,7 +125,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.functions_names = [
+linter.flake8_gettext.function_names = [
 	_,
 	gettext,
 	ngettext,
@@ -261,6 +261,7 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
+linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_no_tool.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_no_tool.snap
@@ -127,7 +127,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.functions_names = [
+linter.flake8_gettext.function_names = [
 	_,
 	gettext,
 	ngettext,
@@ -263,6 +263,7 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
+linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_no_tool_preview_enabled.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_no_tool_preview_enabled.snap
@@ -129,7 +129,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.functions_names = [
+linter.flake8_gettext.function_names = [
 	_,
 	gettext,
 	ngettext,
@@ -265,6 +265,7 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
+linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_no_tool_target_version_override.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_no_tool_target_version_override.snap
@@ -129,7 +129,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.functions_names = [
+linter.flake8_gettext.function_names = [
 	_,
 	gettext,
 	ngettext,
@@ -265,6 +265,7 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
+linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_pyproject_toml_above.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_pyproject_toml_above.snap
@@ -126,7 +126,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.functions_names = [
+linter.flake8_gettext.function_names = [
 	_,
 	gettext,
 	ngettext,
@@ -262,6 +262,7 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
+linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_pyproject_toml_above_with_tool.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_pyproject_toml_above_with_tool.snap
@@ -16,6 +16,7 @@ success: true
 exit_code: 0
 ----- stdout -----
 Resolved settings for: "[TMP]/foo/test.py"
+Settings path: "[TMP]/foo/pyproject.toml"

 # General Settings
 cache_dir = "[TMP]/foo/.ruff_cache"
@@ -126,7 +127,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.functions_names = [
+linter.flake8_gettext.function_names = [
 	_,
 	gettext,
 	ngettext,
@@ -262,6 +263,7 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
+linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_ruff_toml_above-2.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_ruff_toml_above-2.snap
@@ -125,7 +125,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.functions_names = [
+linter.flake8_gettext.function_names = [
 	_,
 	gettext,
 	ngettext,
@@ -261,6 +261,7 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
+linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_ruff_toml_above.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_ruff_toml_above.snap
@@ -125,7 +125,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.functions_names = [
+linter.flake8_gettext.function_names = [
 	_,
 	gettext,
 	ngettext,
@@ -261,6 +261,7 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
+linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintrequires_python_ruff_toml_no_target_fallback.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintrequires_python_ruff_toml_no_target_fallback.snap
@@ -125,7 +125,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.functions_names = [
+linter.flake8_gettext.function_names = [
 	_,
 	gettext,
 	ngettext,
@@ -261,6 +261,7 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
+linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/cli/snapshots/clilintwarn_invalid_noqa_with_no_diagnostics.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintwarn_invalid_noqa_with_no_diagnostics.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/direxist_guard.rs
+++ b/crates/ruff/tests/direxist_guard.rs
@@ -18,13 +18,13 @@ fn check_in_deleted_directory_errors() {
    set_current_dir(&temp_path).unwrap();
    drop(temp_dir);

-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME)).arg("check"), @r###"
-            success: false
-            exit_code: 2
-            ----- stdout -----
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME)).arg("check"), @"
+    success: false
+    exit_code: 2
+    ----- stdout -----

-            ----- stderr -----
-            ruff failed
-              Cause: Working directory does not exist
-            "###);
+    ----- stderr -----
+    ruff failed
+      Cause: Working directory does not exist
+    ");
 }
--- a/crates/ruff/tests/integration_test.rs
+++ b/crates/ruff/tests/integration_test.rs
@@ -97,7 +97,7 @@ impl<'a> RuffCheck<'a> {
 fn stdin_success() {
    let mut cmd = RuffCheck::default().args([]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin(""), @r"
+        .pass_stdin(""), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -111,7 +111,7 @@ fn stdin_success() {
 fn stdin_error() {
    let mut cmd = RuffCheck::default().args([]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @r"
+        .pass_stdin("import os\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -136,7 +136,7 @@ fn stdin_filename() {
        .args(["--stdin-filename", "F401.py"])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @r"
+        .pass_stdin("import os\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -172,7 +172,7 @@ import bar   # unused import
    )?;

    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--isolated", "--no-cache", "--select", "F401"]).current_dir(tempdir.path()), @r"
+        .args(["check", "--isolated", "--no-cache", "--select", "F401"]).current_dir(tempdir.path()), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -208,7 +208,7 @@ fn check_warn_stdin_filename_with_files() {
        .filename("foo.py")
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @r"
+        .pass_stdin("import os\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -235,7 +235,7 @@ fn stdin_source_type_py() {
        .args(["--stdin-filename", "TCH.py"])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @r"
+        .pass_stdin("import os\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -261,7 +261,7 @@ fn stdin_source_type_pyi() {
        .args(["--stdin-filename", "TCH.pyi", "--select", "TCH"])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @r"
+        .pass_stdin("import os\n"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -294,7 +294,7 @@ fn stdin_json() {
 fn stdin_fix_py() {
    let mut cmd = RuffCheck::default().args(["--fix"]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\nimport sys\n\nprint(sys.version)\n"), @r"
+        .pass_stdin("import os\nimport sys\n\nprint(sys.version)\n"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -572,7 +572,7 @@ fn stdin_override_parser_ipynb() {
 },
 "nbformat": 4,
 "nbformat_minor": 5
-}"#), @r"
+}"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -610,7 +610,7 @@ fn stdin_override_parser_py() {
        ])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @r"
+        .pass_stdin("import os\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -633,7 +633,7 @@ fn stdin_override_parser_py() {
 fn stdin_fix_when_not_fixable_should_still_print_contents() {
    let mut cmd = RuffCheck::default().args(["--fix"]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\nimport sys\n\nif (1, 2):\n     print(sys.version)\n"), @r###"
+        .pass_stdin("import os\nimport sys\n\nif (1, 2):\n     print(sys.version)\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -654,14 +654,14 @@ fn stdin_fix_when_not_fixable_should_still_print_contents() {
      |

    Found 2 errors (1 fixed, 1 remaining).
-    "###);
+    ");
 }

 #[test]
 fn stdin_fix_when_no_issues_should_still_print_contents() {
    let mut cmd = RuffCheck::default().args(["--fix"]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import sys\n\nprint(sys.version)\n"), @r"
+        .pass_stdin("import sys\n\nprint(sys.version)\n"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -805,7 +805,7 @@ fn stdin_format_jupyter() {
 fn stdin_parse_error() {
    let mut cmd = RuffCheck::default().build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("from foo import\n"), @r"
+        .pass_stdin("from foo import\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -826,7 +826,7 @@ fn stdin_parse_error() {
 fn stdin_multiple_parse_error() {
    let mut cmd = RuffCheck::default().build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("from foo import\nbar =\n"), @r"
+        .pass_stdin("from foo import\nbar =\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -857,7 +857,7 @@ fn parse_error_not_included() {
    // Parse errors are always shown
    let mut cmd = RuffCheck::default().args(["--select=I"]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("foo =\n"), @r"
+        .pass_stdin("foo =\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -878,7 +878,7 @@ fn parse_error_not_included() {
 fn full_output_preview() {
    let mut cmd = RuffCheck::default().args(["--preview"]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("l = 1"), @r"
+        .pass_stdin("l = 1"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -907,7 +907,7 @@ preview = true
 ",
    )?;
    let mut cmd = RuffCheck::default().config(&pyproject_toml).build();
-    assert_cmd_snapshot!(cmd.pass_stdin("l = 1"), @r"
+    assert_cmd_snapshot!(cmd.pass_stdin("l = 1"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -929,7 +929,7 @@ preview = true
 fn full_output_format() {
    let mut cmd = RuffCheck::default().output_format("full").build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("l = 1"), @r"
+        .pass_stdin("l = 1"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -967,7 +967,7 @@ fn rule_f401_output_text() {

 #[test]
 fn rule_invalid_rule_name() {
-    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404"]), @r"
+    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404"]), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -981,7 +981,7 @@ fn rule_invalid_rule_name() {

 #[test]
 fn rule_invalid_rule_name_output_json() {
-    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404", "--output-format", "json"]), @r"
+    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404", "--output-format", "json"]), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -995,7 +995,7 @@ fn rule_invalid_rule_name_output_json() {

 #[test]
 fn rule_invalid_rule_name_output_text() {
-    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404", "--output-format", "text"]), @r"
+    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404", "--output-format", "text"]), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1016,7 +1016,7 @@ fn show_statistics() {
                         .pass_stdin(r#"
 def mvce(keys, values):
    return {key: value for key, value in zip(keys, values)}
-"#), @r"
+"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1037,7 +1037,7 @@ fn show_statistics_unsafe_fixes() {
                         .pass_stdin(r#"
 def mvce(keys, values):
    return {key: value for key, value in zip(keys, values)}
-"#), @r"
+"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1152,7 +1152,7 @@ fn show_statistics_partial_fix() {
        .args(["--select", "UP035", "--statistics"])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("from typing import List, AsyncGenerator"), @r"
+        .pass_stdin("from typing import List, AsyncGenerator"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1173,7 +1173,7 @@ fn show_statistics_syntax_errors() {
    // ParseError
    assert_cmd_snapshot!(
        cmd.pass_stdin("x ="),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1186,7 +1186,7 @@ fn show_statistics_syntax_errors() {
    // match before 3.10, UnsupportedSyntaxError
    assert_cmd_snapshot!(
        cmd.pass_stdin("match 2:\n  case 1: ..."),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1199,7 +1199,7 @@ fn show_statistics_syntax_errors() {
    // rebound comprehension variable, SemanticSyntaxError
    assert_cmd_snapshot!(
        cmd.pass_stdin("[x := 1 for x in range(0)]"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1216,7 +1216,7 @@ fn preview_enabled_prefix() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF9", "--output-format=concise", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1238,7 +1238,7 @@ fn preview_enabled_all() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "ALL", "--output-format=concise", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1265,7 +1265,7 @@ fn preview_enabled_direct() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF911", "--output-format=concise", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1282,7 +1282,7 @@ fn preview_disabled_direct() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF911", "--output-format=concise"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1299,7 +1299,7 @@ fn preview_disabled_prefix_empty() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF91", "--output-format=concise"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1316,7 +1316,7 @@ fn preview_disabled_does_not_warn_for_empty_ignore_selections() {
    let mut cmd = RuffCheck::default()
        .args(["--ignore", "RUF9", "--output-format=concise"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1332,7 +1332,7 @@ fn preview_disabled_does_not_warn_for_empty_fixable_selections() {
    let mut cmd = RuffCheck::default()
        .args(["--fixable", "RUF9", "--output-format=concise"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1354,7 +1354,7 @@ fn preview_group_selector() {
        ])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("I=42\n"), @r"
+        .pass_stdin("I=42\n"), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1379,7 +1379,7 @@ fn preview_enabled_group_ignore() {
            "--output-format=concise",
        ])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1400,7 +1400,7 @@ fn preview_enabled_group_ignore() {
 fn removed_direct() {
    // Selection of a removed rule should fail
    let mut cmd = RuffCheck::default().args(["--select", "RUF931"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1418,7 +1418,7 @@ fn removed_direct_multiple() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF930", "--select", "RUF931"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1436,7 +1436,7 @@ fn removed_indirect() {
    // Selection _including_ a removed rule without matching should not fail
    // nor should the rule be used
    let mut cmd = RuffCheck::default().args(["--select", "RUF93"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1449,7 +1449,7 @@ fn removed_indirect() {
 #[test]
 fn removed_ignore_direct() {
    let mut cmd = RuffCheck::default().args(["--ignore", "UP027"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1466,7 +1466,7 @@ fn removed_ignore_multiple_direct() {
    let mut cmd = RuffCheck::default()
        .args(["--ignore", "UP027", "--ignore", "PLR1706"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1482,7 +1482,7 @@ fn removed_ignore_multiple_direct() {
 #[test]
 fn removed_ignore_remapped_direct() {
    let mut cmd = RuffCheck::default().args(["--ignore", "PGH001"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1498,7 +1498,7 @@ fn removed_ignore_indirect() {
    // `PLR170` includes removed rules but should not select or warn
    // since it is not a "direct" selection
    let mut cmd = RuffCheck::default().args(["--ignore", "PLR170"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1512,7 +1512,7 @@ fn removed_ignore_indirect() {
 fn redirect_direct() {
    // Selection of a redirected rule directly should use the new rule and warn
    let mut cmd = RuffCheck::default().args(["--select", "RUF940"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1531,7 +1531,7 @@ fn redirect_indirect() {
    // Selection _including_ a redirected rule without matching should not fail
    // nor should the rule be used
    let mut cmd = RuffCheck::default().args(["--select", "RUF94"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1546,7 +1546,7 @@ fn redirect_prefix() {
    // Selection using a redirected prefix should switch to all rules in the
    // new prefix
    let mut cmd = RuffCheck::default().args(["--select", "RUF96"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1565,7 +1565,7 @@ fn deprecated_direct() {
    // Selection of a deprecated rule without preview enabled should still work
    // but a warning should be displayed
    let mut cmd = RuffCheck::default().args(["--select", "RUF920"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1586,7 +1586,7 @@ fn deprecated_multiple_direct() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF920", "--select", "RUF921"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1609,7 +1609,7 @@ fn deprecated_indirect() {
    // `RUF92` includes deprecated rules but should not warn
    // since it is not a "direct" selection
    let mut cmd = RuffCheck::default().args(["--select", "RUF92"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1625,7 +1625,7 @@ fn deprecated_direct_preview_enabled() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF920", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1642,7 +1642,7 @@ fn deprecated_indirect_preview_enabled() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF92", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1659,7 +1659,7 @@ fn deprecated_multiple_direct_preview_enabled() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF920", "--select", "RUF921", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1720,7 +1720,7 @@ fn unreadable_dir() -> Result<()> {
        .filename(unreadable_dir.to_str().unwrap())
        .args([])
        .build();
-    assert_cmd_snapshot!(cmd, @r###"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1728,7 +1728,7 @@ fn unreadable_dir() -> Result<()> {

    ----- stderr -----
    warning: Encountered error: Permission denied (os error 13)
-    "###);
+    ");
    Ok(())
 }

@@ -1758,7 +1758,7 @@ fn check_input_from_argfile() -> Result<()> {
        (file_a_path.display().to_string().as_str(), "/path/to/a.py"),
    ]}, {
        assert_cmd_snapshot!(cmd
-            .pass_stdin(""), @r"
+            .pass_stdin(""), @"
        success: false
        exit_code: 1
        ----- stdout -----
@@ -1787,17 +1787,17 @@ fn missing_argfile_reports_error() {
    insta::with_settings!({filters => vec![
        ("The system cannot find the file specified.", "No such file or directory")
    ]}, {
-        assert_cmd_snapshot!(cmd, @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
+        assert_cmd_snapshot!(cmd, @"
+        success: false
+        exit_code: 2
+        ----- stdout -----

-    ----- stderr -----
-    ruff failed
-      Cause: Failed to read CLI arguments from files
-      Cause: failed to open file `!.txt`
-      Cause: No such file or directory (os error 2)
-    ");
+        ----- stderr -----
+        ruff failed
+          Cause: Failed to read CLI arguments from files
+          Cause: failed to open file `!.txt`
+          Cause: No such file or directory (os error 2)
+        ");
    });
 }

@@ -1807,7 +1807,7 @@ fn check_hints_hidden_unsafe_fixes() {
        .args(["--select", "RUF901,RUF902"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1829,7 +1829,7 @@ fn check_hints_hidden_unsafe_fixes_with_no_safe_fixes() {
    let mut cmd = RuffCheck::default().args(["--select", "RUF902"]).build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("x = {'a': 1, 'a': 1}\n"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1849,7 +1849,7 @@ fn check_no_hint_for_hidden_unsafe_fixes_when_disabled() {
        .args(["--select", "RUF901,RUF902", "--no-unsafe-fixes"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1873,7 +1873,7 @@ fn check_no_hint_for_hidden_unsafe_fixes_with_no_safe_fixes_when_disabled() {
        .build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("x = {'a': 1, 'a': 1}\n"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1892,7 +1892,7 @@ fn check_shows_unsafe_fixes_with_opt_in() {
        .args(["--select", "RUF901,RUF902", "--unsafe-fixes"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1915,7 +1915,7 @@ fn fix_applies_safe_fixes_by_default() {
        .args(["--select", "RUF901,RUF902", "--fix"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1936,7 +1936,7 @@ fn fix_applies_unsafe_fixes_with_opt_in() {
        .args(["--select", "RUF901,RUF902", "--fix", "--unsafe-fixes"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1955,7 +1955,7 @@ fn fix_does_not_apply_display_only_fixes() {
        .build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("def add_to_list(item, some_list=[]): ..."),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1975,7 +1975,7 @@ fn fix_does_not_apply_display_only_fixes_with_unsafe_fixes_enabled() {
        .build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("def add_to_list(item, some_list=[]): ..."),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1994,7 +1994,7 @@ fn fix_only_unsafe_fixes_available() {
        .args(["--select", "RUF902", "--fix"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2014,7 +2014,7 @@ fn fix_only_flag_applies_safe_fixes_by_default() {
        .args(["--select", "RUF901,RUF902", "--fix-only"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2031,7 +2031,7 @@ fn fix_only_flag_applies_unsafe_fixes_with_opt_in() {
        .args(["--select", "RUF901,RUF902", "--fix-only", "--unsafe-fixes"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2049,7 +2049,7 @@ fn diff_shows_safe_fixes_by_default() {
        .args(["--select", "RUF901,RUF902", "--diff"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2069,7 +2069,7 @@ fn diff_shows_unsafe_fixes_with_opt_in() {
        .args(["--select", "RUF901,RUF902", "--diff", "--unsafe-fixes"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2091,7 +2091,7 @@ fn diff_does_not_show_display_only_fixes_with_unsafe_fixes_enabled() {
        .build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("def add_to_list(item, some_list=[]): ..."),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2106,7 +2106,7 @@ fn diff_only_unsafe_fixes_available() {
        .args(["--select", "RUF902", "--diff"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2134,7 +2134,7 @@ extend-unsafe-fixes = ["RUF901"]
        .args(["--select", "RUF901,RUF902"])
        .build();
    assert_cmd_snapshot!(cmd,
-            @r"
+            @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2170,7 +2170,7 @@ extend-safe-fixes = ["RUF902"]
        .args(["--select", "RUF901,RUF902"])
        .build();
    assert_cmd_snapshot!(cmd,
-            @r"
+            @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2208,7 +2208,7 @@ extend-safe-fixes = ["RUF902"]
        .args(["--select", "RUF901,RUF902"])
        .build();
    assert_cmd_snapshot!(cmd,
-            @r"
+            @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2248,7 +2248,7 @@ extend-safe-fixes = ["RUF9"]
        .build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\nprint(str('foo'))\nisinstance(x, (int, str))\n"),
-            @r"
+            @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2307,7 +2307,7 @@ def log(x, base) -> float:
        .args(["--select", "D41"])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin(stdin), @r"
+        .pass_stdin(stdin), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2360,7 +2360,7 @@ select = ["RUF017"]
    let mut cmd = RuffCheck::default().config(&ruff_toml).build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("x = [1, 2, 3]\ny = [4, 5, 6]\nsum([x, y], [])"),
-            @r"
+            @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2401,7 +2401,7 @@ unfixable = ["RUF"]
    let mut cmd = RuffCheck::default().config(&ruff_toml).build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("x = [1, 2, 3]\ny = [4, 5, 6]\nsum([x, y], [])"),
-            @r"
+            @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2431,7 +2431,7 @@ fn pyproject_toml_stdin_syntax_error() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2457,7 +2457,7 @@ fn pyproject_toml_stdin_schema_error() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project]\nname = 1"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2484,7 +2484,7 @@ fn pyproject_toml_stdin_no_applicable_rules_selected() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project"),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2503,7 +2503,7 @@ fn pyproject_toml_stdin_no_applicable_rules_selected_2() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project"),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2522,7 +2522,7 @@ fn pyproject_toml_stdin_no_errors() {

    assert_cmd_snapshot!(
        cmd.pass_stdin(r#"[project]\nname = "ruff"\nversion = "0.0.0""#),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2547,7 +2547,7 @@ fn pyproject_toml_stdin_schema_error_fix() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project]\nname = 1"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2581,7 +2581,7 @@ fn pyproject_toml_stdin_schema_error_fix_only() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project]\nname = 1"),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2607,7 +2607,7 @@ fn pyproject_toml_stdin_schema_error_fix_diff() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project]\nname = 1"),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
--- a/crates/ruff/tests/resolve_files.rs
+++ b/crates/ruff/tests/resolve_files.rs
@@ -29,7 +29,7 @@ fn check_project_include_defaults() {
        filters => TEST_FILTERS.to_vec()
    }, {
        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--show-files"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @r"
+        .args(["check", "--show-files"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -53,7 +53,7 @@ fn check_project_respects_direct_paths() {
        filters => TEST_FILTERS.to_vec()
    }, {
        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--show-files", "b.py"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @r"
+        .args(["check", "--show-files", "b.py"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -72,7 +72,7 @@ fn check_project_respects_subdirectory_includes() {
        filters => TEST_FILTERS.to_vec()
    }, {
        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--show-files", "subdirectory"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @r"
+        .args(["check", "--show-files", "subdirectory"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -91,7 +91,7 @@ fn check_project_from_project_subdirectory_respects_includes() {
        filters => TEST_FILTERS.to_vec()
    }, {
        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--show-files"]).current_dir(Path::new("./resources/test/fixtures/include-test/subdirectory")), @r"
+        .args(["check", "--show-files"]).current_dir(Path::new("./resources/test/fixtures/include-test/subdirectory")), @"
        success: true
        exit_code: 0
        ----- stdout -----
--- a/crates/ruff/tests/show_settings.rs
+++ b/crates/ruff/tests/show_settings.rs
@@ -50,6 +50,56 @@ ignore = [
    Ok(())
 }

+#[test]
+fn display_settings_from_nested_directory() -> anyhow::Result<()> {
+    let tempdir = TempDir::new().context("Failed to create temp directory.")?;
+
+    // Tempdir path's on macos are symlinks, which doesn't play nicely with
+    // our snapshot filtering.
+    let project_dir =
+        dunce::canonicalize(tempdir.path()).context("Failed to canonical tempdir path.")?;
+
+    // Root pyproject.toml.
+    std::fs::write(
+        project_dir.join("pyproject.toml"),
+        r#"
+[tool.ruff]
+line-length = 100
+
+[tool.ruff.lint]
+select = ["E", "F"]
+"#,
+    )?;
+
+    // Create a subdirectory with its own pyproject.toml.
+    let subdir = project_dir.join("subdir");
+    std::fs::create_dir(&subdir)?;
+
+    std::fs::write(
+        subdir.join("pyproject.toml"),
+        r#"
+[tool.ruff]
+line-length = 120
+
+[tool.ruff.lint]
+select = ["E", "F", "I"]
+"#,
+    )?;
+
+    std::fs::write(subdir.join("test.py"), r#"import os"#).context("Failed to write test.py.")?;
+
+    insta::with_settings!({filters => vec![
+        (&*tempdir_filter(&project_dir), "<temp_dir>/"),
+        (r#"\\(\w\w|\s|\.|")"#, "/$1"),
+    ]}, {
+        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+            .args(["check", "--show-settings", "subdir/test.py"])
+            .current_dir(&project_dir));
+    });
+
+    Ok(())
+}
+
 fn tempdir_filter(project_dir: &Path) -> String {
    format!(r#"{}\\?/?"#, regex::escape(project_dir.to_str().unwrap()))
 }
--- a/crates/ruff/tests/snapshots/integration_test__stdin_json.snap
+++ b/crates/ruff/tests/snapshots/integration_test__stdin_json.snap
@@ -3,11 +3,12 @@ source: crates/ruff/tests/integration_test.rs
 info:
  program: ruff
  args:
-    - "-"
-    - "--isolated"
-    - "--no-cache"
+    - check
    - "--output-format"
    - json
+    - "--no-cache"
+    - "--isolated"
+    - "-"
    - "--stdin-filename"
    - F401.py
  stdin: "import os\n"
@@ -51,4 +52,3 @@ exit_code: 1
  }
 ]
 ----- stderr -----
-
--- a/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
+++ b/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
@@ -238,7 +238,7 @@ linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
-linter.flake8_gettext.functions_names = [
+linter.flake8_gettext.function_names = [
 	_,
 	gettext,
 	ngettext,
@@ -374,6 +374,7 @@ linter.pylint.max_locals = 15
 linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
+linter.ruff.strictly_empty_init_modules = false

 # Formatter Settings
 formatter.exclude = []
--- a/crates/ruff/tests/snapshots/show_settings__display_settings_from_nested_directory.snap
+++ b/crates/ruff/tests/snapshots/show_settings__display_settings_from_nested_directory.snap
@@ -0,0 +1,410 @@
+---
+source: crates/ruff/tests/show_settings.rs
+info:
+  program: ruff
+  args:
+    - check
+    - "--show-settings"
+    - subdir/test.py
+---
+success: true
+exit_code: 0
+----- stdout -----
+Resolved settings for: "<temp_dir>/subdir/test.py"
+Settings path: "<temp_dir>/subdir/pyproject.toml"
+
+# General Settings
+cache_dir = "<temp_dir>/subdir/.ruff_cache"
+fix = false
+fix_only = false
+output_format = full
+show_fixes = false
+unsafe_fixes = hint
+
+# File Resolver Settings
+file_resolver.exclude = [
+	".bzr",
+	".direnv",
+	".eggs",
+	".git",
+	".git-rewrite",
+	".hg",
+	".ipynb_checkpoints",
+	".mypy_cache",
+	".nox",
+	".pants.d",
+	".pyenv",
+	".pytest_cache",
+	".pytype",
+	".ruff_cache",
+	".svn",
+	".tox",
+	".venv",
+	".vscode",
+	"__pypackages__",
+	"_build",
+	"buck-out",
+	"dist",
+	"node_modules",
+	"site-packages",
+	"venv",
+]
+file_resolver.extend_exclude = []
+file_resolver.force_exclude = false
+file_resolver.include = [
+	"*.py",
+	"*.pyi",
+	"*.ipynb",
+	"**/pyproject.toml",
+]
+file_resolver.extend_include = []
+file_resolver.respect_gitignore = true
+file_resolver.project_root = "<temp_dir>/subdir"
+
+# Linter Settings
+linter.exclude = []
+linter.project_root = "<temp_dir>/subdir"
+linter.rules.enabled = [
+	unsorted-imports (I001),
+	missing-required-import (I002),
+	mixed-spaces-and-tabs (E101),
+	multiple-imports-on-one-line (E401),
+	module-import-not-at-top-of-file (E402),
+	line-too-long (E501),
+	multiple-statements-on-one-line-colon (E701),
+	multiple-statements-on-one-line-semicolon (E702),
+	useless-semicolon (E703),
+	none-comparison (E711),
+	true-false-comparison (E712),
+	not-in-test (E713),
+	not-is-test (E714),
+	type-comparison (E721),
+	bare-except (E722),
+	lambda-assignment (E731),
+	ambiguous-variable-name (E741),
+	ambiguous-class-name (E742),
+	ambiguous-function-name (E743),
+	io-error (E902),
+	unused-import (F401),
+	import-shadowed-by-loop-var (F402),
+	undefined-local-with-import-star (F403),
+	late-future-import (F404),
+	undefined-local-with-import-star-usage (F405),
+	undefined-local-with-nested-import-star-usage (F406),
+	future-feature-not-defined (F407),
+	percent-format-invalid-format (F501),
+	percent-format-expected-mapping (F502),
+	percent-format-expected-sequence (F503),
+	percent-format-extra-named-arguments (F504),
+	percent-format-missing-argument (F505),
+	percent-format-mixed-positional-and-named (F506),
+	percent-format-positional-count-mismatch (F507),
+	percent-format-star-requires-sequence (F508),
+	percent-format-unsupported-format-character (F509),
+	string-dot-format-invalid-format (F521),
+	string-dot-format-extra-named-arguments (F522),
+	string-dot-format-extra-positional-arguments (F523),
+	string-dot-format-missing-arguments (F524),
+	string-dot-format-mixing-automatic (F525),
+	f-string-missing-placeholders (F541),
+	multi-value-repeated-key-literal (F601),
+	multi-value-repeated-key-variable (F602),
+	expressions-in-star-assignment (F621),
+	multiple-starred-expressions (F622),
+	assert-tuple (F631),
+	is-literal (F632),
+	invalid-print-syntax (F633),
+	if-tuple (F634),
+	break-outside-loop (F701),
+	continue-outside-loop (F702),
+	yield-outside-function (F704),
+	return-outside-function (F706),
+	default-except-not-last (F707),
+	forward-annotation-syntax-error (F722),
+	redefined-while-unused (F811),
+	undefined-name (F821),
+	undefined-export (F822),
+	undefined-local (F823),
+	unused-variable (F841),
+	unused-annotation (F842),
+	raise-not-implemented (F901),
+]
+linter.rules.should_fix = [
+	unsorted-imports (I001),
+	missing-required-import (I002),
+	mixed-spaces-and-tabs (E101),
+	multiple-imports-on-one-line (E401),
+	module-import-not-at-top-of-file (E402),
+	line-too-long (E501),
+	multiple-statements-on-one-line-colon (E701),
+	multiple-statements-on-one-line-semicolon (E702),
+	useless-semicolon (E703),
+	none-comparison (E711),
+	true-false-comparison (E712),
+	not-in-test (E713),
+	not-is-test (E714),
+	type-comparison (E721),
+	bare-except (E722),
+	lambda-assignment (E731),
+	ambiguous-variable-name (E741),
+	ambiguous-class-name (E742),
+	ambiguous-function-name (E743),
+	io-error (E902),
+	unused-import (F401),
+	import-shadowed-by-loop-var (F402),
+	undefined-local-with-import-star (F403),
+	late-future-import (F404),
+	undefined-local-with-import-star-usage (F405),
+	undefined-local-with-nested-import-star-usage (F406),
+	future-feature-not-defined (F407),
+	percent-format-invalid-format (F501),
+	percent-format-expected-mapping (F502),
+	percent-format-expected-sequence (F503),
+	percent-format-extra-named-arguments (F504),
+	percent-format-missing-argument (F505),
+	percent-format-mixed-positional-and-named (F506),
+	percent-format-positional-count-mismatch (F507),
+	percent-format-star-requires-sequence (F508),
+	percent-format-unsupported-format-character (F509),
+	string-dot-format-invalid-format (F521),
+	string-dot-format-extra-named-arguments (F522),
+	string-dot-format-extra-positional-arguments (F523),
+	string-dot-format-missing-arguments (F524),
+	string-dot-format-mixing-automatic (F525),
+	f-string-missing-placeholders (F541),
+	multi-value-repeated-key-literal (F601),
+	multi-value-repeated-key-variable (F602),
+	expressions-in-star-assignment (F621),
+	multiple-starred-expressions (F622),
+	assert-tuple (F631),
+	is-literal (F632),
+	invalid-print-syntax (F633),
+	if-tuple (F634),
+	break-outside-loop (F701),
+	continue-outside-loop (F702),
+	yield-outside-function (F704),
+	return-outside-function (F706),
+	default-except-not-last (F707),
+	forward-annotation-syntax-error (F722),
+	redefined-while-unused (F811),
+	undefined-name (F821),
+	undefined-export (F822),
+	undefined-local (F823),
+	unused-variable (F841),
+	unused-annotation (F842),
+	raise-not-implemented (F901),
+]
+linter.per_file_ignores = {}
+linter.safety_table.forced_safe = []
+linter.safety_table.forced_unsafe = []
+linter.unresolved_target_version = none
+linter.per_file_target_version = {}
+linter.preview = disabled
+linter.explicit_preview_rules = false
+linter.extension = ExtensionMapping({})
+linter.allowed_confusables = []
+linter.builtins = []
+linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
+linter.external = []
+linter.ignore_init_module_imports = true
+linter.logger_objects = []
+linter.namespace_packages = []
+linter.src = [
+	"<temp_dir>/subdir",
+	"<temp_dir>/subdir/src",
+]
+linter.tab_size = 4
+linter.line_length = 120
+linter.task_tags = [
+	TODO,
+	FIXME,
+	XXX,
+]
+linter.typing_modules = []
+linter.typing_extensions = true
+
+# Linter Plugins
+linter.flake8_annotations.mypy_init_return = false
+linter.flake8_annotations.suppress_dummy_args = false
+linter.flake8_annotations.suppress_none_returning = false
+linter.flake8_annotations.allow_star_arg_any = false
+linter.flake8_annotations.ignore_fully_untyped = false
+linter.flake8_bandit.hardcoded_tmp_directory = [
+	/tmp,
+	/var/tmp,
+	/dev/shm,
+]
+linter.flake8_bandit.check_typed_exception = false
+linter.flake8_bandit.extend_markup_names = []
+linter.flake8_bandit.allowed_markup_calls = []
+linter.flake8_bugbear.extend_immutable_calls = []
+linter.flake8_builtins.allowed_modules = []
+linter.flake8_builtins.ignorelist = []
+linter.flake8_builtins.strict_checking = false
+linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
+linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
+linter.flake8_copyright.author = none
+linter.flake8_copyright.min_file_size = 0
+linter.flake8_errmsg.max_string_length = 0
+linter.flake8_gettext.function_names = [
+	_,
+	gettext,
+	ngettext,
+]
+linter.flake8_implicit_str_concat.allow_multiline = true
+linter.flake8_import_conventions.aliases = {
+	altair = alt,
+	holoviews = hv,
+	matplotlib = mpl,
+	matplotlib.pyplot = plt,
+	networkx = nx,
+	numpy = np,
+	numpy.typing = npt,
+	pandas = pd,
+	panel = pn,
+	plotly.express = px,
+	polars = pl,
+	pyarrow = pa,
+	seaborn = sns,
+	tensorflow = tf,
+	tkinter = tk,
+	xml.etree.ElementTree = ET,
+}
+linter.flake8_import_conventions.banned_aliases = {}
+linter.flake8_import_conventions.banned_from = []
+linter.flake8_pytest_style.fixture_parentheses = false
+linter.flake8_pytest_style.parametrize_names_type = tuple
+linter.flake8_pytest_style.parametrize_values_type = list
+linter.flake8_pytest_style.parametrize_values_row_type = tuple
+linter.flake8_pytest_style.raises_require_match_for = [
+	BaseException,
+	Exception,
+	ValueError,
+	OSError,
+	IOError,
+	EnvironmentError,
+	socket.error,
+]
+linter.flake8_pytest_style.raises_extend_require_match_for = []
+linter.flake8_pytest_style.mark_parentheses = false
+linter.flake8_quotes.inline_quotes = double
+linter.flake8_quotes.multiline_quotes = double
+linter.flake8_quotes.docstring_quotes = double
+linter.flake8_quotes.avoid_escape = true
+linter.flake8_self.ignore_names = [
+	_make,
+	_asdict,
+	_replace,
+	_fields,
+	_field_defaults,
+	_name_,
+	_value_,
+]
+linter.flake8_tidy_imports.ban_relative_imports = "parents"
+linter.flake8_tidy_imports.banned_api = {}
+linter.flake8_tidy_imports.banned_module_level_imports = []
+linter.flake8_type_checking.strict = false
+linter.flake8_type_checking.exempt_modules = [
+	typing,
+	typing_extensions,
+]
+linter.flake8_type_checking.runtime_required_base_classes = []
+linter.flake8_type_checking.runtime_required_decorators = []
+linter.flake8_type_checking.quote_annotations = false
+linter.flake8_unused_arguments.ignore_variadic_names = false
+linter.isort.required_imports = []
+linter.isort.combine_as_imports = false
+linter.isort.force_single_line = false
+linter.isort.force_sort_within_sections = false
+linter.isort.detect_same_package = true
+linter.isort.case_sensitive = false
+linter.isort.force_wrap_aliases = false
+linter.isort.force_to_top = []
+linter.isort.known_modules = {}
+linter.isort.order_by_type = true
+linter.isort.relative_imports_order = furthest_to_closest
+linter.isort.single_line_exclusions = []
+linter.isort.split_on_trailing_comma = true
+linter.isort.classes = []
+linter.isort.constants = []
+linter.isort.variables = []
+linter.isort.no_lines_before = []
+linter.isort.lines_after_imports = -1
+linter.isort.lines_between_types = 0
+linter.isort.forced_separate = []
+linter.isort.section_order = [
+	known { type = future },
+	known { type = standard_library },
+	known { type = third_party },
+	known { type = first_party },
+	known { type = local_folder },
+]
+linter.isort.default_section = known { type = third_party }
+linter.isort.no_sections = false
+linter.isort.from_first = false
+linter.isort.length_sort = false
+linter.isort.length_sort_straight = false
+linter.mccabe.max_complexity = 10
+linter.pep8_naming.ignore_names = [
+	setUp,
+	tearDown,
+	setUpClass,
+	tearDownClass,
+	setUpModule,
+	tearDownModule,
+	asyncSetUp,
+	asyncTearDown,
+	setUpTestData,
+	failureException,
+	longMessage,
+	maxDiff,
+]
+linter.pep8_naming.classmethod_decorators = []
+linter.pep8_naming.staticmethod_decorators = []
+linter.pycodestyle.max_line_length = 120
+linter.pycodestyle.max_doc_length = none
+linter.pycodestyle.ignore_overlong_task_comments = false
+linter.pyflakes.extend_generics = []
+linter.pyflakes.allowed_unused_imports = []
+linter.pylint.allow_magic_value_types = [
+	str,
+	bytes,
+]
+linter.pylint.allow_dunder_method_names = []
+linter.pylint.max_args = 5
+linter.pylint.max_positional_args = 5
+linter.pylint.max_returns = 6
+linter.pylint.max_bool_expr = 5
+linter.pylint.max_branches = 12
+linter.pylint.max_statements = 50
+linter.pylint.max_public_methods = 20
+linter.pylint.max_locals = 15
+linter.pylint.max_nested_blocks = 5
+linter.pyupgrade.keep_runtime_typing = false
+linter.ruff.parenthesize_tuple_in_subscript = false
+linter.ruff.strictly_empty_init_modules = false
+
+# Formatter Settings
+formatter.exclude = []
+formatter.unresolved_target_version = 3.10
+formatter.per_file_target_version = {}
+formatter.preview = disabled
+formatter.line_width = 120
+formatter.line_ending = auto
+formatter.indent_style = space
+formatter.indent_width = 4
+formatter.quote_style = double
+formatter.magic_trailing_comma = respect
+formatter.docstring_code_format = disabled
+formatter.docstring_code_line_width = dynamic
+
+# Analyze Settings
+analyze.exclude = []
+analyze.preview = disabled
+analyze.target_version = 3.10
+analyze.string_imports = disabled
+analyze.extension = ExtensionMapping({})
+analyze.include_dependencies = {}
+analyze.type_checking_imports = true
+
+----- stderr -----
--- a/crates/ruff/tests/version.rs
+++ b/crates/ruff/tests/version.rs
@@ -16,7 +16,7 @@ const VERSION_FILTER: [(&str, &str); 1] = [(
 fn version_basics() {
    insta::with_settings!({filters => VERSION_FILTER.to_vec()}, {
        assert_cmd_snapshot!(
-            Command::new(get_cargo_bin(BIN_NAME)).arg("version"), @r"
+            Command::new(get_cargo_bin(BIN_NAME)).arg("version"), @"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -42,7 +42,7 @@ fn config_option_allowed_but_ignored() -> Result<()> {
                .arg("version")
                .arg("--config")
                .arg(&ruff_dot_toml)
-                .args(["--config", "lint.isort.extra-standard-library = ['foo', 'bar']"]), @r"
+                .args(["--config", "lint.isort.extra-standard-library = ['foo', 'bar']"]), @"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -60,7 +60,7 @@ fn config_option_ignored_but_validated() {
        assert_cmd_snapshot!(
            Command::new(get_cargo_bin(BIN_NAME))
                .arg("version")
-                .args(["--config", "foo = bar"]), @r"
+                .args(["--config", "foo = bar"]), @"
        success: false
        exit_code: 2
        ----- stdout -----
@@ -91,7 +91,7 @@ fn config_option_ignored_but_validated() {
 fn isolated_option_allowed() {
    insta::with_settings!({filters => VERSION_FILTER.to_vec()}, {
        assert_cmd_snapshot!(
-            Command::new(get_cargo_bin(BIN_NAME)).arg("version").arg("--isolated"), @r"
+            Command::new(get_cargo_bin(BIN_NAME)).arg("version").arg("--isolated"), @"
        success: true
        exit_code: 0
        ----- stdout -----
--- a/crates/ruff_annotate_snippets/Cargo.toml
+++ b/crates/ruff_annotate_snippets/Cargo.toml
@@ -12,10 +12,6 @@ license = "MIT OR Apache-2.0"

 [lib]

-[features]
-default = []
-testing-colors = []
-
 [dependencies]
 anstyle = { workspace = true }
 memchr = { workspace = true }
@@ -23,12 +19,17 @@ unicode-width = { workspace = true }

 [dev-dependencies]
 ruff_annotate_snippets = { workspace = true, features = ["testing-colors"] }
+
 anstream = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 snapbox = { workspace = true, features = ["diff", "term-svg", "cmd", "examples"] }
 toml = { workspace = true }
 tryfn = { workspace = true }

+[features]
+default = []
+testing-colors = []
+
 [[test]]
 name = "fixtures"
 harness = false
--- a/crates/ruff_benchmark/Cargo.toml
+++ b/crates/ruff_benchmark/Cargo.toml
@@ -16,77 +16,80 @@ bench = false
 test = false
 doctest = false

-[[bench]]
-name = "linter"
-harness = false
-required-features = ["instrumented"]
-
-[[bench]]
-name = "lexer"
-harness = false
-required-features = ["instrumented"]
-
-[[bench]]
-name = "parser"
-harness = false
-required-features = ["instrumented"]
-
-[[bench]]
-name = "formatter"
-harness = false
-required-features = ["instrumented"]
-
-[[bench]]
-name = "ty"
-harness = false
-required-features = ["instrumented"]
-
-[[bench]]
-name = "ty_walltime"
-harness = false
-required-features = ["walltime"]
-
 [dependencies]
 ruff_db = { workspace = true, features = ["testing"] }
-ruff_python_ast = { workspace = true }
 ruff_linter = { workspace = true, optional = true }
+ruff_python_ast = { workspace = true }
 ruff_python_formatter = { workspace = true, optional = true }
 ruff_python_parser = { workspace = true, optional = true }
 ruff_python_trivia = { workspace = true, optional = true }
 ty_project = { workspace = true, optional = true }

-divan = { workspace = true, optional = true }
 anyhow = { workspace = true }
 codspeed-criterion-compat = { workspace = true, default-features = false, optional = true }
 criterion = { workspace = true, default-features = false, optional = true }
+divan = { workspace = true, optional = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tracing = { workspace = true }

-[lints]
-workspace = true
+[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dependencies]
+tikv-jemallocator = { workspace = true, optional = true }
+
+[target.'cfg(target_os = "windows")'.dependencies]
+mimalloc = { workspace = true, optional = true }
+
+[dev-dependencies]
+rayon = { workspace = true }
+rustc-hash = { workspace = true }

 [features]
-default = ["instrumented", "walltime"]
-# Enables the benchmark that should only run with codspeed's instrumented runner
-instrumented = [
+default = ["ty_instrumented", "ty_walltime", "ruff_instrumented"]
+# Enables the ruff instrumented benchmarks
+ruff_instrumented = [
    "criterion",
    "ruff_linter",
    "ruff_python_formatter",
    "ruff_python_parser",
    "ruff_python_trivia",
-    "ty_project",
+    "mimalloc",
+    "tikv-jemallocator",
 ]
+# Enables the ty instrumented benchmarks
+ty_instrumented = ["criterion", "ty_project", "ruff_python_trivia"]
 codspeed = ["codspeed-criterion-compat"]
-# Enables benchmark that should only run with codspeed's walltime runner.
-walltime = ["ruff_db/os", "ty_project", "divan"]
+# Enables the ty_walltime benchmarks
+ty_walltime = ["ruff_db/os", "ty_project", "divan"]

-[target.'cfg(target_os = "windows")'.dev-dependencies]
-mimalloc = { workspace = true }
+[[bench]]
+name = "linter"
+harness = false
+required-features = ["ruff_instrumented"]

-[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dev-dependencies]
-tikv-jemallocator = { workspace = true }
+[[bench]]
+name = "lexer"
+harness = false
+required-features = ["ruff_instrumented"]

-[dev-dependencies]
-rustc-hash = { workspace = true }
-rayon = { workspace = true }
+[[bench]]
+name = "parser"
+harness = false
+required-features = ["ruff_instrumented"]
+
+[[bench]]
+name = "formatter"
+harness = false
+required-features = ["ruff_instrumented"]
+
+[[bench]]
+name = "ty"
+harness = false
+required-features = ["ty_instrumented"]
+
+[[bench]]
+name = "ty_walltime"
+harness = false
+required-features = ["ty_walltime"]
+
+[lints]
+workspace = true
--- a/crates/ruff_benchmark/benches/ty.rs
+++ b/crates/ruff_benchmark/benches/ty.rs
@@ -15,7 +15,7 @@ use ruff_db::files::{File, system_path_to_file};
 use ruff_db::source::source_text;
 use ruff_db::system::{InMemorySystem, MemoryFileSystem, SystemPath, SystemPathBuf, TestSystem};
 use ruff_python_ast::PythonVersion;
-use ty_project::metadata::options::{EnvironmentOptions, Options};
+use ty_project::metadata::options::{AnalysisOptions, EnvironmentOptions, Options};
 use ty_project::metadata::value::{RangedValue, RelativePathBuf};
 use ty_project::watch::{ChangeEvent, ChangedKind};
 use ty_project::{CheckMode, Db, ProjectDatabase, ProjectMetadata};
@@ -67,6 +67,7 @@ fn tomllib_path(file: &TestFile) -> SystemPathBuf {
    SystemPathBuf::from("src").join(file.name())
 }

+#[expect(clippy::needless_update)]
 fn setup_tomllib_case() -> Case {
    let system = TestSystem::default();
    let fs = system.memory_file_system().clone();
@@ -85,6 +86,10 @@ fn setup_tomllib_case() -> Case {
            python_version: Some(RangedValue::cli(PythonVersion::PY312)),
            ..EnvironmentOptions::default()
        }),
+        analysis: Some(AnalysisOptions {
+            respect_type_ignore_comments: Some(false),
+            ..AnalysisOptions::default()
+        }),
        ..Options::default()
    });

@@ -221,7 +226,7 @@ fn setup_micro_case(code: &str) -> Case {
    let file_path = "src/test.py";
    fs.write_file_all(
        SystemPathBuf::from(file_path),
-        ruff_python_trivia::textwrap::dedent(code),
+        &*ruff_python_trivia::textwrap::dedent(code),
    )
    .unwrap();

@@ -557,6 +562,60 @@ fn benchmark_many_enum_members(criterion: &mut Criterion) {
    });
 }

+fn benchmark_many_enum_members_2(criterion: &mut Criterion) {
+    const NUM_ENUM_MEMBERS: usize = 48;
+
+    setup_rayon();
+
+    let mut code = "\
+from enum import Enum
+from typing_extensions import assert_never
+
+class E(Enum):
+"
+    .to_string();
+
+    for i in 0..NUM_ENUM_MEMBERS {
+        writeln!(&mut code, "    m{i} = {i}").ok();
+    }
+
+    code.push_str(
+        "
+    def method(self):
+        match self:",
+    );
+
+    for i in 0..NUM_ENUM_MEMBERS {
+        write!(
+            &mut code,
+            "
+            case E.m{i}:
+                pass"
+        )
+        .ok();
+    }
+
+    write!(
+        &mut code,
+        "
+            case _:
+                assert_never(self)"
+    )
+    .ok();
+
+    criterion.bench_function("ty_micro[many_enum_members_2]", |b| {
+        b.iter_batched_ref(
+            || setup_micro_case(&code),
+            |case| {
+                let Case { db, .. } = case;
+                let result = db.check();
+                assert_eq!(result.len(), 0);
+            },
+            BatchSize::SmallInput,
+        );
+    });
+}
+
 struct ProjectBenchmark<'a> {
    project: InstalledProject<'a>,
    fs: MemoryFileSystem,
@@ -701,7 +760,7 @@ fn datetype(criterion: &mut Criterion) {
            max_dep_date: "2025-07-04",
            python_version: PythonVersion::PY313,
        },
-        2,
+        4,
    );

    bench_project(&benchmark, criterion);
@@ -717,6 +776,7 @@ criterion_group!(
    benchmark_complex_constrained_attributes_2,
    benchmark_complex_constrained_attributes_3,
    benchmark_many_enum_members,
+    benchmark_many_enum_members_2,
 );
 criterion_group!(project, anyio, attrs, hydra, datetype);
 criterion_main!(check_file, micro, project);
--- a/crates/ruff_benchmark/benches/ty_walltime.rs
+++ b/crates/ruff_benchmark/benches/ty_walltime.rs
@@ -71,6 +71,8 @@ impl Display for Benchmark<'_> {
    }
 }

+#[track_caller]
+#[expect(clippy::cast_precision_loss)]
 fn check_project(db: &ProjectDatabase, project_name: &str, max_diagnostics: usize) {
    let result = db.check();
    let diagnostics = result.len();
@@ -79,6 +81,12 @@ fn check_project(db: &ProjectDatabase, project_name: &str, max_diagnostics: usiz
        diagnostics > 1 && diagnostics <= max_diagnostics,
        "Expected between 1 and {max_diagnostics} diagnostics on project '{project_name}' but got {diagnostics}",
    );
+
+    if (max_diagnostics - diagnostics) as f64 / max_diagnostics as f64 > 0.10 {
+        tracing::warn!(
+            "The expected diagnostics for project `{project_name}` can be reduced: expected {max_diagnostics} but got {diagnostics}"
+        );
+    }
 }

 static ALTAIR: Benchmark = Benchmark::new(
@@ -101,7 +109,7 @@ static ALTAIR: Benchmark = Benchmark::new(
        max_dep_date: "2025-06-17",
        python_version: PythonVersion::PY312,
    },
-    1000,
+    850,
 );

 static COLOUR_SCIENCE: Benchmark = Benchmark::new(
@@ -120,7 +128,7 @@ static COLOUR_SCIENCE: Benchmark = Benchmark::new(
        max_dep_date: "2025-06-17",
        python_version: PythonVersion::PY310,
    },
-    1070,
+    350,
 );

 static FREQTRADE: Benchmark = Benchmark::new(
@@ -163,7 +171,7 @@ static PANDAS: Benchmark = Benchmark::new(
        max_dep_date: "2025-06-17",
        python_version: PythonVersion::PY312,
    },
-    4000,
+    3800,
 );

 static PYDANTIC: Benchmark = Benchmark::new(
@@ -181,7 +189,7 @@ static PYDANTIC: Benchmark = Benchmark::new(
        max_dep_date: "2025-06-17",
        python_version: PythonVersion::PY39,
    },
-    7000,
+    3200,
 );

 static SYMPY: Benchmark = Benchmark::new(
@@ -194,7 +202,7 @@ static SYMPY: Benchmark = Benchmark::new(
        max_dep_date: "2025-06-17",
        python_version: PythonVersion::PY312,
    },
-    13100,
+    13400,
 );

 static TANJUN: Benchmark = Benchmark::new(
@@ -207,7 +215,7 @@ static TANJUN: Benchmark = Benchmark::new(
        max_dep_date: "2025-06-17",
        python_version: PythonVersion::PY312,
    },
-    320,
+    110,
 );

 static STATIC_FRAME: Benchmark = Benchmark::new(
@@ -223,7 +231,7 @@ static STATIC_FRAME: Benchmark = Benchmark::new(
        max_dep_date: "2025-08-09",
        python_version: PythonVersion::PY311,
    },
-    1100,
+    1700,
 );

 #[track_caller]
@@ -235,30 +243,55 @@ fn run_single_threaded(bencher: Bencher, benchmark: &Benchmark) {
        });
 }

-#[bench(args=[&ALTAIR, &FREQTRADE, &TANJUN], sample_size=2, sample_count=3)]
-fn small(bencher: Bencher, benchmark: &Benchmark) {
-    run_single_threaded(bencher, benchmark);
+#[bench(sample_size = 2, sample_count = 3)]
+fn altair(bencher: Bencher) {
+    run_single_threaded(bencher, &ALTAIR);
 }

-#[bench(args=[&COLOUR_SCIENCE, &PANDAS, &STATIC_FRAME], sample_size=1, sample_count=3)]
-fn medium(bencher: Bencher, benchmark: &Benchmark) {
-    run_single_threaded(bencher, benchmark);
+#[bench(sample_size = 2, sample_count = 3)]
+fn freqtrade(bencher: Bencher) {
+    run_single_threaded(bencher, &FREQTRADE);
 }

-#[bench(args=[&SYMPY, &PYDANTIC], sample_size=1, sample_count=2)]
-fn large(bencher: Bencher, benchmark: &Benchmark) {
-    run_single_threaded(bencher, benchmark);
+#[bench(sample_size = 2, sample_count = 3)]
+fn tanjun(bencher: Bencher) {
+    run_single_threaded(bencher, &TANJUN);
 }

-#[bench(args=[&ALTAIR], sample_size=3, sample_count=8)]
-fn multithreaded(bencher: Bencher, benchmark: &Benchmark) {
+#[bench(sample_size = 2, sample_count = 3)]
+fn pydantic(bencher: Bencher) {
+    run_single_threaded(bencher, &PYDANTIC);
+}
+
+#[bench(sample_size = 1, sample_count = 3)]
+fn static_frame(bencher: Bencher) {
+    run_single_threaded(bencher, &STATIC_FRAME);
+}
+
+#[bench(sample_size = 1, sample_count = 2)]
+fn colour_science(bencher: Bencher) {
+    run_single_threaded(bencher, &COLOUR_SCIENCE);
+}
+
+#[bench(sample_size = 1, sample_count = 2)]
+fn pandas(bencher: Bencher) {
+    run_single_threaded(bencher, &PANDAS);
+}
+
+#[bench(sample_size = 1, sample_count = 2)]
+fn sympy(bencher: Bencher) {
+    run_single_threaded(bencher, &SYMPY);
+}
+
+#[bench(sample_size = 3, sample_count = 8)]
+fn multithreaded(bencher: Bencher) {
    let thread_pool = ThreadPoolBuilder::new().build().unwrap();

    bencher
-        .with_inputs(|| benchmark.setup_iteration())
+        .with_inputs(|| ALTAIR.setup_iteration())
        .bench_local_values(|db| {
            thread_pool.install(|| {
-                check_project(&db, benchmark.project.name, benchmark.max_diagnostics);
+                check_project(&db, ALTAIR.project.name, ALTAIR.max_diagnostics);
                db
            })
        });
--- a/crates/ruff_benchmark/src/lib.rs
+++ b/crates/ruff_benchmark/src/lib.rs
@@ -1,6 +1,6 @@
 use std::path::PathBuf;

-#[cfg(feature = "instrumented")]
+#[cfg(any(feature = "ty_instrumented", feature = "ruff_instrumented"))]
 pub mod criterion;
 pub mod real_world_projects;

--- a/crates/ruff_cache/Cargo.toml
+++ b/crates/ruff_cache/Cargo.toml
@@ -11,11 +11,11 @@ repository = { workspace = true }
 license = { workspace = true }

 [dependencies]
+filetime = { workspace = true }
 glob = { workspace = true }
 globset = { workspace = true }
 itertools = { workspace = true }
 regex = { workspace = true }
-filetime = { workspace = true }
 seahash = { workspace = true }

 [dev-dependencies]
--- a/crates/ruff_db/Cargo.toml
+++ b/crates/ruff_db/Cargo.toml
@@ -48,12 +48,12 @@ tracing = { workspace = true }
 tracing-subscriber = { workspace = true, optional = true }
 zip = { workspace = true }

-[target.'cfg(target_arch="wasm32")'.dependencies]
-web-time = { version = "1.1.0" }
-
 [target.'cfg(not(target_arch="wasm32"))'.dependencies]
 etcetera = { workspace = true, optional = true }

+[target.'cfg(target_arch="wasm32")'.dependencies]
+web-time = { version = "1.1.0" }
+
 [dev-dependencies]
 insta = { workspace = true, features = ["filters"] }
 tempfile = { workspace = true }
--- a/crates/ruff_db/src/cancellation.rs
+++ b/crates/ruff_db/src/cancellation.rs
@@ -0,0 +1,64 @@
+use std::fmt::Formatter;
+use std::sync::Arc;
+use std::sync::atomic::AtomicBool;
+
+/// Signals a [`CancellationToken`] that it should be canceled.
+#[derive(Debug, Clone)]
+pub struct CancellationTokenSource {
+    cancelled: Arc<AtomicBool>,
+}
+
+impl Default for CancellationTokenSource {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl CancellationTokenSource {
+    pub fn new() -> Self {
+        Self {
+            cancelled: Arc::new(AtomicBool::new(false)),
+        }
+    }
+
+    pub fn is_cancellation_requested(&self) -> bool {
+        self.cancelled.load(std::sync::atomic::Ordering::Relaxed)
+    }
+
+    /// Creates a new token that uses this source.
+    pub fn token(&self) -> CancellationToken {
+        CancellationToken {
+            cancelled: self.cancelled.clone(),
+        }
+    }
+
+    /// Requests cancellation for operations using this token.
+    pub fn cancel(&self) {
+        self.cancelled
+            .store(true, std::sync::atomic::Ordering::Relaxed);
+    }
+}
+
+/// Token signals whether an operation should be canceled.
+#[derive(Debug, Clone)]
+pub struct CancellationToken {
+    cancelled: Arc<AtomicBool>,
+}
+
+impl CancellationToken {
+    pub fn is_cancelled(&self) -> bool {
+        self.cancelled.load(std::sync::atomic::Ordering::Relaxed)
+    }
+}
+
+/// The operation was canceled by the provided [`CancellationToken`].
+#[derive(Debug)]
+pub struct Canceled;
+
+impl std::error::Error for Canceled {}
+
+impl std::fmt::Display for Canceled {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.write_str("operation was canceled")
+    }
+}
--- a/crates/ruff_db/src/diagnostic/mod.rs
+++ b/crates/ruff_db/src/diagnostic/mod.rs
@@ -1,4 +1,4 @@
-use std::{fmt::Formatter, path::Path, sync::Arc};
+use std::{borrow::Cow, fmt::Formatter, path::Path, sync::Arc};

 use ruff_diagnostics::{Applicability, Fix};
 use ruff_source_file::{LineColumn, SourceCode, SourceFile};
@@ -11,6 +11,7 @@ pub use self::render::{
    ceil_char_boundary,
    github::{DisplayGithubDiagnostics, GithubRenderer},
 };
+use crate::cancellation::CancellationToken;
 use crate::{Db, files::File};

 mod render;
@@ -97,6 +98,44 @@ impl Diagnostic {
        diag
    }

+    /// Adds sub diagnostics that tell the user that this is a bug in ty
+    /// and asks them to open an issue on GitHub.
+    pub fn add_bug_sub_diagnostics(&mut self, url_encoded_title: &str) {
+        self.sub(SubDiagnostic::new(
+            SubDiagnosticSeverity::Info,
+            "This indicates a bug in ty.",
+        ));
+
+        self.sub(SubDiagnostic::new(
+            SubDiagnosticSeverity::Info,
+            format_args!(
+                "If you could open an issue at https://github.com/astral-sh/ty/issues/new?title={url_encoded_title}, we'd be very appreciative!"
+            ),
+        ));
+        self.sub(SubDiagnostic::new(
+            SubDiagnosticSeverity::Info,
+            format!(
+                "Platform: {os} {arch}",
+                os = std::env::consts::OS,
+                arch = std::env::consts::ARCH
+            ),
+        ));
+        if let Some(version) = crate::program_version() {
+            self.sub(SubDiagnostic::new(
+                SubDiagnosticSeverity::Info,
+                format!("Version: {version}"),
+            ));
+        }
+
+        self.sub(SubDiagnostic::new(
+            SubDiagnosticSeverity::Info,
+            format!(
+                "Args: {args:?}",
+                args = std::env::args().collect::<Vec<_>>()
+            ),
+        ));
+    }
+
    /// Add an annotation to this diagnostic.
    ///
    /// Annotations for a diagnostic are optional, but if any are added,
@@ -410,11 +449,6 @@ impl Diagnostic {
        self.id().is_invalid_syntax()
    }

-    /// Returns the message body to display to the user.
-    pub fn body(&self) -> &str {
-        self.primary_message()
-    }
-
    /// Returns the message of the first sub-diagnostic with a `Help` severity.
    ///
    /// Note that this is used as the fix title/suggestion for some of Ruff's output formats, but in
@@ -1023,6 +1057,13 @@ impl DiagnosticId {
        matches!(self, DiagnosticId::Lint(_))
    }

+    pub const fn as_lint(&self) -> Option<LintName> {
+        match self {
+            DiagnosticId::Lint(name) => Some(*name),
+            _ => None,
+        }
+    }
+
    /// Returns `true` if this `DiagnosticId` represents a lint with the given name.
    pub fn is_lint_named(&self, name: &str) -> bool {
        matches!(self, DiagnosticId::Lint(self_name) if self_name == name)
@@ -1312,6 +1353,8 @@ pub struct DisplayDiagnosticConfig {
    show_fix_diff: bool,
    /// The lowest applicability that should be shown when reporting diagnostics.
    fix_applicability: Applicability,
+
+    cancellation_token: Option<CancellationToken>,
 }

 impl DisplayDiagnosticConfig {
@@ -1385,6 +1428,20 @@ impl DisplayDiagnosticConfig {
    pub fn fix_applicability(&self) -> Applicability {
        self.fix_applicability
    }
+
+    pub fn with_cancellation_token(
+        mut self,
+        token: Option<CancellationToken>,
+    ) -> DisplayDiagnosticConfig {
+        self.cancellation_token = token;
+        self
+    }
+
+    pub fn is_canceled(&self) -> bool {
+        self.cancellation_token
+            .as_ref()
+            .is_some_and(|token| token.is_cancelled())
+    }
 }

 impl Default for DisplayDiagnosticConfig {
@@ -1398,6 +1455,7 @@ impl Default for DisplayDiagnosticConfig {
            show_fix_status: false,
            show_fix_diff: false,
            fix_applicability: Applicability::Safe,
+            cancellation_token: None,
        }
    }
 }
@@ -1474,6 +1532,15 @@ pub enum ConciseMessage<'a> {
    Custom(&'a str),
 }

+impl<'a> ConciseMessage<'a> {
+    pub fn to_str(&self) -> Cow<'a, str> {
+        match self {
+            ConciseMessage::MainDiagnostic(s) | ConciseMessage::Custom(s) => Cow::Borrowed(s),
+            ConciseMessage::Both { .. } => Cow::Owned(self.to_string()),
+        }
+    }
+}
+
 impl std::fmt::Display for ConciseMessage<'_> {
    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
        match *self {
@@ -1490,6 +1557,16 @@ impl std::fmt::Display for ConciseMessage<'_> {
    }
 }

+#[cfg(feature = "serde")]
+impl serde::Serialize for ConciseMessage<'_> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.collect_str(self)
+    }
+}
+
 /// A diagnostic message string.
 ///
 /// This is, for all intents and purposes, equivalent to a `Box<str>`.
--- a/crates/ruff_db/src/diagnostic/render.rs
+++ b/crates/ruff_db/src/diagnostic/render.rs
@@ -1284,7 +1284,7 @@ watermelon
        let diag = env.err().primary("animals", "5", "5", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -1308,7 +1308,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        warning[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -1328,7 +1328,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        info[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -1355,7 +1355,7 @@ watermelon
        let diag = builder.build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1374,7 +1374,7 @@ watermelon
        let diag = builder.build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1395,7 +1395,7 @@ watermelon
        let diag = env.err().primary("non-ascii", "5", "5", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> non-ascii:5:1
          |
@@ -1414,7 +1414,7 @@ watermelon
        let diag = env.err().primary("non-ascii", "2:4", "2:8", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> non-ascii:2:2
          |
@@ -1438,7 +1438,7 @@ watermelon
        env.context(1);
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -1455,7 +1455,7 @@ watermelon
        env.context(0);
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -1470,7 +1470,7 @@ watermelon
        env.context(2);
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1487,7 +1487,7 @@ watermelon
        env.context(2);
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:11:1
           |
@@ -1504,7 +1504,7 @@ watermelon
        env.context(200);
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:5:1
           |
@@ -1537,7 +1537,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:1:1
           |
@@ -1581,7 +1581,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1606,7 +1606,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1634,7 +1634,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1662,7 +1662,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1687,7 +1687,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:1:1
           |
@@ -1718,7 +1718,7 @@ watermelon
        // window.
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:1:1
           |
@@ -1756,7 +1756,7 @@ watermelon
        let diag = env.err().primary("spacey-animals", "8", "8", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> spacey-animals:8:1
          |
@@ -1773,7 +1773,7 @@ watermelon
        let diag = env.err().primary("spacey-animals", "12", "12", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> spacey-animals:12:1
           |
@@ -1791,7 +1791,7 @@ watermelon
        let diag = env.err().primary("spacey-animals", "13", "13", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> spacey-animals:13:1
           |
@@ -1831,7 +1831,7 @@ watermelon
        // instead of special casing the snippet assembly.
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> spacey-animals:3:1
          |
@@ -1860,7 +1860,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -1897,7 +1897,7 @@ watermelon
        );
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -1934,7 +1934,7 @@ watermelon
        );
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -1962,7 +1962,7 @@ watermelon
        diag.sub(env.sub_warn().primary("fruits", "3", "3", "").build());
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -1998,7 +1998,7 @@ watermelon
        diag.sub(env.sub_warn().primary("animals", "11", "11", "").build());
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -2037,7 +2037,7 @@ watermelon
        diag.sub(env.sub_warn().primary("fruits", "3", "3", "").build());
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -2085,7 +2085,7 @@ watermelon
        diag.sub(env.sub_warn().secondary("animals", "3", "3", "").build());
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -2121,7 +2121,7 @@ watermelon
        let diag = env.err().primary("animals", "5", "6", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2144,7 +2144,7 @@ watermelon
        let diag = env.err().primary("animals", "5", "7:0", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2164,7 +2164,7 @@ watermelon
        let diag = env.err().primary("animals", "5", "7:1", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2184,7 +2184,7 @@ watermelon
        let diag = env.err().primary("animals", "5:3", "8:8", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:5:4
           |
@@ -2206,7 +2206,7 @@ watermelon
        let diag = env.err().secondary("animals", "5:3", "8:8", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:5:4
           |
@@ -2238,7 +2238,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:4:1
          |
@@ -2267,7 +2267,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:4:1
          |
@@ -2298,7 +2298,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2333,7 +2333,7 @@ watermelon
        // better using only ASCII art.
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2361,7 +2361,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2393,7 +2393,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:3
          |
@@ -2415,7 +2415,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:3
          |
@@ -2448,7 +2448,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:8:1
           |
@@ -2488,7 +2488,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2532,7 +2532,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> fruits:1:1
          |
@@ -2567,7 +2567,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:11:1
           |
--- a/crates/ruff_db/src/diagnostic/render/azure.rs
+++ b/crates/ruff_db/src/diagnostic/render/azure.rs
@@ -52,7 +52,7 @@ impl AzureRenderer<'_> {
                f,
                "code={code};]{body}",
                code = diag.secondary_code_or_id(),
-                body = diag.body(),
+                body = diag.concise_message(),
            )?;
        }

--- a/crates/ruff_db/src/diagnostic/render/concise.rs
+++ b/crates/ruff_db/src/diagnostic/render/concise.rs
@@ -28,6 +28,10 @@ impl<'a> ConciseRenderer<'a> {

        let sep = fmt_styled(":", stylesheet.separator);
        for diag in diagnostics {
+            if self.config.is_canceled() {
+                return Ok(());
+            }
+
            if let Some(span) = diag.primary_span() {
                write!(
                    f,
@@ -133,7 +137,7 @@ mod tests {
    #[test]
    fn output() {
        let (env, diagnostics) = create_diagnostics(DiagnosticFormat::Concise);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
        fib.py:1:8: error[unused-import] `os` imported but unused
        fib.py:6:5: error[unused-variable] Local variable `x` is assigned to but never used
        undef.py:1:4: error[undefined-name] Undefined name `a`
@@ -146,7 +150,7 @@ mod tests {
        env.hide_severity(true);
        env.show_fix_status(true);
        env.fix_applicability(Applicability::DisplayOnly);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
        fib.py:1:8: F401 [*] `os` imported but unused
        fib.py:6:5: F841 [*] Local variable `x` is assigned to but never used
        undef.py:1:4: F821 Undefined name `a`
@@ -160,7 +164,7 @@ mod tests {
        env.show_fix_status(true);
        env.fix_applicability(Applicability::DisplayOnly);
        env.preview(true);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
        fib.py:1:8: F401 [*] `os` imported but unused
        fib.py:6:5: F841 [*] Local variable `x` is assigned to but never used
        undef.py:1:4: F821 Undefined name `a`
@@ -173,7 +177,7 @@ mod tests {
        env.hide_severity(true);
        env.show_fix_status(true);
        env.fix_applicability(Applicability::DisplayOnly);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
        syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
        syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
        ");
@@ -182,7 +186,7 @@ mod tests {
    #[test]
    fn syntax_errors() {
        let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Concise);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
        syntax_errors.py:1:15: error[invalid-syntax] Expected one or more symbol names after import
        syntax_errors.py:3:12: error[invalid-syntax] Expected ')', found newline
        ");
@@ -191,7 +195,7 @@ mod tests {
    #[test]
    fn notebook_output() {
        let (env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Concise);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
        notebook.ipynb:cell 1:2:8: error[unused-import] `os` imported but unused
        notebook.ipynb:cell 2:2:8: error[unused-import] `math` imported but unused
        notebook.ipynb:cell 3:4:5: error[unused-variable] Local variable `x` is assigned to but never used
--- a/crates/ruff_db/src/diagnostic/render/full.rs
+++ b/crates/ruff_db/src/diagnostic/render/full.rs
@@ -53,6 +53,10 @@ impl<'a> FullRenderer<'a> {
            .hyperlink(stylesheet.hyperlink);

        for diag in diagnostics {
+            if self.config.is_canceled() {
+                return Ok(());
+            }
+
            let resolved = Resolved::new(self.resolver, diag, self.config);
            let renderable = resolved.to_renderable(self.config.context);
            for diag in renderable.diagnostics.iter() {
--- a/crates/ruff_db/src/diagnostic/render/github.rs
+++ b/crates/ruff_db/src/diagnostic/render/github.rs
@@ -49,14 +49,26 @@ impl<'a> GithubRenderer<'a> {
                }
                .unwrap_or_default();

-                write!(
-                    f,
-                    ",line={row},col={column},endLine={end_row},endColumn={end_column}::",
-                    row = start_location.line,
-                    column = start_location.column,
-                    end_row = end_location.line,
-                    end_column = end_location.column,
-                )?;
+                // GitHub Actions workflow commands have constraints on error annotations:
+                // - `col` and `endColumn` cannot be set if `line` and `endLine` are different
+                // See: https://github.com/astral-sh/ruff/issues/22074
+                if start_location.line == end_location.line {
+                    write!(
+                        f,
+                        ",line={row},col={column},endLine={end_row},endColumn={end_column}::",
+                        row = start_location.line,
+                        column = start_location.column,
+                        end_row = end_location.line,
+                        end_column = end_location.column,
+                    )?;
+                } else {
+                    write!(
+                        f,
+                        ",line={row},endLine={end_row}::",
+                        row = start_location.line,
+                        end_row = end_location.line,
+                    )?;
+                }

                write!(
                    f,
@@ -75,7 +87,7 @@ impl<'a> GithubRenderer<'a> {
                write!(f, "{id}:", id = diagnostic.id())?;
            }

-            writeln!(f, " {}", diagnostic.body())?;
+            writeln!(f, " {}", diagnostic.concise_message())?;
        }

        Ok(())
--- a/crates/ruff_db/src/diagnostic/render/gitlab.rs
+++ b/crates/ruff_db/src/diagnostic/render/gitlab.rs
@@ -98,7 +98,7 @@ impl Serialize for SerializedMessages<'_> {
            }
            fingerprints.insert(message_fingerprint);

-            let description = diagnostic.body();
+            let description = diagnostic.concise_message();
            let check_name = diagnostic.secondary_code_or_id();
            let severity = match diagnostic.severity() {
                Severity::Info => "info",
--- a/crates/ruff_db/src/diagnostic/render/json.rs
+++ b/crates/ruff_db/src/diagnostic/render/json.rs
@@ -6,7 +6,7 @@ use ruff_notebook::NotebookIndex;
 use ruff_source_file::{LineColumn, OneIndexed};
 use ruff_text_size::Ranged;

-use crate::diagnostic::{Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};
+use crate::diagnostic::{ConciseMessage, Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};

 use super::FileResolver;

@@ -101,7 +101,7 @@ pub(super) fn diagnostic_to_json<'a>(
        JsonDiagnostic {
            code: diagnostic.secondary_code_or_id(),
            url: diagnostic.documentation_url(),
-            message: diagnostic.body(),
+            message: diagnostic.concise_message(),
            fix,
            cell: notebook_cell_index,
            location: start_location.map(JsonLocation::from),
@@ -113,7 +113,7 @@ pub(super) fn diagnostic_to_json<'a>(
        JsonDiagnostic {
            code: diagnostic.secondary_code_or_id(),
            url: diagnostic.documentation_url(),
-            message: diagnostic.body(),
+            message: diagnostic.concise_message(),
            fix,
            cell: notebook_cell_index,
            location: Some(start_location.unwrap_or_default().into()),
@@ -226,7 +226,7 @@ pub(crate) struct JsonDiagnostic<'a> {
    filename: Option<&'a str>,
    fix: Option<JsonFix<'a>>,
    location: Option<JsonLocation>,
-    message: &'a str,
+    message: ConciseMessage<'a>,
    noqa_row: Option<OneIndexed>,
    url: Option<&'a str>,
 }
--- a/crates/ruff_db/src/diagnostic/render/junit.rs
+++ b/crates/ruff_db/src/diagnostic/render/junit.rs
@@ -56,17 +56,17 @@ impl<'a> JunitRenderer<'a> {
                        start_location: location,
                    } = diagnostic;
                    let mut status = TestCaseStatus::non_success(NonSuccessKind::Failure);
-                    status.set_message(diagnostic.body());
+                    status.set_message(diagnostic.concise_message().to_str());

                    if let Some(location) = location {
                        status.set_description(format!(
                            "line {row}, col {col}, {body}",
                            row = location.line,
                            col = location.column,
-                            body = diagnostic.body()
+                            body = diagnostic.concise_message()
                        ));
                    } else {
-                        status.set_description(diagnostic.body());
+                        status.set_description(diagnostic.concise_message().to_str());
                    }

                    let code = diagnostic
--- a/crates/ruff_db/src/diagnostic/render/pylint.rs
+++ b/crates/ruff_db/src/diagnostic/render/pylint.rs
@@ -55,7 +55,7 @@ impl PylintRenderer<'_> {
                f,
                "{path}:{row}: [{code}] {body}",
                path = filename,
-                body = diagnostic.body()
+                body = diagnostic.concise_message()
            )?;
        }

--- a/crates/ruff_db/src/diagnostic/render/rdjson.rs
+++ b/crates/ruff_db/src/diagnostic/render/rdjson.rs
@@ -5,7 +5,7 @@ use ruff_diagnostics::{Edit, Fix};
 use ruff_source_file::{LineColumn, SourceCode};
 use ruff_text_size::Ranged;

-use crate::diagnostic::Diagnostic;
+use crate::diagnostic::{ConciseMessage, Diagnostic};

 use super::FileResolver;

@@ -76,7 +76,7 @@ fn diagnostic_to_rdjson<'a>(
    let edits = diagnostic.fix().map(Fix::edits).unwrap_or_default();

    RdjsonDiagnostic {
-        message: diagnostic.body(),
+        message: diagnostic.concise_message(),
        location,
        code: RdjsonCode {
            value: diagnostic
@@ -155,7 +155,7 @@ struct RdjsonDiagnostic<'a> {
    code: RdjsonCode<'a>,
    #[serde(skip_serializing_if = "Option::is_none")]
    location: Option<RdjsonLocation<'a>>,
-    message: &'a str,
+    message: ConciseMessage<'a>,
    #[serde(skip_serializing_if = "Vec::is_empty")]
    suggestions: Vec<RdjsonSuggestion<'a>>,
 }
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergithubtests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergithubtests__syntax_errors.snap
@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/github.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-::error title=ty (invalid-syntax),file=/syntax_errors.py,line=1,col=15,endLine=2,endColumn=1::syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
-::error title=ty (invalid-syntax),file=/syntax_errors.py,line=3,col=12,endLine=4,endColumn=1::syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
+::error title=ty (invalid-syntax),file=/syntax_errors.py,line=1,endLine=2::syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
+::error title=ty (invalid-syntax),file=/syntax_errors.py,line=3,endLine=4::syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
--- a/Show More
+++ b/Show More