Re-add rust-cache

Random change
Install sscache
2025-07-14 19:43:03 +02:00 · 2025-07-14 19:26:17 +02:00 · 2025-07-14 19:18:37 +02:00 · 2025-07-14 19:18:35 +02:00 · 2025-07-14 17:34:09 +01:00 · 2025-07-14 11:24:16 -05:00
796 changed files with 90969 additions and 9866 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -235,16 +235,19 @@ jobs:
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: depot/setup-action@v1
      - name: "Install Rust toolchain"
        run: rustup show
+      - name: "Setup sccache"
+        uses: Mozilla-Actions/sccache-action@v0.0.6
      - name: "Install mold"
        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@c07504cae06f832dc8de08911c9a9c5cddb0d2d3 # v2.56.13
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@c07504cae06f832dc8de08911c9a9c5cddb0d2d3 # v2.56.13
        with:
          tool: cargo-insta
      - name: ty mdtests (GitHub annotations)
@@ -254,22 +257,22 @@ jobs:
          MDTEST_GITHUB_ANNOTATIONS_FORMAT: 1
        # Ignore errors if this step fails; we want to continue to later steps in the workflow anyway.
        # This step is just to get nice GitHub annotations on the PR diff in the files-changed tab.
-        run: cargo test -p ty_python_semantic --test mdtest || true
+        run: depot cargo test -p ty_python_semantic --test mdtest || true
      - name: "Run tests"
        shell: bash
        env:
          NEXTEST_PROFILE: "ci"
-        run: cargo insta test --all-features --unreferenced reject --test-runner nextest
+        run: depot cargo insta test --all-features --unreferenced reject --test-runner nextest

      # Check for broken links in the documentation.
-      - run: cargo doc --all --no-deps
+      - run: depot cargo doc --all --no-deps
        env:
          RUSTDOCFLAGS: "-D warnings"
      # Use --document-private-items so that all our doc comments are kept in
      # sync, not just public items. Eventually we should do this for all
      # crates; for now add crates here as they are warning-clean to prevent
      # regression.
-      - run: cargo doc --no-deps -p ty_python_semantic -p ty -p ty_test -p ruff_db --document-private-items
+      - run: depot cargo doc --no-deps -p ty_python_semantic -p ty -p ty_test -p ruff_db --document-private-items
        env:
          # Setting RUSTDOCFLAGS because `cargo doc --check` isn't yet implemented (https://github.com/rust-lang/cargo/issues/10025).
          RUSTDOCFLAGS: "-D warnings"
@@ -293,23 +296,26 @@ jobs:
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: depot/setup-action@v1
      - name: "Install Rust toolchain"
        run: rustup show
+      - name: "Setup sccache"
+        uses: Mozilla-Actions/sccache-action@v0.0.6
      - name: "Install mold"
        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@c07504cae06f832dc8de08911c9a9c5cddb0d2d3 # v2.56.13
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@c07504cae06f832dc8de08911c9a9c5cddb0d2d3 # v2.56.13
        with:
          tool: cargo-insta
      - name: "Run tests"
        shell: bash
        env:
          NEXTEST_PROFILE: "ci"
-        run: cargo insta test --release --all-features --unreferenced reject --test-runner nextest
+        run: depot cargo insta test --release --all-features --unreferenced reject --test-runner nextest

  cargo-test-windows:
    name: "cargo test (windows)"
@@ -322,10 +328,13 @@ jobs:
        with:
          persist-credentials: false
      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: depot/setup-action@v1
      - name: "Install Rust toolchain"
        run: rustup show
+      - name: "Setup sccache"
+        uses: Mozilla-Actions/sccache-action@v0.0.6
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@c07504cae06f832dc8de08911c9a9c5cddb0d2d3 # v2.56.13
        with:
          tool: cargo-nextest
      - name: "Run tests"
@@ -335,8 +344,8 @@ jobs:
          # Workaround for <https://github.com/nextest-rs/nextest/issues/1493>.
          RUSTUP_WINDOWS_PATH_ADD_BIN: 1
        run: |
-          cargo nextest run --all-features --profile ci
-          cargo test --all-features --doc
+          depot cargo nextest run --all-features --profile ci
+          depot cargo test --all-features --doc

  cargo-test-wasm:
    name: "cargo test (wasm)"
@@ -395,6 +404,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
+      - uses: depot/setup-action@v1
      - uses: SebRollen/toml-action@b1b3628f55fc3a28208d4203ada8b737e9687876 # v1.2.0
        id: msrv
        with:
@@ -405,22 +415,15 @@ jobs:
        env:
          MSRV: ${{ steps.msrv.outputs.value }}
        run: rustup default "${MSRV}"
+      - name: "Setup sccache"
+        uses: Mozilla-Actions/sccache-action@v0.0.6
      - name: "Install mold"
        uses: rui314/setup-mold@85c79d00377f0d32cdbae595a46de6f7c2fa6599 # v1
-      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
-        with:
-          tool: cargo-nextest
-      - name: "Install cargo insta"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
-        with:
-          tool: cargo-insta
-      - name: "Run tests"
+      - name: "Build tests"
        shell: bash
        env:
-          NEXTEST_PROFILE: "ci"
          MSRV: ${{ steps.msrv.outputs.value }}
-        run: cargo "+${MSRV}" insta test --all-features --unreferenced reject --test-runner nextest
+        run: depot cargo "+${MSRV}" test --no-run --all-features

  cargo-fuzz-build:
    name: "cargo fuzz build"
@@ -527,6 +530,7 @@ jobs:
      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
        with:
          python-version: ${{ env.PYTHON_VERSION }}
+      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0

      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        name: Download comparison Ruff binary
@@ -732,7 +736,6 @@ jobs:
        with:
          persist-credentials: false
      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version: 22
@@ -912,7 +915,7 @@ jobs:
        run: rustup show

      - name: "Install codspeed"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@c07504cae06f832dc8de08911c9a9c5cddb0d2d3 # v2.56.13
        with:
          tool: cargo-codspeed

@@ -920,7 +923,7 @@ jobs:
        run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@0010eb0ca6e89b80c88e8edaaa07cfe5f3e6664d # v3.5.0
+        uses: CodSpeedHQ/action@c28fe9fbe7d57a3da1b7834ae3761c1d8217612d # v3.7.0
        with:
          run: cargo codspeed run
          token: ${{ secrets.CODSPEED_TOKEN }}
@@ -945,7 +948,7 @@ jobs:
        run: rustup show

      - name: "Install codspeed"
-        uses: taiki-e/install-action@f3a27926ea13d7be3ee2f4cbb925883cf9442b56 # v2.56.7
+        uses: taiki-e/install-action@c07504cae06f832dc8de08911c9a9c5cddb0d2d3 # v2.56.13
        with:
          tool: cargo-codspeed

@@ -953,7 +956,7 @@ jobs:
        run: cargo codspeed build --features "codspeed,walltime" --no-default-features -p ruff_benchmark

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@0010eb0ca6e89b80c88e8edaaa07cfe5f3e6664d # v3.5.0
+        uses: CodSpeedHQ/action@c28fe9fbe7d57a3da1b7834ae3761c1d8217612d # v3.7.0
        with:
          run: cargo codspeed run
          token: ${{ secrets.CODSPEED_TOKEN }}
--- a/.github/workflows/sync_typeshed.yaml
+++ b/.github/workflows/sync_typeshed.yaml
@@ -36,9 +36,40 @@ jobs:
        run: |
          git config --global user.name typeshedbot
          git config --global user.email '<>'
+      - uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
      - name: Sync typeshed
        id: sync
        run: |
+          docstring_adder="git+https://github.com/astral-sh/docstring-adder.git@6de51c5f44aea11fe8c8f2d30f9ee0683682c3d2"
+
+          # Run with the full matrix of Python versions supported by typeshed,
+          # so that we codemod in docstrings that only exist on certain versions.
+          #
+          # The codemod will only add docstrings to functions/classes that do not
+          # already have docstrings. We run with Python 3.14 before running with
+          # any other Python version so that we get the Python 3.14 version of the
+          # docstring for a definition that exists on all Python versions: if we
+          # ran with Python 3.9 first, then the later runs with Python 3.10+ would
+          # not modify the docstring that had already been added using the old version of Python.
+          #
+          # TODO: In order to add docstrings for platform-specific APIs, we would also
+          # need to run the codemod on Windows. We get the runtime docstrings by inspecting
+          # the docstrings at runtime, so if an API doesn't exist at runtime (because e.g.
+          # it's Windows-specific and we're running on Linux), then we won't add a docstring to it.
+          #
+          uvx --python=3.14 --force-reinstall --from="${docstring_adder}" add-docstrings --stdlib-path ./typeshed/stdlib
+          uvx --python=3.13 --force-reinstall --from="${docstring_adder}" add-docstrings --stdlib-path ./typeshed/stdlib
+          uvx --python=3.12 --force-reinstall --from="${docstring_adder}" add-docstrings --stdlib-path ./typeshed/stdlib
+          uvx --python=3.11 --force-reinstall --from="${docstring_adder}" add-docstrings --stdlib-path ./typeshed/stdlib
+          uvx --python=3.10 --force-reinstall --from="${docstring_adder}" add-docstrings --stdlib-path ./typeshed/stdlib
+          uvx --python=3.9 --force-reinstall --from="${docstring_adder}" add-docstrings --stdlib-path ./typeshed/stdlib
+
+          # Here we just reformat the codemodded stubs so that they are
+          # consistent with the other typeshed stubs around them.
+          # Typeshed formats code using black in their CI, so we just invoke
+          # black on the stubs the same way that typeshed does.
+          uvx --directory=typeshed pre-commit run -a black || true
+
          rm -rf ruff/crates/ty_vendored/vendor/typeshed
          mkdir ruff/crates/ty_vendored/vendor/typeshed
          cp typeshed/README.md ruff/crates/ty_vendored/vendor/typeshed
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -81,7 +81,7 @@ repos:
        pass_filenames: false # This makes it a lot faster

  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.2
+    rev: v0.12.3
    hooks:
      - id: ruff-format
      - id: ruff
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -396,9 +396,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
+checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -406,9 +406,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
+checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
 dependencies = [
 "anstream",
 "anstyle",
@@ -449,9 +449,9 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
+checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
 dependencies = [
 "heck",
 "proc-macro2",
@@ -591,7 +591,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
 "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

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

 [[package]]
@@ -933,7 +933,7 @@ dependencies = [
 "libc",
 "option-ext",
 "redox_users",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]

 [[package]]
@@ -1013,7 +1013,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
 dependencies = [
 "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -1133,9 +1133,9 @@ dependencies = [

 [[package]]
 name = "get-size-derive2"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aac2af9f9a6a50e31b1e541d05b7925add83d3982c2793193fe9d4ee584323c"
+checksum = "028f3cfad7c3e3b1d8d04ef0a1c03576f2d62800803fe1301a4cd262849f2dea"
 dependencies = [
 "attribute-derive",
 "quote",
@@ -1144,9 +1144,9 @@ dependencies = [

 [[package]]
 name = "get-size2"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a0312efd19e1c45922dfcc2d6806d3ffc4bca261f89f31fcc4f63f438d885"
+checksum = "3a09c2043819a3def7bfbb4927e7df96aab0da4cfd8824484b22d0c94e84458e"
 dependencies = [
 "compact_str",
 "get-size-derive2",
@@ -1586,7 +1586,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
 "hermit-abi 0.5.1",
 "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -1650,7 +1650,7 @@ dependencies = [
 "portable-atomic",
 "portable-atomic-util",
 "serde",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -2465,7 +2465,7 @@ dependencies = [
 "pep508_rs",
 "serde",
 "thiserror 2.0.12",
- "toml",
+ "toml 0.8.23",
 ]

 [[package]]
@@ -2763,7 +2763,7 @@ dependencies = [
 "test-case",
 "thiserror 2.0.12",
 "tikv-jemallocator",
- "toml",
+ "toml 0.9.2",
 "tracing",
 "walkdir",
 "wild",
@@ -2779,7 +2779,7 @@ dependencies = [
 "ruff_annotate_snippets",
 "serde",
 "snapbox",
- "toml",
+ "toml 0.9.2",
 "tryfn",
 "unicode-width 0.2.1",
 ]
@@ -2852,6 +2852,7 @@ dependencies = [
 "salsa",
 "schemars",
 "serde",
+ "serde_json",
 "tempfile",
 "thiserror 2.0.12",
 "tracing",
@@ -2894,7 +2895,7 @@ dependencies = [
 "similar",
 "strum",
 "tempfile",
- "toml",
+ "toml 0.9.2",
 "tracing",
 "tracing-indicatif",
 "tracing-subscriber",
@@ -3015,7 +3016,7 @@ dependencies = [
 "tempfile",
 "test-case",
 "thiserror 2.0.12",
- "toml",
+ "toml 0.9.2",
 "typed-arena",
 "unicode-normalization",
 "unicode-width 0.2.1",
@@ -3265,7 +3266,7 @@ dependencies = [
 "serde_json",
 "shellexpand",
 "thiserror 2.0.12",
- "toml",
+ "toml 0.9.2",
 "tracing",
 "tracing-log",
 "tracing-subscriber",
@@ -3355,7 +3356,7 @@ dependencies = [
 "shellexpand",
 "strum",
 "tempfile",
- "toml",
+ "toml 0.9.2",
 ]

 [[package]]
@@ -3390,7 +3391,7 @@ dependencies = [
 "errno",
 "libc",
 "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -3575,6 +3576,15 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "serde_spanned"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_test"
 version = "1.0.177"
@@ -3780,7 +3790,7 @@ dependencies = [
 "getrandom 0.3.3",
 "once_cell",
 "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -3980,11 +3990,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
 "serde",
- "serde_spanned",
- "toml_datetime",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
 "toml_edit",
 ]

+[[package]]
+name = "toml"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed0aee96c12fa71097902e0bb061a5e1ebd766a6636bb605ba401c45c1650eac"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned 1.0.0",
+ "toml_datetime 0.7.0",
+ "toml_parser",
+ "toml_writer",
+ "winnow",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.6.11"
@@ -3994,6 +4019,15 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "toml_datetime"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.22.27"
@@ -4002,17 +4036,25 @@ checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
 "indexmap",
 "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_write",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
 "winnow",
 ]

 [[package]]
-name = "toml_write"
-version = "0.1.2"
+name = "toml_parser"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30"
+dependencies = [
+ "winnow",
+]
+
+[[package]]
+name = "toml_writer"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"

 [[package]]
 name = "tracing"
@@ -4135,7 +4177,7 @@ dependencies = [
 "ruff_python_trivia",
 "salsa",
 "tempfile",
- "toml",
+ "toml 0.9.2",
 "tracing",
 "tracing-flame",
 "tracing-subscriber",
@@ -4196,7 +4238,7 @@ dependencies = [
 "schemars",
 "serde",
 "thiserror 2.0.12",
- "toml",
+ "toml 0.9.2",
 "tracing",
 "ty_ide",
 "ty_python_semantic",
@@ -4265,6 +4307,7 @@ dependencies = [
 "lsp-types",
 "ruff_db",
 "ruff_notebook",
+ "ruff_python_ast",
 "ruff_source_file",
 "ruff_text_size",
 "rustc-hash",
@@ -4272,6 +4315,7 @@ dependencies = [
 "serde",
 "serde_json",
 "shellexpand",
+ "thiserror 2.0.12",
 "tracing",
 "tracing-subscriber",
 "ty_ide",
@@ -4312,7 +4356,7 @@ dependencies = [
 "smallvec",
 "tempfile",
 "thiserror 2.0.12",
- "toml",
+ "toml 0.9.2",
 "tracing",
 "ty_python_semantic",
 "ty_static",
@@ -4806,7 +4850,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -165,7 +165,7 @@ tempfile = { version = "3.9.0" }
 test-case = { version = "3.3.1" }
 thiserror = { version = "2.0.0" }
 tikv-jemallocator = { version = "0.6.0" }
-toml = { version = "0.8.11" }
+toml = { version = "0.9.0" }
 tracing = { version = "0.1.40" }
 tracing-flame = { version = "0.2.0" }
 tracing-indicatif = { version = "0.3.11" }
--- a/crates/ruff/src/lib.rs
+++ b/crates/ruff/src/lib.rs
@@ -131,6 +131,7 @@ pub fn run(
    }: Args,
 ) -> Result<ExitStatus> {
    {
+        ruff_db::set_program_version(crate::version::version().to_string()).unwrap();
        let default_panic_hook = std::panic::take_hook();
        std::panic::set_hook(Box::new(move |info| {
            #[expect(clippy::print_stderr)]
@@ -439,7 +440,7 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
        if cli.statistics {
            printer.write_statistics(&diagnostics, &mut summary_writer)?;
        } else {
-            printer.write_once(&diagnostics, &mut summary_writer)?;
+            printer.write_once(&diagnostics, &mut summary_writer, preview)?;
        }

        if !cli.exit_zero {
--- a/crates/ruff/src/printer.rs
+++ b/crates/ruff/src/printer.rs
@@ -9,13 +9,14 @@ use itertools::{Itertools, iterate};
 use ruff_linter::linter::FixTable;
 use serde::Serialize;

-use ruff_db::diagnostic::{Diagnostic, SecondaryCode};
+use ruff_db::diagnostic::{
+    Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig, DisplayDiagnostics, SecondaryCode,
+};
 use ruff_linter::fs::relativize_path;
 use ruff_linter::logging::LogLevel;
 use ruff_linter::message::{
-    AzureEmitter, Emitter, EmitterContext, GithubEmitter, GitlabEmitter, GroupedEmitter,
-    JsonEmitter, JsonLinesEmitter, JunitEmitter, PylintEmitter, RdjsonEmitter, SarifEmitter,
-    TextEmitter,
+    Emitter, EmitterContext, GithubEmitter, GitlabEmitter, GroupedEmitter, JunitEmitter,
+    PylintEmitter, RdjsonEmitter, SarifEmitter, TextEmitter,
 };
 use ruff_linter::notify_user;
 use ruff_linter::settings::flags::{self};
@@ -202,6 +203,7 @@ impl Printer {
        &self,
        diagnostics: &Diagnostics,
        writer: &mut dyn Write,
+        preview: bool,
    ) -> Result<()> {
        if matches!(self.log_level, LogLevel::Silent) {
            return Ok(());
@@ -229,13 +231,21 @@ impl Printer {

        match self.format {
            OutputFormat::Json => {
-                JsonEmitter.emit(writer, &diagnostics.inner, &context)?;
+                let config = DisplayDiagnosticConfig::default()
+                    .format(DiagnosticFormat::Json)
+                    .preview(preview);
+                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
+                write!(writer, "{value}")?;
            }
            OutputFormat::Rdjson => {
                RdjsonEmitter.emit(writer, &diagnostics.inner, &context)?;
            }
            OutputFormat::JsonLines => {
-                JsonLinesEmitter.emit(writer, &diagnostics.inner, &context)?;
+                let config = DisplayDiagnosticConfig::default()
+                    .format(DiagnosticFormat::JsonLines)
+                    .preview(preview);
+                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
+                write!(writer, "{value}")?;
            }
            OutputFormat::Junit => {
                JunitEmitter.emit(writer, &diagnostics.inner, &context)?;
@@ -283,7 +293,11 @@ impl Printer {
                PylintEmitter.emit(writer, &diagnostics.inner, &context)?;
            }
            OutputFormat::Azure => {
-                AzureEmitter.emit(writer, &diagnostics.inner, &context)?;
+                let config = DisplayDiagnosticConfig::default()
+                    .format(DiagnosticFormat::Azure)
+                    .preview(preview);
+                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
+                write!(writer, "{value}")?;
            }
            OutputFormat::Sarif => {
                SarifEmitter.emit(writer, &diagnostics.inner, &context)?;
--- a/crates/ruff/tests/format.rs
+++ b/crates/ruff/tests/format.rs
@@ -120,7 +120,7 @@ fn nonexistent_config_file() {
 #[test]
 fn config_override_rejected_if_invalid_toml() {
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--config", "foo = bar", "."]), @r#"
+        .args(["format", "--config", "foo = bar", "."]), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -137,12 +137,11 @@ fn config_override_rejected_if_invalid_toml() {
    TOML parse error at line 1, column 7
      |
    1 | foo = bar
-      |       ^
-    invalid string
-    expected `"`, `'`
+      |       ^^^
+    string values must be quoted, expected literal string

    For more information, try '--help'.
-    "#);
+    ");
 }

 #[test]
--- a/crates/ruff/tests/integration_test.rs
+++ b/crates/ruff/tests/integration_test.rs
@@ -2246,8 +2246,7 @@ fn pyproject_toml_stdin_syntax_error() {
    success: false
    exit_code: 1
    ----- stdout -----
-    pyproject.toml:1:9: RUF200 Failed to parse pyproject.toml: invalid table header
-    expected `.`, `]`
+    pyproject.toml:1:9: RUF200 Failed to parse pyproject.toml: unclosed table, expected `]`
      |
    1 | [project
      |         ^ RUF200
--- a/crates/ruff/tests/lint.rs
+++ b/crates/ruff/tests/lint.rs
@@ -534,7 +534,7 @@ fn nonexistent_config_file() {
 fn config_override_rejected_if_invalid_toml() {
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", "foo = bar", "."]), @r#"
+        .args(["--config", "foo = bar", "."]), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -551,12 +551,11 @@ fn config_override_rejected_if_invalid_toml() {
    TOML parse error at line 1, column 7
      |
    1 | foo = bar
-      |       ^
-    invalid string
-    expected `"`, `'`
+      |       ^^^
+    string values must be quoted, expected literal string

    For more information, try '--help'.
-    "#);
+    ");
 }

 #[test]
@@ -733,9 +732,8 @@ select = [E501]
      Cause: TOML parse error at line 3, column 11
      |
    3 | select = [E501]
-      |           ^
-    invalid array
-    expected `]`
+      |           ^^^^
+    string values must be quoted, expected literal string
    ");
    });

@@ -876,7 +874,7 @@ fn each_toml_option_requires_a_new_flag_1() {
      |
    1 | extend-select=['F841'], line-length=90
      |                       ^
-    expected newline, `#`
+    unexpected key or value, expected newline, `#`

    For more information, try '--help'.
    ");
@@ -907,7 +905,7 @@ fn each_toml_option_requires_a_new_flag_2() {
      |
    1 | extend-select=['F841'] line-length=90
      |                        ^
-    expected newline, `#`
+    unexpected key or value, expected newline, `#`

    For more information, try '--help'.
    ");
--- a/crates/ruff/tests/version.rs
+++ b/crates/ruff/tests/version.rs
@@ -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"]), @r"
        success: false
        exit_code: 2
        ----- stdout -----
@@ -77,12 +77,11 @@ fn config_option_ignored_but_validated() {
        TOML parse error at line 1, column 7
          |
        1 | foo = bar
-          |       ^
-        invalid string
-        expected `"`, `'`
+          |       ^^^
+        string values must be quoted, expected literal string

        For more information, try '--help'.
-        "#
+        "
        );
    });
 }
--- a/crates/ruff_db/Cargo.toml
+++ b/crates/ruff_db/Cargo.toml
@@ -38,6 +38,7 @@ rustc-hash = { workspace = true }
 salsa = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
+serde_json = { workspace = true, optional = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, optional = true }
@@ -56,6 +57,6 @@ tempfile = { workspace = true }
 [features]
 cache = ["ruff_cache"]
 os = ["ignore", "dep:etcetera"]
-serde = ["dep:serde", "camino/serde1"]
+serde = ["camino/serde1", "dep:serde", "dep:serde_json", "ruff_diagnostics/serde"]
 # Exposes testing utilities.
 testing = ["tracing-subscriber"]
--- a/crates/ruff_db/src/diagnostic/mod.rs
+++ b/crates/ruff_db/src/diagnostic/mod.rs
@@ -1,13 +1,12 @@
 use std::{fmt::Formatter, sync::Arc};

-use render::{FileResolver, Input};
 use ruff_diagnostics::Fix;
 use ruff_source_file::{LineColumn, SourceCode, SourceFile};

 use ruff_annotate_snippets::Level as AnnotateLevel;
 use ruff_text_size::{Ranged, TextRange, TextSize};

-pub use self::render::DisplayDiagnostic;
+pub use self::render::{DisplayDiagnostic, DisplayDiagnostics, FileResolver, Input};
 use crate::{Db, files::File};

 mod render;
@@ -380,7 +379,7 @@ impl Diagnostic {
    }

    /// Returns the URL for the rule documentation, if it exists.
-    pub fn to_url(&self) -> Option<String> {
+    pub fn to_ruff_url(&self) -> Option<String> {
        if self.is_invalid_syntax() {
            None
        } else {
@@ -432,8 +431,9 @@ impl Diagnostic {
    /// Returns the [`SourceFile`] which the message belongs to.
    ///
    /// Panics if the diagnostic has no primary span, or if its file is not a `SourceFile`.
-    pub fn expect_ruff_source_file(&self) -> SourceFile {
-        self.expect_primary_span().expect_ruff_file().clone()
+    pub fn expect_ruff_source_file(&self) -> &SourceFile {
+        self.ruff_source_file()
+            .expect("Expected a ruff source file")
    }

    /// Returns the [`TextRange`] for the diagnostic.
@@ -1174,6 +1174,12 @@ pub struct DisplayDiagnosticConfig {
    /// here for now as the most "sensible" place for it to live until
    /// we had more concrete use cases. ---AG
    context: usize,
+    /// Whether to use preview formatting for Ruff diagnostics.
+    #[allow(
+        dead_code,
+        reason = "This is currently only used for JSON but will be needed soon for other formats"
+    )]
+    preview: bool,
 }

 impl DisplayDiagnosticConfig {
@@ -1194,6 +1200,14 @@ impl DisplayDiagnosticConfig {
            ..self
        }
    }
+
+    /// Whether to enable preview behavior or not.
+    pub fn preview(self, yes: bool) -> DisplayDiagnosticConfig {
+        DisplayDiagnosticConfig {
+            preview: yes,
+            ..self
+        }
+    }
 }

 impl Default for DisplayDiagnosticConfig {
@@ -1202,6 +1216,7 @@ impl Default for DisplayDiagnosticConfig {
            format: DiagnosticFormat::default(),
            color: false,
            context: 2,
+            preview: false,
        }
    }
 }
@@ -1229,6 +1244,21 @@ pub enum DiagnosticFormat {
    ///
    /// This may use color when printing to a `tty`.
    Concise,
+    /// Print diagnostics in the [Azure Pipelines] format.
+    ///
+    /// [Azure Pipelines]: https://learn.microsoft.com/en-us/azure/devops/pipelines/scripts/logging-commands?view=azure-devops&tabs=bash#logissue-log-an-error-or-warning
+    Azure,
+    /// Print diagnostics in JSON format.
+    ///
+    /// Unlike `json-lines`, this prints all of the diagnostics as a JSON array.
+    #[cfg(feature = "serde")]
+    Json,
+    /// Print diagnostics in JSON format, one per line.
+    ///
+    /// This will print each diagnostic as a separate JSON object on its own line. See the `json`
+    /// format for an array of all diagnostics. See <https://jsonlines.org/> for more details.
+    #[cfg(feature = "serde")]
+    JsonLines,
 }

 /// A representation of the kinds of messages inside a diagnostic.
--- a/crates/ruff_db/src/diagnostic/render.rs
+++ b/crates/ruff_db/src/diagnostic/render.rs
@@ -4,6 +4,7 @@ use ruff_annotate_snippets::{
    Annotation as AnnotateAnnotation, Level as AnnotateLevel, Message as AnnotateMessage,
    Renderer as AnnotateRenderer, Snippet as AnnotateSnippet,
 };
+use ruff_notebook::{Notebook, NotebookIndex};
 use ruff_source_file::{LineIndex, OneIndexed, SourceCode};
 use ruff_text_size::{TextRange, TextSize};

@@ -17,9 +18,17 @@ use crate::{

 use super::{
    Annotation, Diagnostic, DiagnosticFormat, DiagnosticSource, DisplayDiagnosticConfig, Severity,
-    SubDiagnostic,
+    SubDiagnostic, UnifiedFile,
 };

+use azure::AzureRenderer;
+
+mod azure;
+#[cfg(feature = "serde")]
+mod json;
+#[cfg(feature = "serde")]
+mod json_lines;
+
 /// A type that implements `std::fmt::Display` for diagnostic rendering.
 ///
 /// It is created via [`Diagnostic::display`].
@@ -34,7 +43,6 @@ use super::{
 pub struct DisplayDiagnostic<'a> {
    config: &'a DisplayDiagnosticConfig,
    resolver: &'a dyn FileResolver,
-    annotate_renderer: AnnotateRenderer,
    diag: &'a Diagnostic,
 }

@@ -44,16 +52,9 @@ impl<'a> DisplayDiagnostic<'a> {
        config: &'a DisplayDiagnosticConfig,
        diag: &'a Diagnostic,
    ) -> DisplayDiagnostic<'a> {
-        let annotate_renderer = if config.color {
-            AnnotateRenderer::styled()
-        } else {
-            AnnotateRenderer::plain()
-        };
-
        DisplayDiagnostic {
            config,
            resolver,
-            annotate_renderer,
            diag,
        }
    }
@@ -61,68 +62,131 @@ impl<'a> DisplayDiagnostic<'a> {

 impl std::fmt::Display for DisplayDiagnostic<'_> {
    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        let stylesheet = if self.config.color {
-            DiagnosticStylesheet::styled()
-        } else {
-            DiagnosticStylesheet::plain()
-        };
+        DisplayDiagnostics::new(self.resolver, self.config, std::slice::from_ref(self.diag)).fmt(f)
+    }
+}

-        if matches!(self.config.format, DiagnosticFormat::Concise) {
-            let (severity, severity_style) = match self.diag.severity() {
-                Severity::Info => ("info", stylesheet.info),
-                Severity::Warning => ("warning", stylesheet.warning),
-                Severity::Error => ("error", stylesheet.error),
-                Severity::Fatal => ("fatal", stylesheet.error),
-            };
+/// A type that implements `std::fmt::Display` for rendering a collection of diagnostics.
+///
+/// It is intended for collections of diagnostics that need to be serialized together, as is the
+/// case for JSON, for example.
+///
+/// See [`DisplayDiagnostic`] for rendering individual `Diagnostic`s and details about the lifetime
+/// constraints.
+pub struct DisplayDiagnostics<'a> {
+    config: &'a DisplayDiagnosticConfig,
+    resolver: &'a dyn FileResolver,
+    diagnostics: &'a [Diagnostic],
+}

-            write!(
-                f,
-                "{severity}[{id}]",
-                severity = fmt_styled(severity, severity_style),
-                id = fmt_styled(self.diag.id(), stylesheet.emphasis)
-            )?;
+impl<'a> DisplayDiagnostics<'a> {
+    pub fn new(
+        resolver: &'a dyn FileResolver,
+        config: &'a DisplayDiagnosticConfig,
+        diagnostics: &'a [Diagnostic],
+    ) -> DisplayDiagnostics<'a> {
+        DisplayDiagnostics {
+            config,
+            resolver,
+            diagnostics,
+        }
+    }
+}

-            if let Some(span) = self.diag.primary_span() {
-                write!(
-                    f,
-                    " {path}",
-                    path = fmt_styled(span.file().path(self.resolver), stylesheet.emphasis)
-                )?;
-                if let Some(range) = span.range() {
-                    let diagnostic_source = span.file().diagnostic_source(self.resolver);
-                    let start = diagnostic_source
-                        .as_source_code()
-                        .line_column(range.start());
+impl std::fmt::Display for DisplayDiagnostics<'_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        match self.config.format {
+            DiagnosticFormat::Concise => {
+                let stylesheet = if self.config.color {
+                    DiagnosticStylesheet::styled()
+                } else {
+                    DiagnosticStylesheet::plain()
+                };

+                for diag in self.diagnostics {
+                    let (severity, severity_style) = match diag.severity() {
+                        Severity::Info => ("info", stylesheet.info),
+                        Severity::Warning => ("warning", stylesheet.warning),
+                        Severity::Error => ("error", stylesheet.error),
+                        Severity::Fatal => ("fatal", stylesheet.error),
+                    };
                    write!(
                        f,
-                        ":{line}:{col}",
-                        line = fmt_styled(start.line, stylesheet.emphasis),
-                        col = fmt_styled(start.column, stylesheet.emphasis),
+                        "{severity}[{id}]",
+                        severity = fmt_styled(severity, severity_style),
+                        id = fmt_styled(diag.id(), stylesheet.emphasis)
                    )?;
+                    if let Some(span) = diag.primary_span() {
+                        write!(
+                            f,
+                            " {path}",
+                            path = fmt_styled(span.file().path(self.resolver), stylesheet.emphasis)
+                        )?;
+                        if let Some(range) = span.range() {
+                            let diagnostic_source = span.file().diagnostic_source(self.resolver);
+                            let start = diagnostic_source
+                                .as_source_code()
+                                .line_column(range.start());
+
+                            write!(
+                                f,
+                                ":{line}:{col}",
+                                line = fmt_styled(start.line, stylesheet.emphasis),
+                                col = fmt_styled(start.column, stylesheet.emphasis),
+                            )?;
+                        }
+                        write!(f, ":")?;
+                    }
+                    writeln!(f, " {message}", message = diag.concise_message())?;
                }
-                write!(f, ":")?;
            }
-            return writeln!(f, " {message}", message = self.diag.concise_message());
+            DiagnosticFormat::Full => {
+                let stylesheet = if self.config.color {
+                    DiagnosticStylesheet::styled()
+                } else {
+                    DiagnosticStylesheet::plain()
+                };
+
+                let mut renderer = if self.config.color {
+                    AnnotateRenderer::styled()
+                } else {
+                    AnnotateRenderer::plain()
+                };
+
+                renderer = renderer
+                    .error(stylesheet.error)
+                    .warning(stylesheet.warning)
+                    .info(stylesheet.info)
+                    .note(stylesheet.note)
+                    .help(stylesheet.help)
+                    .line_no(stylesheet.line_no)
+                    .emphasis(stylesheet.emphasis)
+                    .none(stylesheet.none);
+
+                for diag in self.diagnostics {
+                    let resolved = Resolved::new(self.resolver, diag);
+                    let renderable = resolved.to_renderable(self.config.context);
+                    for diag in renderable.diagnostics.iter() {
+                        writeln!(f, "{}", renderer.render(diag.to_annotate()))?;
+                    }
+                    writeln!(f)?;
+                }
+            }
+            DiagnosticFormat::Azure => {
+                AzureRenderer::new(self.resolver).render(f, self.diagnostics)?;
+            }
+            #[cfg(feature = "serde")]
+            DiagnosticFormat::Json => {
+                json::JsonRenderer::new(self.resolver, self.config).render(f, self.diagnostics)?;
+            }
+            #[cfg(feature = "serde")]
+            DiagnosticFormat::JsonLines => {
+                json_lines::JsonLinesRenderer::new(self.resolver, self.config)
+                    .render(f, self.diagnostics)?;
+            }
        }

-        let mut renderer = self.annotate_renderer.clone();
-        renderer = renderer
-            .error(stylesheet.error)
-            .warning(stylesheet.warning)
-            .info(stylesheet.info)
-            .note(stylesheet.note)
-            .help(stylesheet.help)
-            .line_no(stylesheet.line_no)
-            .emphasis(stylesheet.emphasis)
-            .none(stylesheet.none);
-
-        let resolved = Resolved::new(self.resolver, self.diag);
-        let renderable = resolved.to_renderable(self.config.context);
-        for diag in renderable.diagnostics.iter() {
-            writeln!(f, "{}", renderer.render(diag.to_annotate()))?;
-        }
-        writeln!(f)
+        Ok(())
    }
 }

@@ -635,6 +699,12 @@ pub trait FileResolver {

    /// Returns the input contents associated with the file given.
    fn input(&self, file: File) -> Input;
+
+    /// Returns the [`NotebookIndex`] associated with the file given, if it's a Jupyter notebook.
+    fn notebook_index(&self, file: &UnifiedFile) -> Option<NotebookIndex>;
+
+    /// Returns whether the file given is a Jupyter notebook.
+    fn is_notebook(&self, file: &UnifiedFile) -> bool;
 }

 impl<T> FileResolver for T
@@ -651,6 +721,25 @@ where
            line_index: line_index(self, file),
        }
    }
+
+    fn notebook_index(&self, file: &UnifiedFile) -> Option<NotebookIndex> {
+        match file {
+            UnifiedFile::Ty(file) => self
+                .input(*file)
+                .text
+                .as_notebook()
+                .map(Notebook::index)
+                .cloned(),
+            UnifiedFile::Ruff(_) => unimplemented!("Expected an interned ty file"),
+        }
+    }
+
+    fn is_notebook(&self, file: &UnifiedFile) -> bool {
+        match file {
+            UnifiedFile::Ty(file) => self.input(*file).text.as_notebook().is_some(),
+            UnifiedFile::Ruff(_) => unimplemented!("Expected an interned ty file"),
+        }
+    }
 }

 impl FileResolver for &dyn Db {
@@ -664,6 +753,25 @@ impl FileResolver for &dyn Db {
            line_index: line_index(*self, file),
        }
    }
+
+    fn notebook_index(&self, file: &UnifiedFile) -> Option<NotebookIndex> {
+        match file {
+            UnifiedFile::Ty(file) => self
+                .input(*file)
+                .text
+                .as_notebook()
+                .map(Notebook::index)
+                .cloned(),
+            UnifiedFile::Ruff(_) => unimplemented!("Expected an interned ty file"),
+        }
+    }
+
+    fn is_notebook(&self, file: &UnifiedFile) -> bool {
+        match file {
+            UnifiedFile::Ty(file) => self.input(*file).text.as_notebook().is_some(),
+            UnifiedFile::Ruff(_) => unimplemented!("Expected an interned ty file"),
+        }
+    }
 }

 /// An abstraction over a unit of user input.
@@ -724,7 +832,9 @@ fn relativize_path<'p>(cwd: &SystemPath, path: &'p str) -> &'p str {
 #[cfg(test)]
 mod tests {

-    use crate::diagnostic::{Annotation, DiagnosticId, Severity, Span};
+    use ruff_diagnostics::{Edit, Fix};
+
+    use crate::diagnostic::{Annotation, DiagnosticId, SecondaryCode, Severity, Span};
    use crate::files::system_path_to_file;
    use crate::system::{DbWithWritableSystem, SystemPath};
    use crate::tests::TestDb;
@@ -2121,7 +2231,7 @@ watermelon

    /// A small harness for setting up an environment specifically for testing
    /// diagnostic rendering.
-    struct TestEnvironment {
+    pub(super) struct TestEnvironment {
        db: TestDb,
        config: DisplayDiagnosticConfig,
    }
@@ -2130,7 +2240,7 @@ watermelon
        /// Create a new test harness.
        ///
        /// This uses the default diagnostic rendering configuration.
-        fn new() -> TestEnvironment {
+        pub(super) fn new() -> TestEnvironment {
            TestEnvironment {
                db: TestDb::new(),
                config: DisplayDiagnosticConfig::default(),
@@ -2149,8 +2259,26 @@ watermelon
            self.config = config;
        }

+        /// Set the output format to use in diagnostic rendering.
+        pub(super) fn format(&mut self, format: DiagnosticFormat) {
+            let mut config = std::mem::take(&mut self.config);
+            config = config.format(format);
+            self.config = config;
+        }
+
+        /// Enable preview functionality for diagnostic rendering.
+        #[allow(
+            dead_code,
+            reason = "This is currently only used for JSON but will be needed soon for other formats"
+        )]
+        pub(super) fn preview(&mut self, yes: bool) {
+            let mut config = std::mem::take(&mut self.config);
+            config = config.preview(yes);
+            self.config = config;
+        }
+
        /// Add a file with the given path and contents to this environment.
-        fn add(&mut self, path: &str, contents: &str) {
+        pub(super) fn add(&mut self, path: &str, contents: &str) {
            let path = SystemPath::new(path);
            self.db.write_file(path, contents).unwrap();
        }
@@ -2200,7 +2328,7 @@ watermelon
        /// A convenience function for returning a builder for a diagnostic
        /// with "error" severity and canned values for its identifier
        /// and message.
-        fn err(&mut self) -> DiagnosticBuilder<'_> {
+        pub(super) fn err(&mut self) -> DiagnosticBuilder<'_> {
            self.builder(
                "test-diagnostic",
                Severity::Error,
@@ -2226,6 +2354,12 @@ watermelon
            DiagnosticBuilder { env: self, diag }
        }

+        /// A convenience function for returning a builder for an invalid syntax diagnostic.
+        fn invalid_syntax(&mut self, message: &str) -> DiagnosticBuilder<'_> {
+            let diag = Diagnostic::new(DiagnosticId::InvalidSyntax, Severity::Error, message);
+            DiagnosticBuilder { env: self, diag }
+        }
+
        /// Returns a builder for tersely constructing sub-diagnostics.
        fn sub_builder(&mut self, severity: Severity, message: &str) -> SubDiagnosticBuilder<'_> {
            let subdiag = SubDiagnostic::new(severity, message);
@@ -2235,9 +2369,18 @@ watermelon
        /// Render the given diagnostic into a `String`.
        ///
        /// (This will set the "printed" flag on `Diagnostic`.)
-        fn render(&self, diag: &Diagnostic) -> String {
+        pub(super) fn render(&self, diag: &Diagnostic) -> String {
            diag.display(&self.db, &self.config).to_string()
        }
+
+        /// Render the given diagnostics into a `String`.
+        ///
+        /// See `render` for rendering a single diagnostic.
+        ///
+        /// (This will set the "printed" flag on `Diagnostic`.)
+        pub(super) fn render_diagnostics(&self, diagnostics: &[Diagnostic]) -> String {
+            DisplayDiagnostics::new(&self.db, &self.config, diagnostics).to_string()
+        }
    }

    /// A helper builder for tersely populating a `Diagnostic`.
@@ -2246,14 +2389,14 @@ watermelon
    /// supported by this builder, and this only needs to be done
    /// infrequently, consider doing it more verbosely on `diag`
    /// itself.
-    struct DiagnosticBuilder<'e> {
+    pub(super) struct DiagnosticBuilder<'e> {
        env: &'e mut TestEnvironment,
        diag: Diagnostic,
    }

    impl<'e> DiagnosticBuilder<'e> {
        /// Return the built diagnostic.
-        fn build(self) -> Diagnostic {
+        pub(super) fn build(self) -> Diagnostic {
            self.diag
        }

@@ -2302,6 +2445,25 @@ watermelon
            self.diag.annotate(ann);
            self
        }
+
+        /// Set the secondary code on the diagnostic.
+        fn secondary_code(mut self, secondary_code: &str) -> DiagnosticBuilder<'e> {
+            self.diag
+                .set_secondary_code(SecondaryCode::new(secondary_code.to_string()));
+            self
+        }
+
+        /// Set the fix on the diagnostic.
+        pub(super) fn fix(mut self, fix: Fix) -> DiagnosticBuilder<'e> {
+            self.diag.set_fix(fix);
+            self
+        }
+
+        /// Set the noqa offset on the diagnostic.
+        fn noqa_offset(mut self, noqa_offset: TextSize) -> DiagnosticBuilder<'e> {
+            self.diag.set_noqa_offset(noqa_offset);
+            self
+        }
    }

    /// A helper builder for tersely populating a `SubDiagnostic`.
@@ -2381,4 +2543,199 @@ watermelon
        let offset = TextSize::from(offset.parse::<u32>().unwrap());
        (line_number, Some(offset))
    }
+
+    /// Create Ruff-style diagnostics for testing the various output formats.
+    pub(crate) fn create_diagnostics(
+        format: DiagnosticFormat,
+    ) -> (TestEnvironment, Vec<Diagnostic>) {
+        let mut env = TestEnvironment::new();
+        env.add(
+            "fib.py",
+            r#"import os
+
+
+def fibonacci(n):
+    """Compute the nth number in the Fibonacci sequence."""
+    x = 1
+    if n == 0:
+        return 0
+    elif n == 1:
+        return 1
+    else:
+        return fibonacci(n - 1) + fibonacci(n - 2)
+"#,
+        );
+        env.add("undef.py", r"if a == 1: pass");
+        env.format(format);
+
+        let diagnostics = vec![
+            env.builder("unused-import", Severity::Error, "`os` imported but unused")
+                .primary("fib.py", "1:7", "1:9", "Remove unused import: `os`")
+                .secondary_code("F401")
+                .fix(Fix::unsafe_edit(Edit::range_deletion(TextRange::new(
+                    TextSize::from(0),
+                    TextSize::from(10),
+                ))))
+                .noqa_offset(TextSize::from(7))
+                .build(),
+            env.builder(
+                "unused-variable",
+                Severity::Error,
+                "Local variable `x` is assigned to but never used",
+            )
+            .primary(
+                "fib.py",
+                "6:4",
+                "6:5",
+                "Remove assignment to unused variable `x`",
+            )
+            .secondary_code("F841")
+            .fix(Fix::unsafe_edit(Edit::deletion(
+                TextSize::from(94),
+                TextSize::from(99),
+            )))
+            .noqa_offset(TextSize::from(94))
+            .build(),
+            env.builder("undefined-name", Severity::Error, "Undefined name `a`")
+                .primary("undef.py", "1:3", "1:4", "")
+                .secondary_code("F821")
+                .noqa_offset(TextSize::from(3))
+                .build(),
+        ];
+
+        (env, diagnostics)
+    }
+
+    /// Create Ruff-style syntax error diagnostics for testing the various output formats.
+    pub(crate) fn create_syntax_error_diagnostics(
+        format: DiagnosticFormat,
+    ) -> (TestEnvironment, Vec<Diagnostic>) {
+        let mut env = TestEnvironment::new();
+        env.add(
+            "syntax_errors.py",
+            r"from os import
+
+if call(foo
+    def bar():
+        pass
+",
+        );
+        env.format(format);
+
+        let diagnostics = vec![
+            env.invalid_syntax("SyntaxError: Expected one or more symbol names after import")
+                .primary("syntax_errors.py", "1:14", "1:15", "")
+                .build(),
+            env.invalid_syntax("SyntaxError: Expected ')', found newline")
+                .primary("syntax_errors.py", "3:11", "3:12", "")
+                .build(),
+        ];
+
+        (env, diagnostics)
+    }
+
+    /// Create Ruff-style diagnostics for testing the various output formats for a notebook.
+    #[allow(
+        dead_code,
+        reason = "This is currently only used for JSON but will be needed soon for other formats"
+    )]
+    pub(crate) fn create_notebook_diagnostics(
+        format: DiagnosticFormat,
+    ) -> (TestEnvironment, Vec<Diagnostic>) {
+        let mut env = TestEnvironment::new();
+        env.add(
+            "notebook.ipynb",
+            r##"
+        {
+ "cells": [
+  {
+   "cell_type": "code",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# cell 1\n",
+    "import os"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# cell 2\n",
+    "import math\n",
+    "\n",
+    "print('hello world')"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# cell 3\n",
+    "def foo():\n",
+    "    print()\n",
+    "    x = 1\n"
+   ]
+  }
+ ],
+ "metadata": {},
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
+"##,
+        );
+        env.format(format);
+
+        let diagnostics = vec![
+            env.builder("unused-import", Severity::Error, "`os` imported but unused")
+                .primary("notebook.ipynb", "2:7", "2:9", "Remove unused import: `os`")
+                .secondary_code("F401")
+                .fix(Fix::safe_edit(Edit::range_deletion(TextRange::new(
+                    TextSize::from(9),
+                    TextSize::from(19),
+                ))))
+                .noqa_offset(TextSize::from(16))
+                .build(),
+            env.builder(
+                "unused-import",
+                Severity::Error,
+                "`math` imported but unused",
+            )
+            .primary(
+                "notebook.ipynb",
+                "4:7",
+                "4:11",
+                "Remove unused import: `math`",
+            )
+            .secondary_code("F401")
+            .fix(Fix::safe_edit(Edit::range_deletion(TextRange::new(
+                TextSize::from(28),
+                TextSize::from(40),
+            ))))
+            .noqa_offset(TextSize::from(35))
+            .build(),
+            env.builder(
+                "unused-variable",
+                Severity::Error,
+                "Local variable `x` is assigned to but never used",
+            )
+            .primary(
+                "notebook.ipynb",
+                "10:4",
+                "10:5",
+                "Remove assignment to unused variable `x`",
+            )
+            .secondary_code("F841")
+            .fix(Fix::unsafe_edit(Edit::range_deletion(TextRange::new(
+                TextSize::from(94),
+                TextSize::from(104),
+            ))))
+            .noqa_offset(TextSize::from(98))
+            .build(),
+        ];
+
+        (env, diagnostics)
+    }
 }
--- a/crates/ruff_db/src/diagnostic/render/azure.rs
+++ b/crates/ruff_db/src/diagnostic/render/azure.rs
@@ -0,0 +1,83 @@
+use ruff_source_file::LineColumn;
+
+use crate::diagnostic::{Diagnostic, Severity};
+
+use super::FileResolver;
+
+pub(super) struct AzureRenderer<'a> {
+    resolver: &'a dyn FileResolver,
+}
+
+impl<'a> AzureRenderer<'a> {
+    pub(super) fn new(resolver: &'a dyn FileResolver) -> Self {
+        Self { resolver }
+    }
+}
+
+impl AzureRenderer<'_> {
+    pub(super) fn render(
+        &self,
+        f: &mut std::fmt::Formatter,
+        diagnostics: &[Diagnostic],
+    ) -> std::fmt::Result {
+        for diag in diagnostics {
+            let severity = match diag.severity() {
+                Severity::Info | Severity::Warning => "warning",
+                Severity::Error | Severity::Fatal => "error",
+            };
+            write!(f, "##vso[task.logissue type={severity};")?;
+            if let Some(span) = diag.primary_span() {
+                let filename = span.file().path(self.resolver);
+                write!(f, "sourcepath={filename};")?;
+                if let Some(range) = span.range() {
+                    let location = if self.resolver.notebook_index(span.file()).is_some() {
+                        // We can't give a reasonable location for the structured formats,
+                        // so we show one that's clearly a fallback
+                        LineColumn::default()
+                    } else {
+                        span.file()
+                            .diagnostic_source(self.resolver)
+                            .as_source_code()
+                            .line_column(range.start())
+                    };
+                    write!(
+                        f,
+                        "linenumber={line};columnnumber={col};",
+                        line = location.line,
+                        col = location.column,
+                    )?;
+                }
+            }
+            writeln!(
+                f,
+                "{code}]{body}",
+                code = diag
+                    .secondary_code()
+                    .map_or_else(String::new, |code| format!("code={code};")),
+                body = diag.body(),
+            )?;
+        }
+
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::diagnostic::{
+        DiagnosticFormat,
+        render::tests::{create_diagnostics, create_syntax_error_diagnostics},
+    };
+
+    #[test]
+    fn output() {
+        let (env, diagnostics) = create_diagnostics(DiagnosticFormat::Azure);
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
+    }
+
+    #[test]
+    fn syntax_errors() {
+        let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Azure);
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
+    }
+}
--- a/crates/ruff_db/src/diagnostic/render/json.rs
+++ b/crates/ruff_db/src/diagnostic/render/json.rs
@@ -0,0 +1,393 @@
+use serde::{Serialize, Serializer, ser::SerializeSeq};
+use serde_json::{Value, json};
+
+use ruff_diagnostics::{Applicability, Edit};
+use ruff_notebook::NotebookIndex;
+use ruff_source_file::{LineColumn, OneIndexed};
+use ruff_text_size::Ranged;
+
+use crate::diagnostic::{Diagnostic, DiagnosticSource, DisplayDiagnosticConfig, SecondaryCode};
+
+use super::FileResolver;
+
+pub(super) struct JsonRenderer<'a> {
+    resolver: &'a dyn FileResolver,
+    config: &'a DisplayDiagnosticConfig,
+}
+
+impl<'a> JsonRenderer<'a> {
+    pub(super) fn new(resolver: &'a dyn FileResolver, config: &'a DisplayDiagnosticConfig) -> Self {
+        Self { resolver, config }
+    }
+}
+
+impl JsonRenderer<'_> {
+    pub(super) fn render(
+        &self,
+        f: &mut std::fmt::Formatter,
+        diagnostics: &[Diagnostic],
+    ) -> std::fmt::Result {
+        write!(
+            f,
+            "{:#}",
+            diagnostics_to_json_value(diagnostics, self.resolver, self.config)
+        )
+    }
+}
+
+fn diagnostics_to_json_value<'a>(
+    diagnostics: impl IntoIterator<Item = &'a Diagnostic>,
+    resolver: &dyn FileResolver,
+    config: &DisplayDiagnosticConfig,
+) -> Value {
+    let values: Vec<_> = diagnostics
+        .into_iter()
+        .map(|diag| diagnostic_to_json(diag, resolver, config))
+        .collect();
+    json!(values)
+}
+
+pub(super) fn diagnostic_to_json<'a>(
+    diagnostic: &'a Diagnostic,
+    resolver: &'a dyn FileResolver,
+    config: &'a DisplayDiagnosticConfig,
+) -> JsonDiagnostic<'a> {
+    let span = diagnostic.primary_span_ref();
+    let filename = span.map(|span| span.file().path(resolver));
+    let range = span.and_then(|span| span.range());
+    let diagnostic_source = span.map(|span| span.file().diagnostic_source(resolver));
+    let source_code = diagnostic_source
+        .as_ref()
+        .map(|diagnostic_source| diagnostic_source.as_source_code());
+    let notebook_index = span.and_then(|span| resolver.notebook_index(span.file()));
+
+    let mut start_location = None;
+    let mut end_location = None;
+    let mut noqa_location = None;
+    let mut notebook_cell_index = None;
+    if let Some(source_code) = source_code {
+        noqa_location = diagnostic
+            .noqa_offset()
+            .map(|offset| source_code.line_column(offset));
+        if let Some(range) = range {
+            let mut start = source_code.line_column(range.start());
+            let mut end = source_code.line_column(range.end());
+            if let Some(notebook_index) = &notebook_index {
+                notebook_cell_index =
+                    Some(notebook_index.cell(start.line).unwrap_or(OneIndexed::MIN));
+                start = notebook_index.translate_line_column(&start);
+                end = notebook_index.translate_line_column(&end);
+                noqa_location =
+                    noqa_location.map(|location| notebook_index.translate_line_column(&location));
+            }
+            start_location = Some(start);
+            end_location = Some(end);
+        }
+    }
+
+    let fix = diagnostic.fix().map(|fix| JsonFix {
+        applicability: fix.applicability(),
+        message: diagnostic.suggestion(),
+        edits: ExpandedEdits {
+            edits: fix.edits(),
+            notebook_index,
+            config,
+            diagnostic_source,
+        },
+    });
+
+    // In preview, the locations and filename can be optional.
+    if config.preview {
+        JsonDiagnostic {
+            code: diagnostic.secondary_code(),
+            url: diagnostic.to_ruff_url(),
+            message: diagnostic.body(),
+            fix,
+            cell: notebook_cell_index,
+            location: start_location.map(JsonLocation::from),
+            end_location: end_location.map(JsonLocation::from),
+            filename,
+            noqa_row: noqa_location.map(|location| location.line),
+        }
+    } else {
+        JsonDiagnostic {
+            code: diagnostic.secondary_code(),
+            url: diagnostic.to_ruff_url(),
+            message: diagnostic.body(),
+            fix,
+            cell: notebook_cell_index,
+            location: Some(start_location.unwrap_or_default().into()),
+            end_location: Some(end_location.unwrap_or_default().into()),
+            filename: Some(filename.unwrap_or_default()),
+            noqa_row: noqa_location.map(|location| location.line),
+        }
+    }
+}
+
+struct ExpandedEdits<'a> {
+    edits: &'a [Edit],
+    notebook_index: Option<NotebookIndex>,
+    config: &'a DisplayDiagnosticConfig,
+    diagnostic_source: Option<DiagnosticSource>,
+}
+
+impl Serialize for ExpandedEdits<'_> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut s = serializer.serialize_seq(Some(self.edits.len()))?;
+
+        for edit in self.edits {
+            let (location, end_location) = if let Some(diagnostic_source) = &self.diagnostic_source
+            {
+                let source_code = diagnostic_source.as_source_code();
+                let mut location = source_code.line_column(edit.start());
+                let mut end_location = source_code.line_column(edit.end());
+
+                if let Some(notebook_index) = &self.notebook_index {
+                    // There exists a newline between each cell's source code in the
+                    // concatenated source code in Ruff. This newline doesn't actually
+                    // exists in the JSON source field.
+                    //
+                    // Now, certain edits may try to remove this newline, which means
+                    // the edit will spill over to the first character of the next cell.
+                    // If it does, we need to translate the end location to the last
+                    // character of the previous cell.
+                    match (
+                        notebook_index.cell(location.line),
+                        notebook_index.cell(end_location.line),
+                    ) {
+                        (Some(start_cell), Some(end_cell)) if start_cell != end_cell => {
+                            debug_assert_eq!(end_location.column.get(), 1);
+
+                            let prev_row = end_location.line.saturating_sub(1);
+                            end_location = LineColumn {
+                                line: notebook_index.cell_row(prev_row).unwrap_or(OneIndexed::MIN),
+                                column: source_code
+                                    .line_column(source_code.line_end_exclusive(prev_row))
+                                    .column,
+                            };
+                        }
+                        (Some(_), None) => {
+                            debug_assert_eq!(end_location.column.get(), 1);
+
+                            let prev_row = end_location.line.saturating_sub(1);
+                            end_location = LineColumn {
+                                line: notebook_index.cell_row(prev_row).unwrap_or(OneIndexed::MIN),
+                                column: source_code
+                                    .line_column(source_code.line_end_exclusive(prev_row))
+                                    .column,
+                            };
+                        }
+                        _ => {
+                            end_location = notebook_index.translate_line_column(&end_location);
+                        }
+                    }
+                    location = notebook_index.translate_line_column(&location);
+                }
+
+                (Some(location), Some(end_location))
+            } else {
+                (None, None)
+            };
+
+            // In preview, the locations can be optional.
+            let value = if self.config.preview {
+                JsonEdit {
+                    content: edit.content().unwrap_or_default(),
+                    location: location.map(JsonLocation::from),
+                    end_location: end_location.map(JsonLocation::from),
+                }
+            } else {
+                JsonEdit {
+                    content: edit.content().unwrap_or_default(),
+                    location: Some(location.unwrap_or_default().into()),
+                    end_location: Some(end_location.unwrap_or_default().into()),
+                }
+            };
+
+            s.serialize_element(&value)?;
+        }
+
+        s.end()
+    }
+}
+
+/// A serializable version of `Diagnostic`.
+///
+/// The `Old` variant only exists to preserve backwards compatibility. Both this and `JsonEdit`
+/// should become structs with the `New` definitions in a future Ruff release.
+#[derive(Serialize)]
+pub(crate) struct JsonDiagnostic<'a> {
+    cell: Option<OneIndexed>,
+    code: Option<&'a SecondaryCode>,
+    end_location: Option<JsonLocation>,
+    filename: Option<&'a str>,
+    fix: Option<JsonFix<'a>>,
+    location: Option<JsonLocation>,
+    message: &'a str,
+    noqa_row: Option<OneIndexed>,
+    url: Option<String>,
+}
+
+#[derive(Serialize)]
+struct JsonFix<'a> {
+    applicability: Applicability,
+    edits: ExpandedEdits<'a>,
+    message: Option<&'a str>,
+}
+
+#[derive(Serialize)]
+struct JsonLocation {
+    column: OneIndexed,
+    row: OneIndexed,
+}
+
+impl From<LineColumn> for JsonLocation {
+    fn from(location: LineColumn) -> Self {
+        JsonLocation {
+            row: location.line,
+            column: location.column,
+        }
+    }
+}
+
+#[derive(Serialize)]
+struct JsonEdit<'a> {
+    content: &'a str,
+    end_location: Option<JsonLocation>,
+    location: Option<JsonLocation>,
+}
+
+#[cfg(test)]
+mod tests {
+    use ruff_diagnostics::{Edit, Fix};
+    use ruff_text_size::TextSize;
+
+    use crate::diagnostic::{
+        DiagnosticFormat,
+        render::tests::{
+            TestEnvironment, create_diagnostics, create_notebook_diagnostics,
+            create_syntax_error_diagnostics,
+        },
+    };
+
+    #[test]
+    fn output() {
+        let (env, diagnostics) = create_diagnostics(DiagnosticFormat::Json);
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
+    }
+
+    #[test]
+    fn syntax_errors() {
+        let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Json);
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
+    }
+
+    #[test]
+    fn notebook_output() {
+        let (env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Json);
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
+    }
+
+    #[test]
+    fn missing_file_stable() {
+        let mut env = TestEnvironment::new();
+        env.format(DiagnosticFormat::Json);
+        env.preview(false);
+
+        let diag = env
+            .err()
+            .fix(Fix::safe_edit(Edit::insertion(
+                "edit".to_string(),
+                TextSize::from(0),
+            )))
+            .build();
+
+        insta::assert_snapshot!(
+            env.render(&diag),
+            @r#"
+        [
+          {
+            "cell": null,
+            "code": null,
+            "end_location": {
+              "column": 1,
+              "row": 1
+            },
+            "filename": "",
+            "fix": {
+              "applicability": "safe",
+              "edits": [
+                {
+                  "content": "edit",
+                  "end_location": {
+                    "column": 1,
+                    "row": 1
+                  },
+                  "location": {
+                    "column": 1,
+                    "row": 1
+                  }
+                }
+              ],
+              "message": null
+            },
+            "location": {
+              "column": 1,
+              "row": 1
+            },
+            "message": "main diagnostic message",
+            "noqa_row": null,
+            "url": "https://docs.astral.sh/ruff/rules/test-diagnostic"
+          }
+        ]
+        "#,
+        );
+    }
+
+    #[test]
+    fn missing_file_preview() {
+        let mut env = TestEnvironment::new();
+        env.format(DiagnosticFormat::Json);
+        env.preview(true);
+
+        let diag = env
+            .err()
+            .fix(Fix::safe_edit(Edit::insertion(
+                "edit".to_string(),
+                TextSize::from(0),
+            )))
+            .build();
+
+        insta::assert_snapshot!(
+            env.render(&diag),
+            @r#"
+        [
+          {
+            "cell": null,
+            "code": null,
+            "end_location": null,
+            "filename": null,
+            "fix": {
+              "applicability": "safe",
+              "edits": [
+                {
+                  "content": "edit",
+                  "end_location": null,
+                  "location": null
+                }
+              ],
+              "message": null
+            },
+            "location": null,
+            "message": "main diagnostic message",
+            "noqa_row": null,
+            "url": "https://docs.astral.sh/ruff/rules/test-diagnostic"
+          }
+        ]
+        "#,
+        );
+    }
+}
--- a/crates/ruff_db/src/diagnostic/render/json_lines.rs
+++ b/crates/ruff_db/src/diagnostic/render/json_lines.rs
@@ -0,0 +1,59 @@
+use crate::diagnostic::{Diagnostic, DisplayDiagnosticConfig, render::json::diagnostic_to_json};
+
+use super::FileResolver;
+
+pub(super) struct JsonLinesRenderer<'a> {
+    resolver: &'a dyn FileResolver,
+    config: &'a DisplayDiagnosticConfig,
+}
+
+impl<'a> JsonLinesRenderer<'a> {
+    pub(super) fn new(resolver: &'a dyn FileResolver, config: &'a DisplayDiagnosticConfig) -> Self {
+        Self { resolver, config }
+    }
+}
+
+impl JsonLinesRenderer<'_> {
+    pub(super) fn render(
+        &self,
+        f: &mut std::fmt::Formatter,
+        diagnostics: &[Diagnostic],
+    ) -> std::fmt::Result {
+        for diag in diagnostics {
+            writeln!(
+                f,
+                "{}",
+                serde_json::json!(diagnostic_to_json(diag, self.resolver, self.config))
+            )?;
+        }
+
+        Ok(())
+    }
+}
+#[cfg(test)]
+mod tests {
+    use crate::diagnostic::{
+        DiagnosticFormat,
+        render::tests::{
+            create_diagnostics, create_notebook_diagnostics, create_syntax_error_diagnostics,
+        },
+    };
+
+    #[test]
+    fn output() {
+        let (env, diagnostics) = create_diagnostics(DiagnosticFormat::JsonLines);
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
+    }
+
+    #[test]
+    fn syntax_errors() {
+        let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::JsonLines);
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
+    }
+
+    #[test]
+    fn notebook_output() {
+        let (env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::JsonLines);
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
+    }
+}
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderazuretests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderazuretests__output.snap
@@ -1,7 +1,6 @@
 ---
-source: crates/ruff_linter/src/message/azure.rs
-expression: content
-snapshot_kind: text
+source: crates/ruff_db/src/diagnostic/render/azure.rs
+expression: env.render_diagnostics(&diagnostics)
 ---
 ##vso[task.logissue type=error;sourcepath=fib.py;linenumber=1;columnnumber=8;code=F401;]`os` imported but unused
 ##vso[task.logissue type=error;sourcepath=fib.py;linenumber=6;columnnumber=5;code=F841;]Local variable `x` is assigned to but never used
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderazuretests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderazuretests__syntax_errors.snap
@@ -1,7 +1,6 @@
 ---
-source: crates/ruff_linter/src/message/azure.rs
-expression: content
-snapshot_kind: text
+source: crates/ruff_db/src/diagnostic/render/azure.rs
+expression: env.render_diagnostics(&diagnostics)
 ---
 ##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=1;columnnumber=15;]SyntaxError: Expected one or more symbol names after import
 ##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=3;columnnumber=12;]SyntaxError: Expected ')', found newline
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__notebook_output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__notebook_output.snap
@@ -1,7 +1,6 @@
 ---
-source: crates/ruff_linter/src/message/json.rs
-expression: content
-snapshot_kind: text
+source: crates/ruff_db/src/diagnostic/render/json.rs
+expression: env.render_diagnostics(&diagnostics)
 ---
 [
  {
@@ -84,8 +83,8 @@ snapshot_kind: text
        {
          "content": "",
          "end_location": {
-            "column": 10,
-            "row": 4
+            "column": 1,
+            "row": 5
          },
          "location": {
            "column": 1,
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__output.snap
@@ -1,7 +1,6 @@
 ---
-source: crates/ruff_linter/src/message/json.rs
-expression: content
-snapshot_kind: text
+source: crates/ruff_db/src/diagnostic/render/json.rs
+expression: env.render_diagnostics(&diagnostics)
 ---
 [
  {
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__syntax_errors.snap
@@ -1,7 +1,6 @@
 ---
-source: crates/ruff_linter/src/message/json.rs
-expression: content
-snapshot_kind: text
+source: crates/ruff_db/src/diagnostic/render/json.rs
+expression: env.render_diagnostics(&diagnostics)
 ---
 [
  {
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestsnotebook_output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestsnotebook_output.snap
@@ -1,8 +1,7 @@
 ---
-source: crates/ruff_linter/src/message/json_lines.rs
-expression: content
-snapshot_kind: text
+source: crates/ruff_db/src/diagnostic/render/json_lines.rs
+expression: env.render_diagnostics(&diagnostics)
 ---
 {"cell":1,"code":"F401","end_location":{"column":10,"row":2},"filename":"notebook.ipynb","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":10,"row":2},"location":{"column":1,"row":2}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":2},"message":"`os` imported but unused","noqa_row":2,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
 {"cell":2,"code":"F401","end_location":{"column":12,"row":2},"filename":"notebook.ipynb","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":1,"row":3},"location":{"column":1,"row":2}}],"message":"Remove unused import: `math`"},"location":{"column":8,"row":2},"message":"`math` imported but unused","noqa_row":2,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
-{"cell":3,"code":"F841","end_location":{"column":6,"row":4},"filename":"notebook.ipynb","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":10,"row":4},"location":{"column":1,"row":4}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":4},"message":"Local variable `x` is assigned to but never used","noqa_row":4,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
+{"cell":3,"code":"F841","end_location":{"column":6,"row":4},"filename":"notebook.ipynb","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":1,"row":5},"location":{"column":1,"row":4}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":4},"message":"Local variable `x` is assigned to but never used","noqa_row":4,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestsoutput.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestsoutput.snap
@@ -1,7 +1,6 @@
 ---
-source: crates/ruff_linter/src/message/json_lines.rs
-expression: content
-snapshot_kind: text
+source: crates/ruff_db/src/diagnostic/render/json_lines.rs
+expression: env.render_diagnostics(&diagnostics)
 ---
 {"cell":null,"code":"F401","end_location":{"column":10,"row":1},"filename":"fib.py","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":1,"row":2},"location":{"column":1,"row":1}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":1},"message":"`os` imported but unused","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
 {"cell":null,"code":"F841","end_location":{"column":6,"row":6},"filename":"fib.py","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":10,"row":6},"location":{"column":5,"row":6}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":6},"message":"Local variable `x` is assigned to but never used","noqa_row":6,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestssyntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestssyntax_errors.snap
@@ -1,7 +1,6 @@
 ---
-source: crates/ruff_linter/src/message/json_lines.rs
-expression: content
-snapshot_kind: text
+source: crates/ruff_db/src/diagnostic/render/json_lines.rs
+expression: env.render_diagnostics(&diagnostics)
 ---
 {"cell":null,"code":null,"end_location":{"column":1,"row":2},"filename":"syntax_errors.py","fix":null,"location":{"column":15,"row":1},"message":"SyntaxError: Expected one or more symbol names after import","noqa_row":null,"url":null}
 {"cell":null,"code":null,"end_location":{"column":1,"row":4},"filename":"syntax_errors.py","fix":null,"location":{"column":12,"row":3},"message":"SyntaxError: Expected ')', found newline","noqa_row":null,"url":null}
--- a/crates/ruff_db/src/lib.rs
+++ b/crates/ruff_db/src/lib.rs
@@ -28,6 +28,21 @@ pub use web_time::{Instant, SystemTime, SystemTimeError};
 pub type FxDashMap<K, V> = dashmap::DashMap<K, V, BuildHasherDefault<FxHasher>>;
 pub type FxDashSet<K> = dashmap::DashSet<K, BuildHasherDefault<FxHasher>>;

+static VERSION: std::sync::OnceLock<String> = std::sync::OnceLock::new();
+
+/// Returns the version of the executing program if set.
+pub fn program_version() -> Option<&'static str> {
+    VERSION.get().map(|version| version.as_str())
+}
+
+/// Sets the version of the executing program.
+///
+/// ## Errors
+/// If the version has already been initialized (can only be set once).
+pub fn set_program_version(version: String) -> Result<(), String> {
+    VERSION.set(version)
+}
+
 /// Most basic database that gives access to files, the host system, source code, and parsed AST.
 #[salsa::db]
 pub trait Db: salsa::Database {
--- a/crates/ruff_db/src/vendored.rs
+++ b/crates/ruff_db/src/vendored.rs
@@ -21,6 +21,19 @@ type LockedZipArchive<'a> = MutexGuard<'a, VendoredZipArchive>;
 ///
 /// "Files" in the `VendoredFileSystem` are read-only and immutable.
 /// Directories are supported, but symlinks and hardlinks cannot exist.
+///
+/// # Path separators
+///
+/// At time of writing (2025-07-11), this implementation always uses `/` as a
+/// path separator, even in Windows environments where `\` is traditionally
+/// used as a file path separator. Namely, this is only currently used with zip
+/// files built by `crates/ty_vendored/build.rs`.
+///
+/// Callers using this may provide paths that use a `\` as a separator. It will
+/// be transparently normalized to `/`.
+///
+/// This is particularly important because the presence of a trailing separator
+/// in a zip file is conventionally used to indicate a directory entry.
 #[derive(Clone)]
 pub struct VendoredFileSystem {
    inner: Arc<Mutex<VendoredZipArchive>>,
@@ -115,6 +128,68 @@ impl VendoredFileSystem {
        read_to_string(self, path.as_ref())
    }

+    /// Read the direct children of the directory
+    /// identified by `path`.
+    ///
+    /// If `path` is not a directory, then this will
+    /// return an empty `Vec`.
+    pub fn read_directory(&self, dir: impl AsRef<VendoredPath>) -> Vec<DirectoryEntry> {
+        // N.B. We specifically do not return an iterator here to avoid
+        // holding a lock for the lifetime of the iterator returned.
+        // That is, it seems like a footgun to keep the zip archive
+        // locked during iteration, since the unit of work for each
+        // item in the iterator could be arbitrarily long. Allocating
+        // up front and stuffing all entries into it is probably the
+        // simplest solution and what we do here. If this becomes
+        // a problem, there are other strategies we could pursue.
+        // (Amortizing allocs, using a different synchronization
+        // behavior or even exposing additional APIs.) ---AG
+
+        fn read_directory(fs: &VendoredFileSystem, dir: &VendoredPath) -> Vec<DirectoryEntry> {
+            let mut normalized = NormalizedVendoredPath::from(dir);
+            if !normalized.as_str().ends_with('/') {
+                normalized = normalized.with_trailing_slash();
+            }
+            let archive = fs.lock_archive();
+            let mut entries = vec![];
+            for name in archive.0.file_names() {
+                // Any entry that doesn't have the `path` (with a
+                // trailing slash) as a prefix cannot possibly be in
+                // the directory referenced by `path`.
+                let Some(without_dir_prefix) = name.strip_prefix(normalized.as_str()) else {
+                    continue;
+                };
+                // Filter out an entry equivalent to the path given
+                // since we only want children of the directory.
+                if without_dir_prefix.is_empty() {
+                    continue;
+                }
+                // We only want *direct* children. Files that are
+                // direct children cannot have any slashes (or else
+                // they are not direct children). Directories that
+                // are direct children can only have one slash and
+                // it must be at the end.
+                //
+                // (We do this manually ourselves to avoid doing a
+                // full file lookup and metadata retrieval via the
+                // `zip` crate.)
+                let file_type = FileType::from_zip_file_name(without_dir_prefix);
+                let slash_count = without_dir_prefix.matches('/').count();
+                match file_type {
+                    FileType::File if slash_count > 0 => continue,
+                    FileType::Directory if slash_count > 1 => continue,
+                    _ => {}
+                }
+                entries.push(DirectoryEntry {
+                    path: VendoredPathBuf::from(name),
+                    file_type,
+                });
+            }
+            entries
+        }
+        read_directory(self, dir.as_ref())
+    }
+
    /// Acquire a lock on the underlying zip archive.
    /// The call will block until it is able to acquire the lock.
    ///
@@ -206,6 +281,14 @@ pub enum FileType {
 }

 impl FileType {
+    fn from_zip_file_name(name: &str) -> FileType {
+        if name.ends_with('/') {
+            FileType::Directory
+        } else {
+            FileType::File
+        }
+    }
+
    pub const fn is_file(self) -> bool {
        matches!(self, Self::File)
    }
@@ -244,6 +327,30 @@ impl Metadata {
    }
 }

+#[derive(Debug, PartialEq, Eq)]
+pub struct DirectoryEntry {
+    path: VendoredPathBuf,
+    file_type: FileType,
+}
+
+impl DirectoryEntry {
+    pub fn new(path: VendoredPathBuf, file_type: FileType) -> Self {
+        Self { path, file_type }
+    }
+
+    pub fn into_path(self) -> VendoredPathBuf {
+        self.path
+    }
+
+    pub fn path(&self) -> &VendoredPath {
+        &self.path
+    }
+
+    pub fn file_type(&self) -> FileType {
+        self.file_type
+    }
+}
+
 /// Newtype wrapper around a ZipArchive.
 #[derive(Debug)]
 struct VendoredZipArchive(ZipArchive<io::Cursor<Cow<'static, [u8]>>>);
@@ -498,6 +605,60 @@ pub(crate) mod tests {
        test_directory("./stdlib/asyncio/../asyncio/")
    }

+    fn readdir_snapshot(fs: &VendoredFileSystem, path: &str) -> String {
+        let mut paths = fs
+            .read_directory(VendoredPath::new(path))
+            .into_iter()
+            .map(|entry| entry.path().to_string())
+            .collect::<Vec<String>>();
+        paths.sort();
+        paths.join("\n")
+    }
+
+    #[test]
+    fn read_directory_stdlib() {
+        let mock_typeshed = mock_typeshed();
+
+        assert_snapshot!(readdir_snapshot(&mock_typeshed, "stdlib"), @r"
+        vendored://stdlib/asyncio/
+        vendored://stdlib/functools.pyi
+        ");
+        assert_snapshot!(readdir_snapshot(&mock_typeshed, "stdlib/"), @r"
+        vendored://stdlib/asyncio/
+        vendored://stdlib/functools.pyi
+        ");
+        assert_snapshot!(readdir_snapshot(&mock_typeshed, "./stdlib"), @r"
+        vendored://stdlib/asyncio/
+        vendored://stdlib/functools.pyi
+        ");
+        assert_snapshot!(readdir_snapshot(&mock_typeshed, "./stdlib/"), @r"
+        vendored://stdlib/asyncio/
+        vendored://stdlib/functools.pyi
+        ");
+    }
+
+    #[test]
+    fn read_directory_asyncio() {
+        let mock_typeshed = mock_typeshed();
+
+        assert_snapshot!(
+            readdir_snapshot(&mock_typeshed, "stdlib/asyncio"),
+            @"vendored://stdlib/asyncio/tasks.pyi",
+        );
+        assert_snapshot!(
+            readdir_snapshot(&mock_typeshed, "./stdlib/asyncio"),
+            @"vendored://stdlib/asyncio/tasks.pyi",
+        );
+        assert_snapshot!(
+            readdir_snapshot(&mock_typeshed, "stdlib/asyncio/"),
+            @"vendored://stdlib/asyncio/tasks.pyi",
+        );
+        assert_snapshot!(
+            readdir_snapshot(&mock_typeshed, "./stdlib/asyncio/"),
+            @"vendored://stdlib/asyncio/tasks.pyi",
+        );
+    }
+
    fn test_nonexistent_path(path: &str) {
        let mock_typeshed = mock_typeshed();
        let path = VendoredPath::new(path);
--- a/crates/ruff_db/src/vendored/path.rs
+++ b/crates/ruff_db/src/vendored/path.rs
@@ -17,6 +17,10 @@ impl VendoredPath {
        unsafe { &*(path as *const Utf8Path as *const VendoredPath) }
    }

+    pub fn file_name(&self) -> Option<&str> {
+        self.0.file_name()
+    }
+
    pub fn to_path_buf(&self) -> VendoredPathBuf {
        VendoredPathBuf(self.0.to_path_buf())
    }
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B017_0.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B017_0.py
@@ -1,6 +1,6 @@
 """
 Should emit:
-B017 - on lines 24, 28, 46, 49, 52, and 58
+B017 - on lines 24, 28, 46, 49, 52, 58, 62, 68, and 71
 """
 import asyncio
 import unittest
@@ -56,3 +56,17 @@ def test_pytest_raises():

    with contextlib.nullcontext(), pytest.raises(Exception):
        raise ValueError("Multiple context managers")
+
+
+def test_pytest_raises_keyword():
+    with pytest.raises(expected_exception=Exception):
+        raise ValueError("Should be flagged")
+
+def test_assert_raises_keyword():
+    class TestKwargs(unittest.TestCase):
+        def test_method(self):
+            with self.assertRaises(exception=Exception):
+                raise ValueError("Should be flagged")
+
+            with self.assertRaises(exception=BaseException):
+                raise ValueError("Should be flagged")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_django/DJ008.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_django/DJ008.py
@@ -181,3 +181,51 @@ class SubclassTestModel2(TestModel4):
 # Subclass without __str__
 class SubclassTestModel3(TestModel1):
    pass
+
+
+# Test cases for type-annotated abstract models - these should NOT trigger DJ008
+from typing import ClassVar
+from django_stubs_ext.db.models import TypedModelMeta
+
+
+class TypeAnnotatedAbstractModel1(models.Model):
+    """Model with type-annotated abstract = True - should not trigger DJ008"""
+    new_field = models.CharField(max_length=10)
+
+    class Meta(TypedModelMeta):
+        abstract: ClassVar[bool] = True
+
+
+class TypeAnnotatedAbstractModel2(models.Model):
+    """Model with type-annotated abstract = True using regular Meta - should not trigger DJ008"""  
+    new_field = models.CharField(max_length=10)
+
+    class Meta:
+        abstract: ClassVar[bool] = True
+
+
+class TypeAnnotatedAbstractModel3(models.Model):
+    """Model with type-annotated abstract = True but without ClassVar - should not trigger DJ008"""
+    new_field = models.CharField(max_length=10)
+
+    class Meta:
+        abstract: bool = True
+
+
+class TypeAnnotatedNonAbstractModel(models.Model):
+    """Model with type-annotated abstract = False - should trigger DJ008"""
+    new_field = models.CharField(max_length=10)
+
+    class Meta:
+        abstract: ClassVar[bool] = False
+
+
+class TypeAnnotatedAbstractModelWithStr(models.Model):
+    """Model with type-annotated abstract = True and __str__ method - should not trigger DJ008"""
+    new_field = models.CharField(max_length=10)
+
+    class Meta(TypedModelMeta):
+        abstract: ClassVar[bool] = True
+
+    def __str__(self):
+        return self.new_field
--- a/crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT001.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_gettext/INT001.py
@@ -1 +1,4 @@
 _(f"{'value'}")
+
+# Don't trigger for t-strings
+_(t"{'value'}")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004.py
@@ -13,3 +13,7 @@ from logging import info

 info(f"{name}")
 info(f"{__name__}")
+
+# Don't trigger for t-strings
+info(t"{name}")
+info(t"{__name__}")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT011.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT011.py
@@ -47,3 +47,7 @@ def test_error_match_is_empty():

    with pytest.raises(ValueError, match=f""):
        raise ValueError("Can't divide 1 by 0")
+
+def test_ok_t_string_match():
+    with pytest.raises(ValueError, match=t""):
+        raise ValueError("Can't divide 1 by 0")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT016.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT016.py
@@ -23,3 +23,9 @@ def f():
    pytest.fail(msg=f"")
    pytest.fail(reason="")
    pytest.fail(reason=f"")
+
+# Skip for t-strings
+def g():
+    pytest.fail(t"")
+    pytest.fail(msg=t"")
+    pytest.fail(reason=t"")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT030.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT030.py
@@ -32,3 +32,7 @@ def test_error_match_is_empty():

    with pytest.warns(UserWarning, match=f""):
        pass
+
+def test_ok_match_t_string():
+    with pytest.warns(UserWarning, match=t""):
+        pass
--- a/crates/ruff_linter/resources/test/fixtures/flake8_unused_arguments/ARG.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_unused_arguments/ARG.py
@@ -245,3 +245,14 @@ def f(bar: str):
 class C:
    def __init__(self, x) -> None:
        print(locals())
+
+###
+# Should trigger for t-string here
+# even though the corresponding f-string
+# does not trigger (since it is common in stubs)
+###
+class C:
+    def f(self, x, y):
+        """Docstring."""
+        msg = t"{x}..."
+        raise NotImplementedError(msg)
--- a/crates/ruff_linter/resources/test/fixtures/isort/required_imports/multiple_strings.py
+++ b/crates/ruff_linter/resources/test/fixtures/isort/required_imports/multiple_strings.py
@@ -0,0 +1,5 @@
+"""This is a docstring."""
+"This is not a docstring."
+"This is also not a docstring."
+
+x = 1 
--- a/crates/ruff_linter/resources/test/fixtures/pep8_naming/N802.py
+++ b/crates/ruff_linter/resources/test/fixtures/pep8_naming/N802.py
@@ -48,6 +48,39 @@ from typing import override, overload
 def BAD_FUNC():
    pass

+
@overload
 def BAD_FUNC():
    pass
+
+
+import ast
+from ast import NodeTransformer
+
+
+class Visitor(ast.NodeVisitor):
+    def visit_Constant(self, node):
+        pass
+
+    def bad_Name(self):
+        pass
+
+class ExtendsVisitor(Visitor):
+    def visit_Constant(self, node):
+        pass
+
+class Transformer(NodeTransformer):
+    def visit_Constant(self, node):
+        pass
+
+
+from http.server import BaseHTTPRequestHandler
+
+
+class MyRequestHandler(BaseHTTPRequestHandler):
+    def do_GET(self):
+        pass
+
+    def dont_GET(self):
+        pass
+
--- a/crates/ruff_linter/resources/test/fixtures/pylint/assert_on_string_literal.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/assert_on_string_literal.py
@@ -22,3 +22,10 @@ assert b"hello"  # [assert-on-string-literal]
 assert "", b"hi"  # [assert-on-string-literal]
 assert "WhyNotHere?", "HereIsOk"  # [assert-on-string-literal]
 assert 12, "ok here"
+
+
+# t-strings are always True even when "empty"
+# skip lint in this case
+assert t""
+assert t"hey"
+assert t"{a}"
--- a/crates/ruff_linter/resources/test/fixtures/pylint/no_self_use.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/no_self_use.py
@@ -140,3 +140,15 @@ class Foo:
    def unused_message_2(self, x):
        msg = ""
        raise NotImplementedError(x)
+
+class TPerson:
+    def developer_greeting(self, name):  # [no-self-use]
+        print(t"Greetings {name}!")
+
+    def greeting_1(self):
+        print(t"Hello from {self.name} !")
+
+    def tstring(self, x):
+        msg = t"{x}"
+        raise NotImplementedError(msg)
+
--- a/crates/ruff_linter/resources/test/fixtures/pylint/single_string_slots.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/single_string_slots.py
@@ -33,3 +33,11 @@ class Foo:

    def __init__(self, bar):
        self.bar = bar
+
+# This is a type error, out of scope for the rule
+class Foo:
+    __slots__ = t"bar{baz}"
+
+    def __init__(self, bar):
+        self.bar = bar
+
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP012.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP012.py
@@ -84,3 +84,7 @@ def _match_ignore(line):
 # Not a valid type annotation but this test shouldn't result in a panic.
 # Refer: https://github.com/astral-sh/ruff/issues/11736
 x: '"foo".encode("utf-8")'
+
+# AttributeError for t-strings so skip lint
+(t"foo{bar}").encode("utf-8")
+(t"foo{bar}").encode(encoding="utf-8")
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP018.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP018.py
@@ -90,3 +90,7 @@ bool(True)and None
 int(1)and None
 float(1.)and None
 bool(True)and()
+
+
+# t-strings are not native literals
+str(t"hey")
--- a/crates/ruff_linter/src/checkers/ast/mod.rs
+++ b/crates/ruff_linter/src/checkers/ast/mod.rs
@@ -670,7 +670,11 @@ impl SemanticSyntaxContext for Checker<'_> {
            | SemanticSyntaxErrorKind::InvalidStarExpression
            | SemanticSyntaxErrorKind::AsyncComprehensionInSyncComprehension(_)
            | SemanticSyntaxErrorKind::DuplicateParameter(_)
-            | SemanticSyntaxErrorKind::NonlocalDeclarationAtModuleLevel => {
+            | SemanticSyntaxErrorKind::NonlocalDeclarationAtModuleLevel
+            | SemanticSyntaxErrorKind::LoadBeforeNonlocalDeclaration { .. }
+            | SemanticSyntaxErrorKind::NonlocalAndGlobal(_)
+            | SemanticSyntaxErrorKind::AnnotatedGlobal(_)
+            | SemanticSyntaxErrorKind::AnnotatedNonlocal(_) => {
                self.semantic_errors.borrow_mut().push(error);
            }
        }
--- a/crates/ruff_linter/src/importer/insertion.rs
+++ b/crates/ruff_linter/src/importer/insertion.rs
@@ -275,19 +275,12 @@ impl<'a> Insertion<'a> {
    }
 }

-/// Find the end of the last docstring.
+/// Find the end of the docstring (first string statement).
 fn match_docstring_end(body: &[Stmt]) -> Option<TextSize> {
-    let mut iter = body.iter();
-    let mut stmt = iter.next()?;
+    let stmt = body.first()?;
    if !is_docstring_stmt(stmt) {
        return None;
    }
-    for next in iter {
-        if !is_docstring_stmt(next) {
-            break;
-        }
-        stmt = next;
-    }
    Some(stmt.end())
 }

@@ -367,7 +360,7 @@ mod tests {
        .trim_start();
        assert_eq!(
            insert(contents)?,
-            Insertion::own_line("", TextSize::from(40), "\n")
+            Insertion::own_line("", TextSize::from(20), "\n")
        );

        let contents = r"
--- a/crates/ruff_linter/src/message/azure.rs
+++ b/crates/ruff_linter/src/message/azure.rs
@@ -1,71 +0,0 @@
-use std::io::Write;
-
-use ruff_db::diagnostic::Diagnostic;
-use ruff_source_file::LineColumn;
-
-use crate::message::{Emitter, EmitterContext};
-
-/// Generate error logging commands for Azure Pipelines format.
-/// See [documentation](https://learn.microsoft.com/en-us/azure/devops/pipelines/scripts/logging-commands?view=azure-devops&tabs=bash#logissue-log-an-error-or-warning)
-#[derive(Default)]
-pub struct AzureEmitter;
-
-impl Emitter for AzureEmitter {
-    fn emit(
-        &mut self,
-        writer: &mut dyn Write,
-        diagnostics: &[Diagnostic],
-        context: &EmitterContext,
-    ) -> anyhow::Result<()> {
-        for diagnostic in diagnostics {
-            let filename = diagnostic.expect_ruff_filename();
-            let location = if context.is_notebook(&filename) {
-                // We can't give a reasonable location for the structured formats,
-                // so we show one that's clearly a fallback
-                LineColumn::default()
-            } else {
-                diagnostic.expect_ruff_start_location()
-            };
-
-            writeln!(
-                writer,
-                "##vso[task.logissue type=error\
-                        ;sourcepath={filename};linenumber={line};columnnumber={col};{code}]{body}",
-                line = location.line,
-                col = location.column,
-                code = diagnostic
-                    .secondary_code()
-                    .map_or_else(String::new, |code| format!("code={code};")),
-                body = diagnostic.body(),
-            )?;
-        }
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use insta::assert_snapshot;
-
-    use crate::message::AzureEmitter;
-    use crate::message::tests::{
-        capture_emitter_output, create_diagnostics, create_syntax_error_diagnostics,
-    };
-
-    #[test]
-    fn output() {
-        let mut emitter = AzureEmitter;
-        let content = capture_emitter_output(&mut emitter, &create_diagnostics());
-
-        assert_snapshot!(content);
-    }
-
-    #[test]
-    fn syntax_errors() {
-        let mut emitter = AzureEmitter;
-        let content = capture_emitter_output(&mut emitter, &create_syntax_error_diagnostics());
-
-        assert_snapshot!(content);
-    }
-}
--- a/crates/ruff_linter/src/message/diff.rs
+++ b/crates/ruff_linter/src/message/diff.rs
@@ -21,7 +21,7 @@ use crate::{Applicability, Fix};
 /// * Compute the diff from the [`Edit`] because diff calculation is expensive.
 pub(super) struct Diff<'a> {
    fix: &'a Fix,
-    source_code: SourceFile,
+    source_code: &'a SourceFile,
 }

 impl<'a> Diff<'a> {
--- a/crates/ruff_linter/src/message/json.rs
+++ b/crates/ruff_linter/src/message/json.rs
@@ -1,220 +0,0 @@
-use std::io::Write;
-
-use serde::ser::SerializeSeq;
-use serde::{Serialize, Serializer};
-use serde_json::{Value, json};
-
-use ruff_db::diagnostic::Diagnostic;
-use ruff_notebook::NotebookIndex;
-use ruff_source_file::{LineColumn, OneIndexed, SourceCode};
-use ruff_text_size::Ranged;
-
-use crate::Edit;
-use crate::message::{Emitter, EmitterContext};
-
-#[derive(Default)]
-pub struct JsonEmitter;
-
-impl Emitter for JsonEmitter {
-    fn emit(
-        &mut self,
-        writer: &mut dyn Write,
-        diagnostics: &[Diagnostic],
-        context: &EmitterContext,
-    ) -> anyhow::Result<()> {
-        serde_json::to_writer_pretty(
-            writer,
-            &ExpandedMessages {
-                diagnostics,
-                context,
-            },
-        )?;
-
-        Ok(())
-    }
-}
-
-struct ExpandedMessages<'a> {
-    diagnostics: &'a [Diagnostic],
-    context: &'a EmitterContext<'a>,
-}
-
-impl Serialize for ExpandedMessages<'_> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut s = serializer.serialize_seq(Some(self.diagnostics.len()))?;
-
-        for message in self.diagnostics {
-            let value = message_to_json_value(message, self.context);
-            s.serialize_element(&value)?;
-        }
-
-        s.end()
-    }
-}
-
-pub(crate) fn message_to_json_value(message: &Diagnostic, context: &EmitterContext) -> Value {
-    let source_file = message.expect_ruff_source_file();
-    let source_code = source_file.to_source_code();
-    let filename = message.expect_ruff_filename();
-    let notebook_index = context.notebook_index(&filename);
-
-    let fix = message.fix().map(|fix| {
-        json!({
-            "applicability": fix.applicability(),
-            "message": message.suggestion(),
-            "edits": &ExpandedEdits { edits: fix.edits(), source_code: &source_code, notebook_index },
-        })
-    });
-
-    let mut start_location = source_code.line_column(message.expect_range().start());
-    let mut end_location = source_code.line_column(message.expect_range().end());
-    let mut noqa_location = message
-        .noqa_offset()
-        .map(|offset| source_code.line_column(offset));
-    let mut notebook_cell_index = None;
-
-    if let Some(notebook_index) = notebook_index {
-        notebook_cell_index = Some(
-            notebook_index
-                .cell(start_location.line)
-                .unwrap_or(OneIndexed::MIN),
-        );
-        start_location = notebook_index.translate_line_column(&start_location);
-        end_location = notebook_index.translate_line_column(&end_location);
-        noqa_location =
-            noqa_location.map(|location| notebook_index.translate_line_column(&location));
-    }
-
-    json!({
-        "code": message.secondary_code(),
-        "url": message.to_url(),
-        "message": message.body(),
-        "fix": fix,
-        "cell": notebook_cell_index,
-        "location": location_to_json(start_location),
-        "end_location": location_to_json(end_location),
-        "filename": filename,
-        "noqa_row": noqa_location.map(|location| location.line)
-    })
-}
-
-fn location_to_json(location: LineColumn) -> serde_json::Value {
-    json!({
-        "row": location.line,
-        "column": location.column
-    })
-}
-
-struct ExpandedEdits<'a> {
-    edits: &'a [Edit],
-    source_code: &'a SourceCode<'a, 'a>,
-    notebook_index: Option<&'a NotebookIndex>,
-}
-
-impl Serialize for ExpandedEdits<'_> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut s = serializer.serialize_seq(Some(self.edits.len()))?;
-
-        for edit in self.edits {
-            let mut location = self.source_code.line_column(edit.start());
-            let mut end_location = self.source_code.line_column(edit.end());
-
-            if let Some(notebook_index) = self.notebook_index {
-                // There exists a newline between each cell's source code in the
-                // concatenated source code in Ruff. This newline doesn't actually
-                // exists in the JSON source field.
-                //
-                // Now, certain edits may try to remove this newline, which means
-                // the edit will spill over to the first character of the next cell.
-                // If it does, we need to translate the end location to the last
-                // character of the previous cell.
-                match (
-                    notebook_index.cell(location.line),
-                    notebook_index.cell(end_location.line),
-                ) {
-                    (Some(start_cell), Some(end_cell)) if start_cell != end_cell => {
-                        debug_assert_eq!(end_location.column.get(), 1);
-
-                        let prev_row = end_location.line.saturating_sub(1);
-                        end_location = LineColumn {
-                            line: notebook_index.cell_row(prev_row).unwrap_or(OneIndexed::MIN),
-                            column: self
-                                .source_code
-                                .line_column(self.source_code.line_end_exclusive(prev_row))
-                                .column,
-                        };
-                    }
-                    (Some(_), None) => {
-                        debug_assert_eq!(end_location.column.get(), 1);
-
-                        let prev_row = end_location.line.saturating_sub(1);
-                        end_location = LineColumn {
-                            line: notebook_index.cell_row(prev_row).unwrap_or(OneIndexed::MIN),
-                            column: self
-                                .source_code
-                                .line_column(self.source_code.line_end_exclusive(prev_row))
-                                .column,
-                        };
-                    }
-                    _ => {
-                        end_location = notebook_index.translate_line_column(&end_location);
-                    }
-                }
-                location = notebook_index.translate_line_column(&location);
-            }
-
-            let value = json!({
-                "content": edit.content().unwrap_or_default(),
-                "location": location_to_json(location),
-                "end_location": location_to_json(end_location)
-            });
-
-            s.serialize_element(&value)?;
-        }
-
-        s.end()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use insta::assert_snapshot;
-
-    use crate::message::JsonEmitter;
-    use crate::message::tests::{
-        capture_emitter_notebook_output, capture_emitter_output, create_diagnostics,
-        create_notebook_diagnostics, create_syntax_error_diagnostics,
-    };
-
-    #[test]
-    fn output() {
-        let mut emitter = JsonEmitter;
-        let content = capture_emitter_output(&mut emitter, &create_diagnostics());
-
-        assert_snapshot!(content);
-    }
-
-    #[test]
-    fn syntax_errors() {
-        let mut emitter = JsonEmitter;
-        let content = capture_emitter_output(&mut emitter, &create_syntax_error_diagnostics());
-
-        assert_snapshot!(content);
-    }
-
-    #[test]
-    fn notebook_output() {
-        let mut emitter = JsonEmitter;
-        let (diagnostics, notebook_indexes) = create_notebook_diagnostics();
-        let content =
-            capture_emitter_notebook_output(&mut emitter, &diagnostics, &notebook_indexes);
-
-        assert_snapshot!(content);
-    }
-}
--- a/crates/ruff_linter/src/message/json_lines.rs
+++ b/crates/ruff_linter/src/message/json_lines.rs
@@ -1,60 +0,0 @@
-use std::io::Write;
-
-use ruff_db::diagnostic::Diagnostic;
-
-use crate::message::json::message_to_json_value;
-use crate::message::{Emitter, EmitterContext};
-
-#[derive(Default)]
-pub struct JsonLinesEmitter;
-
-impl Emitter for JsonLinesEmitter {
-    fn emit(
-        &mut self,
-        writer: &mut dyn Write,
-        diagnostics: &[Diagnostic],
-        context: &EmitterContext,
-    ) -> anyhow::Result<()> {
-        for diagnostic in diagnostics {
-            serde_json::to_writer(&mut *writer, &message_to_json_value(diagnostic, context))?;
-            writer.write_all(b"\n")?;
-        }
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use insta::assert_snapshot;
-
-    use crate::message::json_lines::JsonLinesEmitter;
-    use crate::message::tests::{
-        capture_emitter_notebook_output, capture_emitter_output, create_diagnostics,
-        create_notebook_diagnostics, create_syntax_error_diagnostics,
-    };
-
-    #[test]
-    fn output() {
-        let mut emitter = JsonLinesEmitter;
-        let content = capture_emitter_output(&mut emitter, &create_diagnostics());
-
-        assert_snapshot!(content);
-    }
-
-    #[test]
-    fn syntax_errors() {
-        let mut emitter = JsonLinesEmitter;
-        let content = capture_emitter_output(&mut emitter, &create_syntax_error_diagnostics());
-
-        assert_snapshot!(content);
-    }
-
-    #[test]
-    fn notebook_output() {
-        let mut emitter = JsonLinesEmitter;
-        let (messages, notebook_indexes) = create_notebook_diagnostics();
-        let content = capture_emitter_notebook_output(&mut emitter, &messages, &notebook_indexes);
-
-        assert_snapshot!(content);
-    }
-}
--- a/crates/ruff_linter/src/message/mod.rs
+++ b/crates/ruff_linter/src/message/mod.rs
@@ -3,17 +3,17 @@ use std::fmt::Display;
 use std::io::Write;
 use std::ops::Deref;

-use ruff_db::diagnostic::{
-    Annotation, Diagnostic, DiagnosticId, LintName, SecondaryCode, Severity, Span,
-};
 use rustc_hash::FxHashMap;

-pub use azure::AzureEmitter;
+use ruff_db::diagnostic::{
+    Annotation, Diagnostic, DiagnosticId, FileResolver, Input, LintName, SecondaryCode, Severity,
+    Span, UnifiedFile,
+};
+use ruff_db::files::File;
+
 pub use github::GithubEmitter;
 pub use gitlab::GitlabEmitter;
 pub use grouped::GroupedEmitter;
-pub use json::JsonEmitter;
-pub use json_lines::JsonLinesEmitter;
 pub use junit::JunitEmitter;
 pub use pylint::PylintEmitter;
 pub use rdjson::RdjsonEmitter;
@@ -26,13 +26,10 @@ pub use text::TextEmitter;
 use crate::Fix;
 use crate::registry::Rule;

-mod azure;
 mod diff;
 mod github;
 mod gitlab;
 mod grouped;
-mod json;
-mod json_lines;
 mod junit;
 mod pylint;
 mod rdjson;
@@ -107,6 +104,34 @@ where
    diagnostic
 }

+impl FileResolver for EmitterContext<'_> {
+    fn path(&self, _file: File) -> &str {
+        unimplemented!("Expected a Ruff file for rendering a Ruff diagnostic");
+    }
+
+    fn input(&self, _file: File) -> Input {
+        unimplemented!("Expected a Ruff file for rendering a Ruff diagnostic");
+    }
+
+    fn notebook_index(&self, file: &UnifiedFile) -> Option<NotebookIndex> {
+        match file {
+            UnifiedFile::Ty(_) => {
+                unimplemented!("Expected a Ruff file for rendering a Ruff diagnostic")
+            }
+            UnifiedFile::Ruff(file) => self.notebook_indexes.get(file.name()).cloned(),
+        }
+    }
+
+    fn is_notebook(&self, file: &UnifiedFile) -> bool {
+        match file {
+            UnifiedFile::Ty(_) => {
+                unimplemented!("Expected a Ruff file for rendering a Ruff diagnostic")
+            }
+            UnifiedFile::Ruff(file) => self.notebook_indexes.get(file.name()).is_some(),
+        }
+    }
+}
+
 struct MessageWithLocation<'a> {
    message: &'a Diagnostic,
    start_location: LineColumn,
--- a/crates/ruff_linter/src/message/rdjson.rs
+++ b/crates/ruff_linter/src/message/rdjson.rs
@@ -73,7 +73,7 @@ fn message_to_rdjson_value(message: &Diagnostic) -> Value {
            },
            "code": {
                "value": message.secondary_code(),
-                "url": message.to_url(),
+                "url": message.to_ruff_url(),
            },
            "suggestions": rdjson_suggestions(fix.edits(), &source_code),
        })
@@ -86,7 +86,7 @@ fn message_to_rdjson_value(message: &Diagnostic) -> Value {
            },
            "code": {
                "value": message.secondary_code(),
-                "url": message.to_url(),
+                "url": message.to_ruff_url(),
            },
        })
    }
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_raises_exception.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_raises_exception.rs
@@ -87,9 +87,14 @@ fn detect_blind_exception(
        }
    }

-    let first_arg = arguments.args.first()?;
+    let exception_argument_name = if is_pytest_raises {
+        "expected_exception"
+    } else {
+        "exception"
+    };

-    let builtin_symbol = semantic.resolve_builtin_symbol(first_arg)?;
+    let exception_expr = arguments.find_argument_value(exception_argument_name, 0)?;
+    let builtin_symbol = semantic.resolve_builtin_symbol(exception_expr)?;

    match builtin_symbol {
        "Exception" => Some(ExceptionKind::Exception),
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestsB017_B017_0.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestsB017_B017_0.py.snap
@@ -43,3 +43,29 @@ B017_0.py:57:36: B017 Do not assert blind exception: `Exception`
   |                                    ^^^^^^^^^^^^^^^^^^^^^^^^ B017
 58 |         raise ValueError("Multiple context managers")
   |
+
+B017_0.py:62:10: B017 Do not assert blind exception: `Exception`
+   |
+61 | def test_pytest_raises_keyword():
+62 |     with pytest.raises(expected_exception=Exception):
+   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B017
+63 |         raise ValueError("Should be flagged")
+   |
+
+B017_0.py:68:18: B017 Do not assert blind exception: `Exception`
+   |
+66 |     class TestKwargs(unittest.TestCase):
+67 |         def test_method(self):
+68 |             with self.assertRaises(exception=Exception):
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B017
+69 |                 raise ValueError("Should be flagged")
+   |
+
+B017_0.py:71:18: B017 Do not assert blind exception: `BaseException`
+   |
+69 |                 raise ValueError("Should be flagged")
+70 |
+71 |             with self.assertRaises(exception=BaseException):
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B017
+72 |                 raise ValueError("Should be flagged")
+   |
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestsB018_B018.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestsB018_B018.py.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
-snapshot_kind: text
 ---
 B018.py:11:5: B018 Found useless expression. Either assign it to a variable or remove it.
   |
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestspreview__B017_B017_0.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestspreview__B017_B017_0.py.snap
@@ -43,3 +43,29 @@ B017_0.py:57:36: B017 Do not assert blind exception: `Exception`
   |                                    ^^^^^^^^^^^^^^^^^^^^^^^^ B017
 58 |         raise ValueError("Multiple context managers")
   |
+
+B017_0.py:62:10: B017 Do not assert blind exception: `Exception`
+   |
+61 | def test_pytest_raises_keyword():
+62 |     with pytest.raises(expected_exception=Exception):
+   |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B017
+63 |         raise ValueError("Should be flagged")
+   |
+
+B017_0.py:68:18: B017 Do not assert blind exception: `Exception`
+   |
+66 |     class TestKwargs(unittest.TestCase):
+67 |         def test_method(self):
+68 |             with self.assertRaises(exception=Exception):
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B017
+69 |                 raise ValueError("Should be flagged")
+   |
+
+B017_0.py:71:18: B017 Do not assert blind exception: `BaseException`
+   |
+69 |                 raise ValueError("Should be flagged")
+70 |
+71 |             with self.assertRaises(exception=BaseException):
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B017
+72 |                 raise ValueError("Should be flagged")
+   |
--- a/crates/ruff_linter/src/rules/flake8_django/rules/model_without_dunder_str.rs
+++ b/crates/ruff_linter/src/rules/flake8_django/rules/model_without_dunder_str.rs
@@ -96,22 +96,43 @@ fn is_model_abstract(class_def: &ast::StmtClassDef) -> bool {
            continue;
        }
        for element in body {
-            let Stmt::Assign(ast::StmtAssign { targets, value, .. }) = element else {
-                continue;
-            };
-            for target in targets {
-                let Expr::Name(ast::ExprName { id, .. }) = target else {
-                    continue;
-                };
-                if id != "abstract" {
-                    continue;
+            match element {
+                Stmt::Assign(ast::StmtAssign { targets, value, .. }) => {
+                    if targets
+                        .iter()
+                        .any(|target| is_abstract_true_assignment(target, Some(value)))
+                    {
+                        return true;
+                    }
                }
-                if !is_const_true(value) {
-                    continue;
+                Stmt::AnnAssign(ast::StmtAnnAssign { target, value, .. }) => {
+                    if is_abstract_true_assignment(target, value.as_deref()) {
+                        return true;
+                    }
                }
-                return true;
+                _ => {}
            }
        }
    }
    false
 }
+
+fn is_abstract_true_assignment(target: &Expr, value: Option<&Expr>) -> bool {
+    let Expr::Name(ast::ExprName { id, .. }) = target else {
+        return false;
+    };
+
+    if id != "abstract" {
+        return false;
+    }
+
+    let Some(value) = value else {
+        return false;
+    };
+
+    if !is_const_true(value) {
+        return false;
+    }
+
+    true
+}
--- a/crates/ruff_linter/src/rules/flake8_django/snapshots/ruff_linterrulesflake8_djangotestsDJ008_DJ008.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_django/snapshots/ruff_linterrulesflake8_djangotestsDJ008_DJ008.py.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_django/mod.rs
-snapshot_kind: text
 ---
 DJ008.py:6:7: DJ008 Model does not define `__str__` method
  |
@@ -31,3 +30,11 @@ DJ008.py:182:7: DJ008 Model does not define `__str__` method
    |       ^^^^^^^^^^^^^^^^^^ DJ008
 183 |     pass
    |
+
+DJ008.py:215:7: DJ008 Model does not define `__str__` method
+    |
+215 | class TypeAnnotatedNonAbstractModel(models.Model):
+    |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ DJ008
+216 |     """Model with type-annotated abstract = False - should trigger DJ008"""
+217 |     new_field = models.CharField(max_length=10)
+    |
--- a/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linterrulesflake8_gettexttestsf-string-in-get-text-func-call_INT001.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_gettext/snapshots/ruff_linterrulesflake8_gettexttestsf-string-in-get-text-func-call_INT001.py.snap
@@ -1,9 +1,10 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_gettext/mod.rs
-snapshot_kind: text
 ---
 INT001.py:1:3: INT001 f-string is resolved before function call; consider `_("string %s") % arg`
  |
 1 | _(f"{'value'}")
  |   ^^^^^^^^^^^^ INT001
+2 |
+3 | # Don't trigger for t-strings
  |
--- a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linterrulesflake8_logging_formattestsG004.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linterrulesflake8_logging_formattestsG004.py.snap
@@ -52,4 +52,6 @@ G004.py:15:6: G004 Logging statement uses f-string
 14 | info(f"{name}")
 15 | info(f"{__name__}")
   |      ^^^^^^^^^^^^^ G004
+16 |
+17 | # Don't trigger for t-strings
   |
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linterrulesflake8_pytest_styletestsPT016.snap
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linterrulesflake8_pytest_styletestsPT016.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_pytest_style/mod.rs
-snapshot_kind: text
 ---
 PT016.py:19:5: PT016 No message passed to `pytest.fail()`
   |
@@ -67,4 +66,6 @@ PT016.py:25:5: PT016 No message passed to `pytest.fail()`
 24 |     pytest.fail(reason="")
 25 |     pytest.fail(reason=f"")
   |     ^^^^^^^^^^^ PT016
+26 |
+27 | # Skip for t-strings
   |
--- a/crates/ruff_linter/src/rules/flake8_unused_arguments/snapshots/ruff_linterrulesflake8_unused_argumentstestsARG002_ARG.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_unused_arguments/snapshots/ruff_linterrulesflake8_unused_argumentstestsARG002_ARG.py.snap
@@ -66,3 +66,13 @@ ARG.py:216:24: ARG002 Unused method argument: `x`
    |                        ^ ARG002
 217 |         print("Hello, world!")
    |
+
+ARG.py:255:20: ARG002 Unused method argument: `y`
+    |
+253 | ###
+254 | class C:
+255 |     def f(self, x, y):
+    |                    ^ ARG002
+256 |         """Docstring."""
+257 |         msg = t"{x}..."
+    |
--- a/crates/ruff_linter/src/rules/isort/mod.rs
+++ b/crates/ruff_linter/src/rules/isort/mod.rs
@@ -912,6 +912,7 @@ mod tests {
    #[test_case(Path::new("docstring.pyi"))]
    #[test_case(Path::new("docstring_only.py"))]
    #[test_case(Path::new("empty.py"))]
+    #[test_case(Path::new("multiple_strings.py"))]
    fn required_imports(path: &Path) -> Result<()> {
        let snapshot = format!("required_imports_{}", path.to_string_lossy());
        let diagnostics = test_path(
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linterrulesisorttestsrequired_imports_multiple_strings.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linterrulesisorttestsrequired_imports_multiple_strings.py.snap
@@ -0,0 +1,18 @@
+---
+source: crates/ruff_linter/src/rules/isort/mod.rs
+---
+multiple_strings.py:1:1: I002 [*] Missing required import: `from __future__ import annotations`
+ℹ Safe fix
+1 1 | """This is a docstring."""
+  2 |+from __future__ import annotations
+2 3 | "This is not a docstring."
+3 4 | "This is also not a docstring."
+4 5 | 
+
+multiple_strings.py:1:1: I002 [*] Missing required import: `from __future__ import generator_stop`
+ℹ Safe fix
+1 1 | """This is a docstring."""
+  2 |+from __future__ import generator_stop
+2 3 | "This is not a docstring."
+3 4 | "This is also not a docstring."
+4 5 |
--- a/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_function_name.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/rules/invalid_function_name.rs
@@ -1,9 +1,7 @@
-use ruff_python_ast::{Decorator, Stmt};
-
 use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::identifier::Identifier;
+use ruff_python_ast::{Decorator, Stmt, identifier::Identifier};
 use ruff_python_semantic::SemanticModel;
-use ruff_python_semantic::analyze::visibility;
+use ruff_python_semantic::analyze::{class::any_base_class, visibility};
 use ruff_python_stdlib::str;

 use crate::Violation;
@@ -84,6 +82,41 @@ pub(crate) fn invalid_function_name(
        return;
    }

+    let parent_class = semantic
+        .current_statement_parent()
+        .and_then(|parent| parent.as_class_def_stmt());
+
+    // Ignore the visit_* methods of the ast.NodeVisitor and ast.NodeTransformer classes.
+    if name.starts_with("visit_")
+        && parent_class.is_some_and(|class| {
+            any_base_class(class, semantic, &mut |superclass| {
+                let qualified = semantic.resolve_qualified_name(superclass);
+                qualified.is_some_and(|name| {
+                    matches!(name.segments(), ["ast", "NodeVisitor" | "NodeTransformer"])
+                })
+            })
+        })
+    {
+        return;
+    }
+
+    // Ignore the do_* methods of the http.server.BaseHTTPRequestHandler class
+    if name.starts_with("do_")
+        && parent_class.is_some_and(|class| {
+            any_base_class(class, semantic, &mut |superclass| {
+                let qualified = semantic.resolve_qualified_name(superclass);
+                qualified.is_some_and(|name| {
+                    matches!(
+                        name.segments(),
+                        ["http", "server", "BaseHTTPRequestHandler"]
+                    )
+                })
+            })
+        })
+    {
+        return;
+    }
+
    checker.report_diagnostic(
        InvalidFunctionName {
            name: name.to_string(),
--- a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linterrulespep8_namingtestsN802_N802.py.snap
+++ b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linterrulespep8_namingtestsN802_N802.py.snap
@@ -37,3 +37,21 @@ N802.py:40:9: N802 Function name `testTest` should be lowercase
   |         ^^^^^^^^ N802
 41 |         assert True
   |
+
+N802.py:65:9: N802 Function name `bad_Name` should be lowercase
+   |
+63 |         pass
+64 |
+65 |     def bad_Name(self):
+   |         ^^^^^^^^ N802
+66 |         pass
+   |
+
+N802.py:84:9: N802 Function name `dont_GET` should be lowercase
+   |
+82 |         pass
+83 |
+84 |     def dont_GET(self):
+   |         ^^^^^^^^ N802
+85 |         pass
+   |
--- a/crates/ruff_linter/src/rules/pylint/rules/invalid_envvar_value.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/invalid_envvar_value.rs
@@ -18,11 +18,15 @@ use crate::checkers::ast::Checker;
 ///
 /// ## Example
 /// ```python
+/// import os
+///
 /// os.getenv(1)
 /// ```
 ///
 /// Use instead:
 /// ```python
+/// import os
+///
 /// os.getenv("1")
 /// ```
 #[derive(ViolationMetadata)]
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linterrulespylinttestsPLR6301_no_self_use.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linterrulespylinttestsPLR6301_no_self_use.py.snap
@@ -75,3 +75,21 @@ no_self_use.py:140:9: PLR6301 Method `unused_message_2` could be a function, cla
 141 |         msg = ""
 142 |         raise NotImplementedError(x)
    |
+
+no_self_use.py:145:9: PLR6301 Method `developer_greeting` could be a function, class method, or static method
+    |
+144 | class TPerson:
+145 |     def developer_greeting(self, name):  # [no-self-use]
+    |         ^^^^^^^^^^^^^^^^^^ PLR6301
+146 |         print(t"Greetings {name}!")
+    |
+
+no_self_use.py:151:9: PLR6301 Method `tstring` could be a function, class method, or static method
+    |
+149 |         print(t"Hello from {self.name} !")
+150 |
+151 |     def tstring(self, x):
+    |         ^^^^^^^ PLR6301
+152 |         msg = t"{x}"
+153 |         raise NotImplementedError(msg)
+    |
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_c_element_tree.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_c_element_tree.rs
@@ -14,12 +14,12 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///
 /// ## Example
 /// ```python
-/// from xml.etree import cElementTree
+/// from xml.etree import cElementTree as ET
 /// ```
 ///
 /// Use instead:
 /// ```python
-/// from xml.etree import ElementTree
+/// from xml.etree import ElementTree as ET
 /// ```
 ///
 /// ## References
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_generic_class.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_generic_class.rs
@@ -43,7 +43,7 @@ use super::{
 /// ## Example
 ///
 /// ```python
-/// from typing import TypeVar
+/// from typing import Generic, TypeVar
 ///
 /// T = TypeVar("T")
 ///
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_type_alias.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/pep695/non_pep695_type_alias.rs
@@ -40,12 +40,18 @@ use super::{
 ///
 /// ## Example
 /// ```python
+/// from typing import Annotated, TypeAlias, TypeAliasType
+/// from annotated_types import Gt
+///
 /// ListOfInt: TypeAlias = list[int]
 /// PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)])
 /// ```
 ///
 /// Use instead:
 /// ```python
+/// from typing import Annotated
+/// from annotated_types import Gt
+///
 /// type ListOfInt = list[int]
 /// type PositiveInt = Annotated[int, Gt(0)]
 /// ```
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/timeout_error_alias.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/timeout_error_alias.rs
@@ -27,6 +27,8 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///
 /// ## Example
 /// ```python
+/// import asyncio
+///
 /// raise asyncio.TimeoutError
 /// ```
 ///
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linterrulespyupgradetestsUP012.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linterrulespyupgradetestsUP012.py.snap
@@ -576,6 +576,8 @@ UP012.py:86:5: UP012 [*] Unnecessary call to `encode` as UTF-8
 85 | # Refer: https://github.com/astral-sh/ruff/issues/11736
 86 | x: '"foo".encode("utf-8")'
   |     ^^^^^^^^^^^^^^^^^^^^^ UP012
+87 |
+88 | # AttributeError for t-strings so skip lint
   |
   = help: Rewrite as bytes literal

@@ -585,3 +587,6 @@ UP012.py:86:5: UP012 [*] Unnecessary call to `encode` as UTF-8
 85 85 | # Refer: https://github.com/astral-sh/ruff/issues/11736
 86    |-x: '"foo".encode("utf-8")'
   86 |+x: 'b"foo"'
+87 87 | 
+88 88 | # AttributeError for t-strings so skip lint
+89 89 | (t"foo{bar}").encode("utf-8")
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linterrulespyupgradetestsUP018.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linterrulespyupgradetestsUP018.py.snap
@@ -660,6 +660,7 @@ UP018.py:90:1: UP018 [*] Unnecessary `int` call (rewrite as a literal)
   90 |+1 and None
 91 91 | float(1.)and None
 92 92 | bool(True)and()
+93 93 | 

 UP018.py:91:1: UP018 [*] Unnecessary `float` call (rewrite as a literal)
   |
@@ -678,6 +679,8 @@ UP018.py:91:1: UP018 [*] Unnecessary `float` call (rewrite as a literal)
 91    |-float(1.)and None
   91 |+1. and None
 92 92 | bool(True)and()
+93 93 | 
+94 94 | 

 UP018.py:92:1: UP018 [*] Unnecessary `bool` call (rewrite as a literal)
   |
@@ -694,3 +697,6 @@ UP018.py:92:1: UP018 [*] Unnecessary `bool` call (rewrite as a literal)
 91 91 | float(1.)and None
 92    |-bool(True)and()
   92 |+True and()
+93 93 | 
+94 94 | 
+95 95 | # t-strings are not native literals
--- a/crates/ruff_linter/src/rules/refurb/rules/for_loop_writes.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/for_loop_writes.rs
@@ -19,22 +19,26 @@ use crate::rules::refurb::helpers::parenthesize_loop_iter_if_necessary;
 ///
 /// ## Example
 /// ```python
+/// from pathlib import Path
+///
 /// with Path("file").open("w") as f:
 ///     for line in lines:
 ///         f.write(line)
 ///
-/// with Path("file").open("wb") as f:
-///     for line in lines:
-///         f.write(line.encode())
+/// with Path("file").open("wb") as f_b:
+///     for line_b in lines_b:
+///         f_b.write(line_b.encode())
 /// ```
 ///
 /// Use instead:
 /// ```python
+/// from pathlib import Path
+///
 /// with Path("file").open("w") as f:
 ///     f.writelines(lines)
 ///
-/// with Path("file").open("wb") as f:
-///     f.writelines(line.encode() for line in lines)
+/// with Path("file").open("wb") as f_b:
+///     f_b.writelines(line_b.encode() for line_b in lines_b)
 /// ```
 ///
 /// ## Fix safety
--- a/crates/ruff_linter/src/rules/refurb/rules/implicit_cwd.rs
+++ b/crates/ruff_linter/src/rules/refurb/rules/implicit_cwd.rs
@@ -14,11 +14,15 @@ use crate::{checkers::ast::Checker, importer::ImportRequest};
 ///
 /// ## Example
 /// ```python
+/// from pathlib import Path
+///
 /// cwd = Path().resolve()
 /// ```
 ///
 /// Use instead:
 /// ```python
+/// from pathlib import Path
+///
 /// cwd = Path.cwd()
 /// ```
 ///
--- a/crates/ruff_python_ast/src/node_index.rs
+++ b/crates/ruff_python_ast/src/node_index.rs
@@ -49,6 +49,16 @@ impl NodeIndex {
    pub fn as_usize(self) -> usize {
        self.0 as _
    }
+
+    pub fn as_u32(self) -> u32 {
+        self.0
+    }
+}
+
+impl From<u32> for NodeIndex {
+    fn from(value: u32) -> Self {
+        NodeIndex(value)
+    }
 }

 impl From<u32> for AtomicNodeIndex {
--- a/crates/ruff_python_parser/src/semantic_errors.rs
+++ b/crates/ruff_python_parser/src/semantic_errors.rs
@@ -952,6 +952,9 @@ impl Display for SemanticSyntaxError {
            SemanticSyntaxErrorKind::LoadBeforeGlobalDeclaration { name, start: _ } => {
                write!(f, "name `{name}` is used prior to global declaration")
            }
+            SemanticSyntaxErrorKind::LoadBeforeNonlocalDeclaration { name, start: _ } => {
+                write!(f, "name `{name}` is used prior to nonlocal declaration")
+            }
            SemanticSyntaxErrorKind::InvalidStarExpression => {
                f.write_str("Starred expression cannot be used here")
            }
@@ -977,6 +980,15 @@ impl Display for SemanticSyntaxError {
            SemanticSyntaxErrorKind::NonlocalDeclarationAtModuleLevel => {
                write!(f, "nonlocal declaration not allowed at module level")
            }
+            SemanticSyntaxErrorKind::NonlocalAndGlobal(name) => {
+                write!(f, "name `{name}` is nonlocal and global")
+            }
+            SemanticSyntaxErrorKind::AnnotatedGlobal(name) => {
+                write!(f, "annotated name `{name}` can't be global")
+            }
+            SemanticSyntaxErrorKind::AnnotatedNonlocal(name) => {
+                write!(f, "annotated name `{name}` can't be nonlocal")
+            }
        }
    }
 }
@@ -1207,6 +1219,24 @@ pub enum SemanticSyntaxErrorKind {
    /// [#111123]: https://github.com/python/cpython/issues/111123
    LoadBeforeGlobalDeclaration { name: String, start: TextSize },

+    /// Represents the use of a `nonlocal` variable before its `nonlocal` declaration.
+    ///
+    /// ## Examples
+    ///
+    /// ```python
+    /// def f():
+    ///     counter = 0
+    ///     def increment():
+    ///         print(f"Adding 1 to {counter}")
+    ///         nonlocal counter  # SyntaxError: name 'counter' is used prior to nonlocal declaration
+    ///         counter += 1
+    /// ```
+    ///
+    /// ## Known Issues
+    ///
+    /// See [`LoadBeforeGlobalDeclaration`][Self::LoadBeforeGlobalDeclaration].
+    LoadBeforeNonlocalDeclaration { name: String, start: TextSize },
+
    /// Represents the use of a starred expression in an invalid location, such as a `return` or
    /// `yield` statement.
    ///
@@ -1307,6 +1337,15 @@ pub enum SemanticSyntaxErrorKind {

    /// Represents a nonlocal declaration at module level
    NonlocalDeclarationAtModuleLevel,
+
+    /// Represents the same variable declared as both nonlocal and global
+    NonlocalAndGlobal(String),
+
+    /// Represents a type annotation on a variable that's been declared global
+    AnnotatedGlobal(String),
+
+    /// Represents a type annotation on a variable that's been declared nonlocal
+    AnnotatedNonlocal(String),
 }

 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, get_size2::GetSize)]
--- a/crates/ruff_server/src/lint.rs
+++ b/crates/ruff_server/src/lint.rs
@@ -301,7 +301,7 @@ fn to_lsp_diagnostic(
            severity,
            tags,
            code,
-            code_description: diagnostic.to_url().and_then(|url| {
+            code_description: diagnostic.to_ruff_url().and_then(|url| {
                Some(lsp_types::CodeDescription {
                    href: lsp_types::Url::parse(&url).ok()?,
                })
--- a/crates/ty/build.rs
+++ b/crates/ty/build.rs
@@ -7,13 +7,25 @@ use std::{
 fn main() {
    // The workspace root directory is not available without walking up the tree
    // https://github.com/rust-lang/cargo/issues/3946
-    let workspace_root = Path::new(&std::env::var("CARGO_MANIFEST_DIR").unwrap())
-        .join("..")
+    let ruff_workspace_root = Path::new(&std::env::var("CARGO_MANIFEST_DIR").unwrap())
        .join("..")
        .join("..");
+    let ty_workspace_root = ruff_workspace_root.join("..");

-    version_info(&workspace_root);
-    commit_info(&workspace_root);
+    version_info(&ty_workspace_root);
+
+    // If not in a git repository, do not attempt to retrieve commit information
+    let git_dir = ty_workspace_root.join(".git");
+    if git_dir.exists() {
+        commit_info(&git_dir, &ty_workspace_root, false);
+    } else {
+        // Try if we're inside the ruff repository and, if so, use that commit hash.
+        let git_dir = ruff_workspace_root.join(".git");
+
+        if git_dir.exists() {
+            commit_info(&git_dir, &ruff_workspace_root, true);
+        }
+    }

    let target = std::env::var("TARGET").unwrap();
    println!("cargo::rustc-env=RUST_HOST_TARGET={target}");
@@ -45,14 +57,8 @@ fn version_info(workspace_root: &Path) {
 }

 /// Retrieve commit information from the Git repository.
-fn commit_info(workspace_root: &Path) {
-    // If not in a git repository, do not attempt to retrieve commit information
-    let git_dir = workspace_root.join(".git");
-    if !git_dir.exists() {
-        return;
-    }
-
-    if let Some(git_head_path) = git_head(&git_dir) {
+fn commit_info(git_dir: &Path, workspace_root: &Path, is_ruff: bool) {
+    if let Some(git_head_path) = git_head(git_dir) {
        println!("cargo:rerun-if-changed={}", git_head_path.display());

        let git_head_contents = fs::read_to_string(git_head_path);
@@ -96,7 +102,10 @@ fn commit_info(workspace_root: &Path) {
        let mut describe_parts = describe.split('-');
        let last_tag = describe_parts.next().unwrap();

-        println!("cargo::rustc-env=TY_LAST_TAG={last_tag}");
+        println!(
+            "cargo::rustc-env=TY_LAST_TAG={ruff}{last_tag}",
+            ruff = if is_ruff { "ruff/" } else { "" }
+        );

        // If this is the tagged commit, this component will be missing
        println!(
--- a/crates/ty/src/args.rs
+++ b/crates/ty/src/args.rs
@@ -323,8 +323,8 @@ pub enum OutputFormat {
    Concise,
 }

-impl From<OutputFormat> for ruff_db::diagnostic::DiagnosticFormat {
-    fn from(format: OutputFormat) -> ruff_db::diagnostic::DiagnosticFormat {
+impl From<OutputFormat> for ty_project::metadata::options::OutputFormat {
+    fn from(format: OutputFormat) -> ty_project::metadata::options::OutputFormat {
        match format {
            OutputFormat::Full => Self::Full,
            OutputFormat::Concise => Self::Concise,
--- a/crates/ty/src/lib.rs
+++ b/crates/ty/src/lib.rs
@@ -33,6 +33,7 @@ use ty_server::run_server;

 pub fn run() -> anyhow::Result<ExitStatus> {
    setup_rayon();
+    ruff_db::set_program_version(crate::version::version().to_string()).unwrap();

    let args = wild::args_os();
    let args = argfile::expand_args_from(args, argfile::parse_fromfile, argfile::PREFIX)
@@ -120,17 +121,17 @@ fn run_check(args: CheckCommand) -> anyhow::Result<ExitStatus> {
        None => ProjectMetadata::discover(&project_path, &system)?,
    };

-    let options = args.into_options();
-    project_metadata.apply_options(options.clone());
    project_metadata.apply_configuration_files(&system)?;

+    let project_options_overrides = ProjectOptionsOverrides::new(config_file, args.into_options());
+    project_metadata.apply_overrides(&project_options_overrides);
+
    let mut db = ProjectDatabase::new(project_metadata, system)?;

    if !check_paths.is_empty() {
        db.project().set_included_paths(&mut db, check_paths);
    }

-    let project_options_overrides = ProjectOptionsOverrides::new(config_file, options);
    let (main_loop, main_loop_cancellation_token) =
        MainLoop::new(project_options_overrides, printer);

@@ -290,7 +291,7 @@ impl MainLoop {
                } => {
                    let terminal_settings = db.project().settings(db).terminal();
                    let display_config = DisplayDiagnosticConfig::default()
-                        .format(terminal_settings.output_format)
+                        .format(terminal_settings.output_format.into())
                        .color(colored::control::SHOULD_COLORIZE.should_colorize());

                    if check_revision == revision {
--- a/crates/ty/tests/cli/rule_selection.rs
+++ b/crates/ty/tests/cli/rule_selection.rs
@@ -803,12 +803,12 @@ fn overrides_no_actual_overrides() -> anyhow::Result<()> {
    warning[useless-overrides-section]: Useless `overrides` section
     --> pyproject.toml:5:1
      |
-    3 |   division-by-zero = "error"
+    3 | division-by-zero = "error"
    4 |
-    5 | / [[tool.ty.overrides]]
-    6 | | include = ["*.py"]  # Has patterns but no rule overrides
-      | |__________________^ This overrides section configures no rules
-    7 |   # Missing [tool.ty.overrides.rules] section entirely
+    5 | [[tool.ty.overrides]]
+      | ^^^^^^^^^^^^^^^^^^^^^ This overrides section configures no rules
+    6 | include = ["*.py"]  # Has patterns but no rule overrides
+    7 | # Missing [tool.ty.overrides.rules] section entirely
      |
    info: It has no `rules` table
    info: Add a `[overrides.rules]` table...
--- a/crates/ty_ide/src/completion.rs
+++ b/crates/ty_ide/src/completion.rs
@@ -536,6 +536,9 @@ _private_type_var_tuple = TypeVarTuple("_private_type_var_tuple")
 public_explicit_type_alias: TypeAlias = Literal[1]
 _private_explicit_type_alias: TypeAlias = Literal[1]

+public_implicit_union_alias = int | str
+_private_implicit_union_alias = int | str
+
 class PublicProtocol(Protocol):
    def method(self) -> None: ...

@@ -557,7 +560,9 @@ class _PrivateProtocol(Protocol):
        test.assert_completions_include("public_type_var_tuple");
        test.assert_completions_do_not_include("_private_type_var_tuple");
        test.assert_completions_include("public_explicit_type_alias");
-        test.assert_completions_include("_private_explicit_type_alias");
+        test.assert_completions_do_not_include("_private_explicit_type_alias");
+        test.assert_completions_include("public_implicit_union_alias");
+        test.assert_completions_do_not_include("_private_implicit_union_alias");
        test.assert_completions_include("PublicProtocol");
        test.assert_completions_do_not_include("_PrivateProtocol");
    }
@@ -1298,6 +1303,139 @@ quux.b<CURSOR>
        ");
    }

+    #[test]
+    fn metaclass1() {
+        let test = cursor_test(
+            "\
+class Meta(type):
+    @property
+    def meta_attr(self) -> int:
+        return 0
+
+class C(metaclass=Meta): ...
+
+C.<CURSOR>
+",
+        );
+
+        assert_snapshot!(test.completions_without_builtins_with_types(), @r"
+        meta_attr :: int
+        mro :: bound method <class 'C'>.mro() -> list[type]
+        __annotations__ :: dict[str, Any]
+        __base__ :: type | None
+        __bases__ :: tuple[type, ...]
+        __basicsize__ :: int
+        __call__ :: bound method <class 'C'>.__call__(...) -> Any
+        __class__ :: <class 'Meta'>
+        __delattr__ :: def __delattr__(self, name: str, /) -> None
+        __dict__ :: MappingProxyType[str, Any]
+        __dictoffset__ :: int
+        __dir__ :: def __dir__(self) -> Iterable[str]
+        __doc__ :: str | None
+        __eq__ :: def __eq__(self, value: object, /) -> bool
+        __flags__ :: int
+        __format__ :: def __format__(self, format_spec: str, /) -> str
+        __getattribute__ :: def __getattribute__(self, name: str, /) -> Any
+        __getstate__ :: def __getstate__(self) -> object
+        __hash__ :: def __hash__(self) -> int
+        __init__ :: def __init__(self) -> None
+        __init_subclass__ :: def __init_subclass__(cls) -> None
+        __instancecheck__ :: bound method <class 'C'>.__instancecheck__(instance: Any, /) -> bool
+        __itemsize__ :: int
+        __module__ :: str
+        __mro__ :: tuple[<class 'C'>, <class 'object'>]
+        __name__ :: str
+        __ne__ :: def __ne__(self, value: object, /) -> bool
+        __new__ :: def __new__(cls) -> Self
+        __or__ :: bound method <class 'C'>.__or__(value: Any, /) -> UnionType
+        __prepare__ :: bound method <class 'Meta'>.__prepare__(name: str, bases: tuple[type, ...], /, **kwds: Any) -> MutableMapping[str, object]
+        __qualname__ :: str
+        __reduce__ :: def __reduce__(self) -> str | tuple[Any, ...]
+        __reduce_ex__ :: def __reduce_ex__(self, protocol: SupportsIndex, /) -> str | tuple[Any, ...]
+        __repr__ :: def __repr__(self) -> str
+        __ror__ :: bound method <class 'C'>.__ror__(value: Any, /) -> UnionType
+        __setattr__ :: def __setattr__(self, name: str, value: Any, /) -> None
+        __sizeof__ :: def __sizeof__(self) -> int
+        __str__ :: def __str__(self) -> str
+        __subclasscheck__ :: bound method <class 'C'>.__subclasscheck__(subclass: type, /) -> bool
+        __subclasses__ :: bound method <class 'C'>.__subclasses__() -> list[Self]
+        __subclasshook__ :: bound method <class 'C'>.__subclasshook__(subclass: type, /) -> bool
+        __text_signature__ :: str | None
+        __type_params__ :: tuple[TypeVar | ParamSpec | TypeVarTuple, ...]
+        __weakrefoffset__ :: int
+        ");
+    }
+
+    #[test]
+    fn metaclass2() {
+        let test = cursor_test(
+            "\
+class Meta(type):
+    @property
+    def meta_attr(self) -> int:
+        return 0
+
+class C(metaclass=Meta): ...
+
+Meta.<CURSOR>
+",
+        );
+
+        insta::with_settings!({
+            // The formatting of some types are different depending on
+            // whether we're in release mode or not. These differences
+            // aren't really relevant for completion tests AFAIK, so
+            // just redact them. ---AG
+            filters => [(r"(?m)\s*__(annotations|new)__.+$", "")]},
+            {
+                assert_snapshot!(test.completions_without_builtins_with_types(), @r"
+                meta_attr :: property
+                mro :: def mro(self) -> list[type]
+                __base__ :: type | None
+                __bases__ :: tuple[type, ...]
+                __basicsize__ :: int
+                __call__ :: def __call__(self, *args: Any, **kwds: Any) -> Any
+                __class__ :: <class 'type'>
+                __delattr__ :: def __delattr__(self, name: str, /) -> None
+                __dict__ :: MappingProxyType[str, Any]
+                __dictoffset__ :: int
+                __dir__ :: def __dir__(self) -> Iterable[str]
+                __doc__ :: str | None
+                __eq__ :: def __eq__(self, value: object, /) -> bool
+                __flags__ :: int
+                __format__ :: def __format__(self, format_spec: str, /) -> str
+                __getattribute__ :: def __getattribute__(self, name: str, /) -> Any
+                __getstate__ :: def __getstate__(self) -> object
+                __hash__ :: def __hash__(self) -> int
+                __init__ :: Overload[(self, o: object, /) -> None, (self, name: str, bases: tuple[type, ...], dict: dict[str, Any], /, **kwds: Any) -> None]
+                __init_subclass__ :: def __init_subclass__(cls) -> None
+                __instancecheck__ :: def __instancecheck__(self, instance: Any, /) -> bool
+                __itemsize__ :: int
+                __module__ :: str
+                __mro__ :: tuple[<class 'Meta'>, <class 'type'>, <class 'object'>]
+                __name__ :: str
+                __ne__ :: def __ne__(self, value: object, /) -> bool
+                __or__ :: def __or__(self, value: Any, /) -> UnionType
+                __prepare__ :: bound method <class 'Meta'>.__prepare__(name: str, bases: tuple[type, ...], /, **kwds: Any) -> MutableMapping[str, object]
+                __qualname__ :: str
+                __reduce__ :: def __reduce__(self) -> str | tuple[Any, ...]
+                __reduce_ex__ :: def __reduce_ex__(self, protocol: SupportsIndex, /) -> str | tuple[Any, ...]
+                __repr__ :: def __repr__(self) -> str
+                __ror__ :: def __ror__(self, value: Any, /) -> UnionType
+                __setattr__ :: def __setattr__(self, name: str, value: Any, /) -> None
+                __sizeof__ :: def __sizeof__(self) -> int
+                __str__ :: def __str__(self) -> str
+                __subclasscheck__ :: def __subclasscheck__(self, subclass: type, /) -> bool
+                __subclasses__ :: def __subclasses__(self: Self) -> list[Self]
+                __subclasshook__ :: bound method <class 'Meta'>.__subclasshook__(subclass: type, /) -> bool
+                __text_signature__ :: str | None
+                __type_params__ :: tuple[TypeVar | ParamSpec | TypeVarTuple, ...]
+                __weakrefoffset__ :: int
+                ");
+            }
+        );
+    }
+
    #[test]
    fn class_init3() {
        let test = cursor_test(
@@ -1353,7 +1491,7 @@ Quux.<CURSOR>
        );

        assert_snapshot!(test.completions_without_builtins_with_types(), @r"
-        mro :: def mro(self) -> list[type]
+        mro :: bound method <class 'Quux'>.mro() -> list[type]
        some_attribute :: int
        some_class_method :: bound method <class 'Quux'>.some_class_method() -> int
        some_method :: def some_method(self) -> int
@@ -1363,7 +1501,7 @@ Quux.<CURSOR>
        __base__ :: type | None
        __bases__ :: tuple[type, ...]
        __basicsize__ :: int
-        __call__ :: def __call__(self, *args: Any, **kwds: Any) -> Any
+        __call__ :: bound method <class 'Quux'>.__call__(...) -> Any
        __class__ :: <class 'type'>
        __delattr__ :: def __delattr__(self, name: str, /) -> None
        __dict__ :: MappingProxyType[str, Any]
@@ -1378,26 +1516,26 @@ Quux.<CURSOR>
        __hash__ :: def __hash__(self) -> int
        __init__ :: def __init__(self) -> Unknown
        __init_subclass__ :: def __init_subclass__(cls) -> None
-        __instancecheck__ :: def __instancecheck__(self, instance: Any, /) -> bool
+        __instancecheck__ :: bound method <class 'Quux'>.__instancecheck__(instance: Any, /) -> bool
        __itemsize__ :: int
        __module__ :: str
-        __mro__ :: tuple[<class 'type'>, <class 'object'>]
+        __mro__ :: tuple[<class 'Quux'>, <class 'object'>]
        __name__ :: str
        __ne__ :: def __ne__(self, value: object, /) -> bool
        __new__ :: def __new__(cls) -> Self
-        __or__ :: def __or__(self, value: Any, /) -> UnionType
+        __or__ :: bound method <class 'Quux'>.__or__(value: Any, /) -> UnionType
        __prepare__ :: bound method <class 'type'>.__prepare__(name: str, bases: tuple[type, ...], /, **kwds: Any) -> MutableMapping[str, object]
        __qualname__ :: str
        __reduce__ :: def __reduce__(self) -> str | tuple[Any, ...]
        __reduce_ex__ :: def __reduce_ex__(self, protocol: SupportsIndex, /) -> str | tuple[Any, ...]
        __repr__ :: def __repr__(self) -> str
-        __ror__ :: def __ror__(self, value: Any, /) -> UnionType
+        __ror__ :: bound method <class 'Quux'>.__ror__(value: Any, /) -> UnionType
        __setattr__ :: def __setattr__(self, name: str, value: Any, /) -> None
        __sizeof__ :: def __sizeof__(self) -> int
        __str__ :: def __str__(self) -> str
-        __subclasscheck__ :: def __subclasscheck__(self, subclass: type, /) -> bool
-        __subclasses__ :: def __subclasses__(self: Self) -> list[Self]
-        __subclasshook__ :: bound method <class 'object'>.__subclasshook__(subclass: type, /) -> bool
+        __subclasscheck__ :: bound method <class 'Quux'>.__subclasscheck__(subclass: type, /) -> bool
+        __subclasses__ :: bound method <class 'Quux'>.__subclasses__() -> list[Self]
+        __subclasshook__ :: bound method <class 'Quux'>.__subclasshook__(subclass: type, /) -> bool
        __text_signature__ :: str | None
        __type_params__ :: tuple[TypeVar | ParamSpec | TypeVarTuple, ...]
        __weakrefoffset__ :: int
@@ -2391,6 +2529,48 @@ Cougar = 3
        test.assert_completions_include("Cheetah");
    }

+    #[test]
+    fn from_import_with_submodule1() {
+        let test = CursorTest::builder()
+            .source("main.py", "from package import <CURSOR>")
+            .source("package/__init__.py", "")
+            .source("package/foo.py", "")
+            .source("package/bar.pyi", "")
+            .source("package/foo-bar.py", "")
+            .source("package/data.txt", "")
+            .source("package/sub/__init__.py", "")
+            .source("package/not-a-submodule/__init__.py", "")
+            .build();
+
+        test.assert_completions_include("foo");
+        test.assert_completions_include("bar");
+        test.assert_completions_include("sub");
+        test.assert_completions_do_not_include("foo-bar");
+        test.assert_completions_do_not_include("data");
+        test.assert_completions_do_not_include("not-a-submodule");
+    }
+
+    #[test]
+    fn from_import_with_vendored_submodule1() {
+        let test = cursor_test(
+            "\
+from http import <CURSOR>
+",
+        );
+        test.assert_completions_include("client");
+    }
+
+    #[test]
+    fn from_import_with_vendored_submodule2() {
+        let test = cursor_test(
+            "\
+from email import <CURSOR>
+",
+        );
+        test.assert_completions_include("mime");
+        test.assert_completions_do_not_include("base");
+    }
+
    #[test]
    fn import_submodule_not_attribute1() {
        let test = cursor_test(
--- a/crates/ty_ide/src/goto.rs
+++ b/crates/ty_ide/src/goto.rs
@@ -423,15 +423,15 @@ mod tests {

        assert_snapshot!(test.goto_type_definition(), @r#"
        info[goto-type-definition]: Type definition
-           --> stdlib/builtins.pyi:461:7
-            |
-        459 |     def __getitem__(self, key: int, /) -> str | int | None: ...
-        460 |
-        461 | class str(Sequence[str]):
-            |       ^^^
-        462 |     @overload
-        463 |     def __new__(cls, object: object = ...) -> Self: ...
-            |
+            --> stdlib/builtins.pyi:1120:7
+             |
+        1118 |     def __getitem__(self, key: int, /) -> str | int | None: ...
+        1119 |
+        1120 | class str(Sequence[str]):
+             |       ^^^
+        1121 |     """
+        1122 |     str(object='') -> str
+             |
        info: Source
         --> main.py:4:13
          |
@@ -452,15 +452,15 @@ mod tests {

        assert_snapshot!(test.goto_type_definition(), @r#"
        info[goto-type-definition]: Type definition
-           --> stdlib/builtins.pyi:461:7
-            |
-        459 |     def __getitem__(self, key: int, /) -> str | int | None: ...
-        460 |
-        461 | class str(Sequence[str]):
-            |       ^^^
-        462 |     @overload
-        463 |     def __new__(cls, object: object = ...) -> Self: ...
-            |
+            --> stdlib/builtins.pyi:1120:7
+             |
+        1118 |     def __getitem__(self, key: int, /) -> str | int | None: ...
+        1119 |
+        1120 | class str(Sequence[str]):
+             |       ^^^
+        1121 |     """
+        1122 |     str(object='') -> str
+             |
        info: Source
         --> main.py:2:22
          |
@@ -568,15 +568,15 @@ mod tests {

        assert_snapshot!(test.goto_type_definition(), @r#"
        info[goto-type-definition]: Type definition
-           --> stdlib/builtins.pyi:461:7
-            |
-        459 |     def __getitem__(self, key: int, /) -> str | int | None: ...
-        460 |
-        461 | class str(Sequence[str]):
-            |       ^^^
-        462 |     @overload
-        463 |     def __new__(cls, object: object = ...) -> Self: ...
-            |
+            --> stdlib/builtins.pyi:1120:7
+             |
+        1118 |     def __getitem__(self, key: int, /) -> str | int | None: ...
+        1119 |
+        1120 | class str(Sequence[str]):
+             |       ^^^
+        1121 |     """
+        1122 |     str(object='') -> str
+             |
        info: Source
         --> main.py:4:18
          |
@@ -601,16 +601,16 @@ mod tests {
        // TODO: This should jump to `str` and not `int` because
        //   the keyword is typed as a string. It's only the passed argument that
        //   is an int. Navigating to `str` would match pyright's behavior.
-        assert_snapshot!(test.goto_type_definition(), @r"
+        assert_snapshot!(test.goto_type_definition(), @r#"
        info[goto-type-definition]: Type definition
-           --> stdlib/builtins.pyi:244:7
+           --> stdlib/builtins.pyi:365:7
            |
-        242 | _LiteralInteger = _PositiveInteger | _NegativeInteger | Literal[0]  # noqa: Y026  # TODO: Use TypeAlias once mypy bugs are fixed
-        243 |
-        244 | class int:
+        363 | _LiteralInteger = _PositiveInteger | _NegativeInteger | Literal[0]  # noqa: Y026  # TODO: Use TypeAlias once mypy bugs are fixed
+        364 |
+        365 | class int:
            |       ^^^
-        245 |     @overload
-        246 |     def __new__(cls, x: ConvertibleToInt = ..., /) -> Self: ...
+        366 |     """
+        367 |     int([x]) -> integer
            |
        info: Source
         --> main.py:4:18
@@ -620,7 +620,7 @@ mod tests {
        4 |             test(a= 123)
          |                  ^
          |
-        ");
+        "#);
    }

    #[test]
@@ -637,14 +637,14 @@ f(**kwargs<CURSOR>)

        assert_snapshot!(test.goto_type_definition(), @r#"
        info[goto-type-definition]: Type definition
-            --> stdlib/builtins.pyi:1136:7
+            --> stdlib/builtins.pyi:3458:7
             |
-        1134 |     def __class_getitem__(cls, item: Any, /) -> GenericAlias: ...
-        1135 |
-        1136 | class dict(MutableMapping[_KT, _VT]):
+        3456 |         """
+        3457 |
+        3458 | class dict(MutableMapping[_KT, _VT]):
             |       ^^^^
-        1137 |     # __init__ should be kept roughly in line with `collections.UserDict.__init__`, which has similar semantics
-        1138 |     # Also multiprocessing.managers.SyncManager.dict()
+        3459 |     """
+        3460 |     dict() -> new empty dictionary
             |
        info: Source
         --> main.py:6:5
@@ -666,17 +666,17 @@ f(**kwargs<CURSOR>)
            "#,
        );

-        assert_snapshot!(test.goto_type_definition(), @r"
+        assert_snapshot!(test.goto_type_definition(), @r#"
        info[goto-type-definition]: Type definition
-           --> stdlib/builtins.pyi:461:7
-            |
-        459 |     def __getitem__(self, key: int, /) -> str | int | None: ...
-        460 |
-        461 | class str(Sequence[str]):
-            |       ^^^
-        462 |     @overload
-        463 |     def __new__(cls, object: object = ...) -> Self: ...
-            |
+            --> stdlib/builtins.pyi:1120:7
+             |
+        1118 |     def __getitem__(self, key: int, /) -> str | int | None: ...
+        1119 |
+        1120 | class str(Sequence[str]):
+             |       ^^^
+        1121 |     """
+        1122 |     str(object='') -> str
+             |
        info: Source
         --> main.py:3:17
          |
@@ -684,7 +684,7 @@ f(**kwargs<CURSOR>)
        3 |                 a
          |                 ^
          |
-        ");
+        "#);
    }

    #[test]
@@ -759,17 +759,17 @@ f(**kwargs<CURSOR>)
            "#,
        );

-        assert_snapshot!(test.goto_type_definition(), @r"
+        assert_snapshot!(test.goto_type_definition(), @r#"
        info[goto-type-definition]: Type definition
-           --> stdlib/builtins.pyi:461:7
-            |
-        459 |     def __getitem__(self, key: int, /) -> str | int | None: ...
-        460 |
-        461 | class str(Sequence[str]):
-            |       ^^^
-        462 |     @overload
-        463 |     def __new__(cls, object: object = ...) -> Self: ...
-            |
+            --> stdlib/builtins.pyi:1120:7
+             |
+        1118 |     def __getitem__(self, key: int, /) -> str | int | None: ...
+        1119 |
+        1120 | class str(Sequence[str]):
+             |       ^^^
+        1121 |     """
+        1122 |     str(object='') -> str
+             |
        info: Source
         --> main.py:4:27
          |
@@ -778,7 +778,7 @@ f(**kwargs<CURSOR>)
        4 |                     print(a)
          |                           ^
          |
-        ");
+        "#);
    }

    #[test]
@@ -790,16 +790,17 @@ f(**kwargs<CURSOR>)
            "#,
        );

-        assert_snapshot!(test.goto_type_definition(), @r"
+        assert_snapshot!(test.goto_type_definition(), @r#"
        info[goto-type-definition]: Type definition
-           --> stdlib/types.pyi:691:11
-            |
-        689 | if sys.version_info >= (3, 10):
-        690 |     @final
-        691 |     class NoneType:
-            |           ^^^^^^^^
-        692 |         def __bool__(self) -> Literal[False]: ...
-            |
+            --> stdlib/types.pyi:1073:11
+             |
+        1071 | if sys.version_info >= (3, 10):
+        1072 |     @final
+        1073 |     class NoneType:
+             |           ^^^^^^^^
+        1074 |         """
+        1075 |         The type of the None singleton.
+             |
        info: Source
         --> main.py:3:17
          |
@@ -809,15 +810,15 @@ f(**kwargs<CURSOR>)
          |

        info[goto-type-definition]: Type definition
-           --> stdlib/builtins.pyi:461:7
-            |
-        459 |     def __getitem__(self, key: int, /) -> str | int | None: ...
-        460 |
-        461 | class str(Sequence[str]):
-            |       ^^^
-        462 |     @overload
-        463 |     def __new__(cls, object: object = ...) -> Self: ...
-            |
+            --> stdlib/builtins.pyi:1120:7
+             |
+        1118 |     def __getitem__(self, key: int, /) -> str | int | None: ...
+        1119 |
+        1120 | class str(Sequence[str]):
+             |       ^^^
+        1121 |     """
+        1122 |     str(object='') -> str
+             |
        info: Source
         --> main.py:3:17
          |
@@ -825,7 +826,7 @@ f(**kwargs<CURSOR>)
        3 |                 a
          |                 ^
          |
-        ");
+        "#);
    }

    impl CursorTest {
--- a/crates/ty_project/src/db.rs
+++ b/crates/ty_project/src/db.rs
@@ -3,6 +3,7 @@ use std::panic::{AssertUnwindSafe, RefUnwindSafe};
 use std::sync::Arc;
 use std::{cmp, fmt};

+pub use self::changes::ChangeResult;
 use crate::metadata::settings::file_settings;
 use crate::{DEFAULT_LINT_REGISTRY, DummyReporter};
 use crate::{ProgressReporter, Project, ProjectMetadata};
--- a/crates/ty_project/src/db/changes.rs
+++ b/crates/ty_project/src/db/changes.rs
@@ -41,8 +41,6 @@ impl ProjectDatabase {
        let project_root = project.root(self).to_path_buf();
        let config_file_override =
            project_options_overrides.and_then(|options| options.config_file_override.clone());
-        let options =
-            project_options_overrides.map(|project_options| project_options.options.clone());
        let program = Program::get(self);
        let custom_stdlib_versions_path = program
            .custom_stdlib_search_path(self)
@@ -218,16 +216,16 @@ impl ProjectDatabase {
            };
            match new_project_metadata {
                Ok(mut metadata) => {
-                    if let Some(cli_options) = options {
-                        metadata.apply_options(cli_options);
-                    }
-
                    if let Err(error) = metadata.apply_configuration_files(self.system()) {
                        tracing::error!(
                            "Failed to apply configuration files, continuing without applying them: {error}"
                        );
                    }

+                    if let Some(overrides) = project_options_overrides {
+                        metadata.apply_overrides(overrides);
+                    }
+
                    match metadata.to_program_settings(self.system(), self.vendored()) {
                        Ok(program_settings) => {
                            let program = Program::get(self);
--- a/crates/ty_project/src/lib.rs
+++ b/crates/ty_project/src/lib.rs
@@ -1,7 +1,7 @@
 use crate::glob::{GlobFilterCheckMode, IncludeResult};
 use crate::metadata::options::{OptionDiagnostic, ToSettingsError};
 use crate::walk::{ProjectFilesFilter, ProjectFilesWalker};
-pub use db::{CheckMode, Db, ProjectDatabase, SalsaMemoryDump};
+pub use db::{ChangeResult, CheckMode, Db, ProjectDatabase, SalsaMemoryDump};
 use files::{Index, Indexed, IndexedFiles};
 use metadata::settings::Settings;
 pub use metadata::{ProjectMetadata, ProjectMetadataError};
@@ -667,6 +667,13 @@ where
                    arch = std::env::consts::ARCH
                ),
            ));
+            if let Some(version) = ruff_db::program_version() {
+                diagnostic.sub(SubDiagnostic::new(
+                    Severity::Info,
+                    format!("Version: {version}"),
+                ));
+            }
+
            diagnostic.sub(SubDiagnostic::new(
                Severity::Info,
                format!(
--- a/crates/ty_project/src/metadata.rs
+++ b/crates/ty_project/src/metadata.rs
@@ -7,6 +7,7 @@ use thiserror::Error;
 use ty_python_semantic::ProgramSettings;

 use crate::combine::Combine;
+use crate::metadata::options::ProjectOptionsOverrides;
 use crate::metadata::pyproject::{Project, PyProject, PyProjectError, ResolveRequiresPythonError};
 use crate::metadata::value::ValueSource;
 pub use options::Options;
@@ -276,6 +277,10 @@ impl ProjectMetadata {
            .to_program_settings(self.root(), self.name(), system, vendored)
    }

+    pub fn apply_overrides(&mut self, overrides: &ProjectOptionsOverrides) {
+        self.options = overrides.apply_to(std::mem::take(&mut self.options));
+    }
+
    /// Combine the project options with the CLI options where the CLI options take precedence.
    pub fn apply_options(&mut self, options: Options) {
        self.options = options.combine(std::mem::take(&mut self.options));
@@ -455,8 +460,7 @@ mod tests {
  |
 5 |                     [tool.ty
  |                             ^
-invalid table header
-expected `.`, `]`
+unclosed table, expected `]`
 "#,
        );

--- a/crates/ty_project/src/metadata/options.rs
+++ b/crates/ty_project/src/metadata/options.rs
@@ -121,6 +121,9 @@ impl Options {
                        ValueSource::File(path) => PythonVersionSource::ConfigFile(
                            PythonVersionFileSource::new(path.clone(), ranged_version.range()),
                        ),
+                        ValueSource::PythonVSCodeExtension => {
+                            PythonVersionSource::PythonVSCodeExtension
+                        }
                    },
                });

@@ -140,6 +143,7 @@ impl Options {
                ValueSource::File(path) => {
                    SysPrefixPathOrigin::ConfigFileSetting(path.clone(), python_path.range())
                }
+                ValueSource::PythonVSCodeExtension => SysPrefixPathOrigin::PythonVSCodeExtension,
            };

            Some(PythonEnvironment::new(
@@ -702,6 +706,10 @@ impl Rules {
                    let lint_source = match source {
                        ValueSource::File(_) => LintSource::File,
                        ValueSource::Cli => LintSource::Cli,
+
+                        ValueSource::PythonVSCodeExtension => {
+                            unreachable!("Can't configure rules from the Python VSCode extension")
+                        }
                    };
                    if let Ok(severity) = Severity::try_from(**level) {
                        selection.enable(lint, severity, lint_source);
@@ -854,6 +862,7 @@ fn build_include_filter(
                            Severity::Info,
                            "The pattern was specified on the CLI",
                        )),
+                        ValueSource::PythonVSCodeExtension => unreachable!("Can't configure includes from the Python VSCode extension"),
                    }
                })?;
        }
@@ -936,6 +945,9 @@ fn build_exclude_filter(
                            Severity::Info,
                            "The pattern was specified on the CLI",
                        )),
+                        ValueSource::PythonVSCodeExtension => unreachable!(
+                            "Can't configure excludes from the Python VSCode extension"
+                        )
                    }
                })?;
        }
@@ -979,6 +991,39 @@ impl GlobFilterContext {
    }
 }

+/// The diagnostic output format.
+#[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case", deny_unknown_fields)]
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+pub enum OutputFormat {
+    /// The default full mode will print "pretty" diagnostics.
+    ///
+    /// That is, color will be used when printing to a `tty`.
+    /// Moreover, diagnostic messages may include additional
+    /// context and annotations on the input to help understand
+    /// the message.
+    #[default]
+    Full,
+    /// Print diagnostics in a concise mode.
+    ///
+    /// This will guarantee that each diagnostic is printed on
+    /// a single line. Only the most important or primary aspects
+    /// of the diagnostic are included. Contextual information is
+    /// dropped.
+    ///
+    /// This may use color when printing to a `tty`.
+    Concise,
+}
+
+impl From<OutputFormat> for DiagnosticFormat {
+    fn from(value: OutputFormat) -> Self {
+        match value {
+            OutputFormat::Full => Self::Full,
+            OutputFormat::Concise => Self::Concise,
+        }
+    }
+}
+
 #[derive(
    Debug, Default, Clone, Eq, PartialEq, Combine, Serialize, Deserialize, OptionsMetadata,
 )]
@@ -996,7 +1041,7 @@ pub struct TerminalOptions {
            output-format = "concise"
        "#
    )]
-    pub output_format: Option<RangedValue<DiagnosticFormat>>,
+    pub output_format: Option<RangedValue<OutputFormat>>,
    /// Use exit code 1 if there are any warning-level diagnostics.
    ///
    /// Defaults to `false`.
@@ -1295,7 +1340,7 @@ pub(super) struct InnerOverrideOptions {
 #[derive(Debug)]
 pub struct ToSettingsError {
    diagnostic: Box<OptionDiagnostic>,
-    output_format: DiagnosticFormat,
+    output_format: OutputFormat,
    color: bool,
 }

@@ -1309,7 +1354,7 @@ impl ToSettingsError {
        impl fmt::Display for DisplayPretty<'_> {
            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
                let display_config = DisplayDiagnosticConfig::default()
-                    .format(self.error.output_format)
+                    .format(self.error.output_format.into())
                    .color(self.error.color);

                write!(
@@ -1464,8 +1509,11 @@ impl OptionDiagnostic {
 /// This is a wrapper for options that actually get loaded from configuration files
 /// and the CLI, which also includes a `config_file_override` option that overrides
 /// default configuration discovery with an explicitly-provided path to a configuration file
+#[derive(Debug, Default, PartialEq, Eq, Clone)]
 pub struct ProjectOptionsOverrides {
    pub config_file_override: Option<SystemPathBuf>,
+    pub fallback_python_version: Option<RangedValue<PythonVersion>>,
+    pub fallback_python: Option<RelativePathBuf>,
    pub options: Options,
 }

@@ -1474,8 +1522,22 @@ impl ProjectOptionsOverrides {
        Self {
            config_file_override,
            options,
+            ..Self::default()
        }
    }
+
+    pub fn apply_to(&self, options: Options) -> Options {
+        let mut combined = self.options.clone().combine(options);
+
+        // Set the fallback python version and path if set
+        combined.environment.combine_with(Some(EnvironmentOptions {
+            python_version: self.fallback_python_version.clone(),
+            python: self.fallback_python.clone(),
+            ..EnvironmentOptions::default()
+        }));
+
+        combined
+    }
 }

 trait OrDefault {
--- a/crates/ty_project/src/metadata/settings.rs
+++ b/crates/ty_project/src/metadata/settings.rs
@@ -1,9 +1,9 @@
 use std::sync::Arc;

-use ruff_db::{diagnostic::DiagnosticFormat, files::File};
+use ruff_db::files::File;
 use ty_python_semantic::lint::RuleSelection;

-use crate::metadata::options::InnerOverrideOptions;
+use crate::metadata::options::{InnerOverrideOptions, OutputFormat};
 use crate::{Db, combine::Combine, glob::IncludeExcludeFilter};

 /// The resolved [`super::Options`] for the project.
@@ -57,7 +57,7 @@ impl Settings {

 #[derive(Debug, Clone, PartialEq, Eq, Default)]
 pub struct TerminalSettings {
-    pub output_format: DiagnosticFormat,
+    pub output_format: OutputFormat,
    pub error_on_warning: bool,
 }

--- a/crates/ty_project/src/metadata/value.rs
+++ b/crates/ty_project/src/metadata/value.rs
@@ -27,6 +27,9 @@ pub enum ValueSource {
    /// The value comes from a CLI argument, while it's left open if specified using a short argument,
    /// long argument (`--extra-paths`) or `--config key=value`.
    Cli,
+
+    /// The value comes from an LSP client configuration.
+    PythonVSCodeExtension,
 }

 impl ValueSource {
@@ -34,6 +37,7 @@ impl ValueSource {
        match self {
            ValueSource::File(path) => Some(&**path),
            ValueSource::Cli => None,
+            ValueSource::PythonVSCodeExtension => None,
        }
    }

@@ -105,6 +109,14 @@ impl<T> RangedValue<T> {
        Self::with_range(value, ValueSource::Cli, TextRange::default())
    }

+    pub fn python_extension(value: T) -> Self {
+        Self::with_range(
+            value,
+            ValueSource::PythonVSCodeExtension,
+            TextRange::default(),
+        )
+    }
+
    pub fn with_range(value: T, source: ValueSource, range: TextRange) -> Self {
        Self {
            value,
@@ -327,6 +339,10 @@ impl RelativePathBuf {
        Self::new(path, ValueSource::Cli)
    }

+    pub fn python_extension(path: impl AsRef<SystemPath>) -> Self {
+        Self::new(path, ValueSource::PythonVSCodeExtension)
+    }
+
    /// Returns the relative path as specified by the user.
    pub fn path(&self) -> &SystemPath {
        &self.0
@@ -354,7 +370,7 @@ impl RelativePathBuf {
    pub fn absolute(&self, project_root: &SystemPath, system: &dyn System) -> SystemPathBuf {
        let relative_to = match &self.0.source {
            ValueSource::File(_) => project_root,
-            ValueSource::Cli => system.current_directory(),
+            ValueSource::Cli | ValueSource::PythonVSCodeExtension => system.current_directory(),
        };

        SystemPath::absolute(&self.0, relative_to)
@@ -409,7 +425,7 @@ impl RelativeGlobPattern {
    ) -> Result<AbsolutePortableGlobPattern, PortableGlobError> {
        let relative_to = match &self.0.source {
            ValueSource::File(_) => project_root,
-            ValueSource::Cli => system.current_directory(),
+            ValueSource::Cli | ValueSource::PythonVSCodeExtension => system.current_directory(),
        };

        let pattern = PortableGlobPattern::parse(&self.0, kind)?;
--- a/crates/ty_python_semantic/resources/mdtest/enums.md
+++ b/crates/ty_python_semantic/resources/mdtest/enums.md
@@ -0,0 +1,439 @@
+# Enums
+
+## Basic
+
+```py
+from enum import Enum
+
+class Color(Enum):
+    RED = 1
+    GREEN = 2
+    BLUE = 3
+
+reveal_type(Color.RED)  # revealed: @Todo(Attribute access on enum classes)
+reveal_type(Color.RED.value)  # revealed: @Todo(Attribute access on enum classes)
+
+# TODO: Should be `Color` or `Literal[Color.RED]`
+reveal_type(Color["RED"])  # revealed: Unknown
+
+# TODO: Could be `Literal[Color.RED]` to be more precise
+reveal_type(Color(1))  # revealed: Color
+
+reveal_type(Color.RED in Color)  # revealed: bool
+```
+
+## Enum members
+
+### Basic
+
+Simple enums with integer or string values:
+
+```py
+from enum import Enum
+from ty_extensions import enum_members
+
+class ColorInt(Enum):
+    RED = 1
+    GREEN = 2
+    BLUE = 3
+
+# revealed: tuple[Literal["RED"], Literal["GREEN"], Literal["BLUE"]]
+reveal_type(enum_members(ColorInt))
+
+class ColorStr(Enum):
+    RED = "red"
+    GREEN = "green"
+    BLUE = "blue"
+
+# revealed: tuple[Literal["RED"], Literal["GREEN"], Literal["BLUE"]]
+reveal_type(enum_members(ColorStr))
+```
+
+### When deriving from `IntEnum`
+
+```py
+from enum import IntEnum
+from ty_extensions import enum_members
+
+class ColorInt(IntEnum):
+    RED = 1
+    GREEN = 2
+    BLUE = 3
+
+# revealed: tuple[Literal["RED"], Literal["GREEN"], Literal["BLUE"]]
+reveal_type(enum_members(ColorInt))
+```
+
+### Declared non-member attributes
+
+Attributes on the enum class that are declared are not considered members of the enum:
+
+```py
+from enum import Enum
+from ty_extensions import enum_members
+
+class Answer(Enum):
+    YES = 1
+    NO = 2
+
+    non_member_1: int
+
+    # TODO: this could be considered an error:
+    non_member_1: str = "some value"
+
+# revealed: tuple[Literal["YES"], Literal["NO"]]
+reveal_type(enum_members(Answer))
+```
+
+### Non-member attributes with disallowed type
+
+Methods, callables, descriptors (including properties), and nested classes that are defined in the
+class are not treated as enum members:
+
+```py
+from enum import Enum
+from ty_extensions import enum_members
+from typing import Callable, Literal
+
+def identity(x) -> int:
+    return x
+
+class Descriptor:
+    def __get__(self, instance, owner):
+        return 0
+
+class Answer(Enum):
+    YES = 1
+    NO = 2
+
+    def some_method(self) -> None: ...
+    @staticmethod
+    def some_static_method() -> None: ...
+    @classmethod
+    def some_class_method(cls) -> None: ...
+
+    some_callable = lambda x: 0
+    declared_callable: Callable[[int], int] = identity
+    function_reference = identity
+
+    some_descriptor = Descriptor()
+
+    @property
+    def some_property(self) -> str:
+        return ""
+
+    class NestedClass: ...
+
+# revealed: tuple[Literal["YES"], Literal["NO"]]
+reveal_type(enum_members(Answer))
+```
+
+### `enum.property`
+
+Enum attributes that are defined using `enum.property` are not considered members:
+
+```toml
+[environment]
+python-version = "3.11"
+```
+
+```py
+from enum import Enum, property as enum_property
+from ty_extensions import enum_members
+
+class Answer(Enum):
+    YES = 1
+    NO = 2
+
+    @enum_property
+    def some_property(self) -> str:
+        return "property value"
+
+# revealed: tuple[Literal["YES"], Literal["NO"]]
+reveal_type(enum_members(Answer))
+```
+
+### `types.DynamicClassAttribute`
+
+Attributes defined using `types.DynamicClassAttribute` are not considered members:
+
+```py
+from enum import Enum
+from ty_extensions import enum_members
+from types import DynamicClassAttribute
+
+class Answer(Enum):
+    YES = 1
+    NO = 2
+
+    @DynamicClassAttribute
+    def dynamic_property(self) -> str:
+        return "dynamic value"
+
+# revealed: tuple[Literal["YES"], Literal["NO"]]
+reveal_type(enum_members(Answer))
+```
+
+### In stubs
+
+Stubs can optionally use `...` for the actual value:
+
+```pyi
+from enum import Enum
+from ty_extensions import enum_members
+from typing import cast
+
+class Color(Enum):
+    RED = ...
+    GREEN = cast(int, ...)
+    BLUE = 3
+
+# revealed: tuple[Literal["RED"], Literal["GREEN"], Literal["BLUE"]]
+reveal_type(enum_members(Color))
+```
+
+### Aliases
+
+Enum members can have aliases, which are not considered separate members:
+
+```py
+from enum import Enum
+from ty_extensions import enum_members
+
+class Answer(Enum):
+    YES = 1
+    NO = 2
+
+    DEFINITELY = YES
+
+# revealed: tuple[Literal["YES"], Literal["NO"]]
+reveal_type(enum_members(Answer))
+```
+
+### Using `auto()`
+
+```py
+from enum import Enum, auto
+from ty_extensions import enum_members
+
+class Answer(Enum):
+    YES = auto()
+    NO = auto()
+
+# revealed: tuple[Literal["YES"], Literal["NO"]]
+reveal_type(enum_members(Answer))
+```
+
+Combining aliases with `auto()`:
+
+```py
+from enum import Enum, auto
+
+class Answer(Enum):
+    YES = auto()
+    NO = auto()
+
+    DEFINITELY = YES
+
+# TODO: This should ideally be `tuple[Literal["YES"], Literal["NO"]]`
+# revealed: tuple[Literal["YES"], Literal["NO"], Literal["DEFINITELY"]]
+reveal_type(enum_members(Answer))
+```
+
+### `member` and `nonmember`
+
+```toml
+[environment]
+python-version = "3.11"
+```
+
+```py
+from enum import Enum, auto, member, nonmember
+from ty_extensions import enum_members
+
+class Answer(Enum):
+    YES = member(1)
+    NO = member(2)
+    OTHER = nonmember(17)
+
+# revealed: tuple[Literal["YES"], Literal["NO"]]
+reveal_type(enum_members(Answer))
+```
+
+`member` can also be used as a decorator:
+
+```py
+from enum import Enum, member
+from ty_extensions import enum_members
+
+class Answer(Enum):
+    yes = member(1)
+    no = member(2)
+
+    @member
+    def maybe(self) -> None:
+        return
+
+# revealed: tuple[Literal["yes"], Literal["no"], Literal["maybe"]]
+reveal_type(enum_members(Answer))
+```
+
+### Class-private names
+
+An attribute with a [class-private name] (beginning with, but not ending in, a double underscore) is
+treated as a non-member:
+
+```py
+from enum import Enum
+from ty_extensions import enum_members
+
+class Answer(Enum):
+    YES = 1
+    NO = 2
+
+    __private_member = 3
+    __maybe__ = 4
+
+# revealed: tuple[Literal["YES"], Literal["NO"], Literal["__maybe__"]]
+reveal_type(enum_members(Answer))
+```
+
+### Ignored names
+
+An enum class can define a class symbol named `_ignore_`. This can be a string containing a
+whitespace-delimited list of names:
+
+```py
+from enum import Enum
+from ty_extensions import enum_members
+
+class Answer(Enum):
+    _ignore_ = "IGNORED _other_ignored       also_ignored"
+
+    YES = 1
+    NO = 2
+
+    IGNORED = 3
+    _other_ignored = "test"
+    also_ignored = "test2"
+
+# revealed: tuple[Literal["YES"], Literal["NO"]]
+reveal_type(enum_members(Answer))
+```
+
+`_ignore_` can also be a list of names:
+
+```py
+class Answer2(Enum):
+    _ignore_ = ["MAYBE", "_other"]
+
+    YES = 1
+    NO = 2
+
+    MAYBE = 3
+    _other = "test"
+
+# TODO: This should be `tuple[Literal["YES"], Literal["NO"]]`
+# revealed: tuple[Literal["YES"], Literal["NO"], Literal["MAYBE"], Literal["_other"]]
+reveal_type(enum_members(Answer2))
+```
+
+### Special names
+
+Make sure that special names like `name` and `value` can be used for enum members (without
+conflicting with `Enum.name` and `Enum.value`):
+
+```py
+from enum import Enum
+from ty_extensions import enum_members
+
+class Answer(Enum):
+    name = 1
+    value = 2
+
+# revealed: tuple[Literal["name"], Literal["value"]]
+reveal_type(enum_members(Answer))
+
+# TODO: These should be `Answer` or `Literal[Answer.name]`/``Literal[Answer.value]`
+reveal_type(Answer.name)  # revealed: @Todo(Attribute access on enum classes)
+reveal_type(Answer.value)  # revealed: @Todo(Attribute access on enum classes)
+```
+
+## Iterating over enum members
+
+```py
+from enum import Enum
+
+class Color(Enum):
+    RED = 1
+    GREEN = 2
+    BLUE = 3
+
+for color in Color:
+    # TODO: Should be `Color`
+    reveal_type(color)  # revealed: Unknown
+
+# TODO: Should be `list[Color]`
+reveal_type(list(Color))  # revealed: list[Unknown]
+```
+
+## Properties of enum types
+
+### Implicitly final
+
+An enum with one or more defined members cannot be subclassed. They are implicitly "final".
+
+```py
+from enum import Enum
+
+class Color(Enum):
+    RED = 1
+    GREEN = 2
+    BLUE = 3
+
+# TODO: This should emit an error
+class ExtendedColor(Color):
+    YELLOW = 4
+
+def f(color: Color):
+    if isinstance(color, int):
+        # TODO: This should be `Never`
+        reveal_type(color)  # revealed: Color & int
+```
+
+An `Enum` subclass without any defined members can be subclassed:
+
+```py
+from enum import Enum
+from ty_extensions import enum_members
+
+class MyEnum(Enum):
+    def some_method(self) -> None:
+        pass
+
+class Answer(MyEnum):
+    YES = 1
+    NO = 2
+
+# revealed: tuple[Literal["YES"], Literal["NO"]]
+reveal_type(enum_members(Answer))
+```
+
+## Custom enum types
+
+To do: <https://typing.python.org/en/latest/spec/enums.html#enum-definition>
+
+## Function syntax
+
+To do: <https://typing.python.org/en/latest/spec/enums.html#enum-definition>
+
+## Exhaustiveness checking
+
+To do
+
+## References
+
+- Typing spec: <https://typing.python.org/en/latest/spec/enums.html>
+- Documentation: <https://docs.python.org/3/library/enum.html>
+
+[class-private name]: https://docs.python.org/3/reference/lexical_analysis.html#reserved-classes-of-identifiers
--- a/crates/ty_python_semantic/resources/mdtest/import/star.md
+++ b/crates/ty_python_semantic/resources/mdtest/import/star.md
@@ -1304,7 +1304,7 @@ scope of the name that was declared `global`, can add a symbol to the global nam
 def f():
    global g, h

-    g: bool = True
+    g = True

 f()
 ```
--- a/crates/ty_python_semantic/resources/mdtest/scopes/global.md
+++ b/crates/ty_python_semantic/resources/mdtest/scopes/global.md
@@ -83,7 +83,7 @@ def f():
    x = 1
    def g() -> None:
        nonlocal x
-        global x  # TODO: error: [invalid-syntax] "name 'x' is nonlocal and global"
+        global x  # error: [invalid-syntax] "name `x` is nonlocal and global"
        x = None
 ```

@@ -209,5 +209,18 @@ x: int = 1

 def f():
    global x
-    x: str = "foo"  # TODO: error: [invalid-syntax] "annotated name 'x' can't be global"
+    x: str = "foo"  # error: [invalid-syntax] "annotated name `x` can't be global"
+```
+
+## Global declarations affect the inferred type of the binding
+
+Even if the `global` declaration isn't used in an assignment, we conservatively assume it could be:
+
+```py
+x = 1
+
+def f():
+    global x
+
+# TODO: reveal_type(x)  # revealed: Unknown | Literal["1"]
 ```
--- a/crates/ty_python_semantic/resources/mdtest/scopes/nonlocal.md
+++ b/crates/ty_python_semantic/resources/mdtest/scopes/nonlocal.md
@@ -43,3 +43,321 @@ def f():
        def h():
            reveal_type(x)  # revealed: Unknown | Literal[1]
 ```
+
+## The `nonlocal` keyword
+
+Without the `nonlocal` keyword, bindings in an inner scope shadow variables of the same name in
+enclosing scopes. This example isn't a type error, because the inner `x` shadows the outer one:
+
+```py
+def f():
+    x: int = 1
+    def g():
+        x = "hello"  # allowed
+```
+
+With `nonlocal` it is a type error, because `x` refers to the same place in both scopes:
+
+```py
+def f():
+    x: int = 1
+    def g():
+        nonlocal x
+        x = "hello"  # error: [invalid-assignment] "Object of type `Literal["hello"]` is not assignable to `int`"
+```
+
+## Local variable bindings "look ahead" to any assignment in the current scope
+
+The binding `x = 2` in `g` causes the earlier read of `x` to refer to `g`'s not-yet-initialized
+binding, rather than to `x = 1` in `f`'s scope:
+
+```py
+def f():
+    x = 1
+    def g():
+        if x == 1:  # error: [unresolved-reference] "Name `x` used when not defined"
+            x = 2
+```
+
+The `nonlocal` keyword makes this example legal (and makes the assignment `x = 2` affect the outer
+scope):
+
+```py
+def f():
+    x = 1
+    def g():
+        nonlocal x
+        if x == 1:
+            x = 2
+```
+
+For the same reason, using the `+=` operator in an inner scope is an error without `nonlocal`
+(unless you shadow the outer variable first):
+
+```py
+def f():
+    x = 1
+    def g():
+        x += 1  # error: [unresolved-reference] "Name `x` used when not defined"
+
+def f():
+    x = 1
+    def g():
+        x = 1
+        x += 1  # allowed, but doesn't affect the outer scope
+
+def f():
+    x = 1
+    def g():
+        nonlocal x
+        x += 1  # allowed, and affects the outer scope
+```
+
+## `nonlocal` declarations must match an outer binding
+
+`nonlocal x` isn't allowed when there's no binding for `x` in an enclosing scope:
+
+```py
+def f():
+    def g():
+        nonlocal x  # error: [invalid-syntax] "no binding for nonlocal `x` found"
+
+def f():
+    x = 1
+    def g():
+        nonlocal x, y  # error: [invalid-syntax] "no binding for nonlocal `y` found"
+```
+
+A global `x` doesn't work. The target must be in a function-like scope:
+
+```py
+x = 1
+
+def f():
+    def g():
+        nonlocal x  # error: [invalid-syntax] "no binding for nonlocal `x` found"
+
+def f():
+    global x
+    def g():
+        nonlocal x  # error: [invalid-syntax] "no binding for nonlocal `x` found"
+```
+
+A class-scoped `x` also doesn't work:
+
+```py
+class Foo:
+    x = 1
+    @staticmethod
+    def f():
+        nonlocal x  # error: [invalid-syntax] "no binding for nonlocal `x` found"
+```
+
+However, class-scoped bindings don't break the `nonlocal` chain the way `global` declarations do:
+
+```py
+def f():
+    x: int = 1
+
+    class Foo:
+        x: str = "hello"
+
+        @staticmethod
+        def g():
+            # Skips the class scope and reaches the outer function scope.
+            nonlocal x
+            x = 2  # allowed
+            x = "goodbye"  # error: [invalid-assignment]
+```
+
+## `nonlocal` uses the closest binding
+
+```py
+def f():
+    x = 1
+    def g():
+        x = 2
+        def h():
+            nonlocal x
+            reveal_type(x)  # revealed: Unknown | Literal[2]
+```
+
+## `nonlocal` "chaining"
+
+Multiple `nonlocal` statements can "chain" through nested scopes:
+
+```py
+def f():
+    x = 1
+    def g():
+        nonlocal x
+        def h():
+            nonlocal x
+            reveal_type(x)  # revealed: Unknown | Literal[1]
+```
+
+And the `nonlocal` chain can skip over a scope that doesn't bind the variable:
+
+```py
+def f1():
+    x = 1
+    def f2():
+        nonlocal x
+        def f3():
+            # No binding; this scope gets skipped.
+            def f4():
+                nonlocal x
+                reveal_type(x)  # revealed: Unknown | Literal[1]
+```
+
+But a `global` statement breaks the chain:
+
+```py
+def f():
+    x = 1
+    def g():
+        global x
+        def h():
+            nonlocal x  # error: [invalid-syntax] "no binding for nonlocal `x` found"
+```
+
+## `nonlocal` bindings respect declared types from the defining scope, even without a binding
+
+```py
+def f():
+    x: int
+    def g():
+        nonlocal x
+        x = "string"  # error: [invalid-assignment] "Object of type `Literal["string"]` is not assignable to `int`"
+```
+
+## A complicated mixture of `nonlocal` chaining, empty scopes, class scopes, and the `global` keyword
+
+```py
+def f1():
+    # The original bindings of `x`, `y`, and `z` with type declarations.
+    x: int = 1
+    y: int = 2
+    z: int = 3
+
+    def f2():
+        # This scope doesn't touch `x`, `y`, or `z` at all.
+
+        class Foo:
+            # This class scope is totally ignored.
+            x: str = "a"
+            y: str = "b"
+            z: str = "c"
+
+            @staticmethod
+            def f3():
+                # This scope declares `x` nonlocal and `y` as global, and it shadows `z` without
+                # giving it a type declaration.
+                nonlocal x
+                x = 4
+                y = 5
+                global z
+                z = 6
+
+                def f4():
+                    # This scope sees `x` from `f1` and `y` from `f3`. It *can't* declare `z`
+                    # nonlocal, because of the global statement above, but it *can* load `z` as a
+                    # "free" variable, in which case it sees the global value.
+                    nonlocal x, y, z  # error: [invalid-syntax] "no binding for nonlocal `z` found"
+                    x = "string"  # error: [invalid-assignment]
+                    y = "string"  # allowed, because `f3`'s `y` is untyped
+                    reveal_type(z)  # revealed: Unknown | Literal[6]
+```
+
+## TODO: `nonlocal` affects the inferred type in the outer scope
+
+Without `nonlocal`, `g` can't write to `x`, and the inferred type of `x` in `f`'s scope isn't
+affected by `g`:
+
+```py
+def f():
+    x = 1
+    def g():
+        reveal_type(x)  # revealed: Unknown | Literal[1]
+    reveal_type(x)  # revealed: Literal[1]
+```
+
+But with `nonlocal`, `g` could write to `x`, and that affects its inferred type in `f`. That's true
+regardless of whether `g` actually writes to `x`. With a write:
+
+```py
+def f():
+    x = 1
+    def g():
+        nonlocal x
+        reveal_type(x)  # revealed: Unknown | Literal[1]
+        x += 1
+        reveal_type(x)  # revealed: Unknown | Literal[2]
+    # TODO: should be `Unknown | Literal[1]`
+    reveal_type(x)  # revealed: Literal[1]
+```
+
+Without a write:
+
+```py
+def f():
+    x = 1
+    def g():
+        nonlocal x
+        reveal_type(x)  # revealed: Unknown | Literal[1]
+    # TODO: should be `Unknown | Literal[1]`
+    reveal_type(x)  # revealed: Literal[1]
+```
+
+## Annotating a `nonlocal` binding is a syntax error
+
+```py
+def f():
+    x: int = 1
+    def g():
+        nonlocal x
+        x: str = "foo"  # error: [invalid-syntax] "annotated name `x` can't be nonlocal"
+```
+
+## Use before `nonlocal`
+
+Using a name prior to its `nonlocal` declaration in the same scope is a syntax error:
+
+```py
+def f():
+    x = 1
+    def g():
+        x = 2
+        nonlocal x  # error: [invalid-syntax] "name `x` is used prior to nonlocal declaration"
+```
+
+This is true even if there are multiple `nonlocal` declarations of the same variable, as long as any
+of them come after the usage:
+
+```py
+def f():
+    x = 1
+    def g():
+        nonlocal x
+        x = 2
+        nonlocal x  # error: [invalid-syntax] "name `x` is used prior to nonlocal declaration"
+
+def f():
+    x = 1
+    def g():
+        nonlocal x
+        nonlocal x
+        x = 2  # allowed
+```
+
+## `nonlocal` before outer initialization
+
+`nonlocal x` works even if `x` isn't bound in the enclosing scope until afterwards:
+
+```py
+def f():
+    def g():
+        # This is allowed, because of the subsequent definition of `x`.
+        nonlocal x
+    x = 1
+```
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_argument_typ…_-_Invalid_argument_typ…_-_Test_calling_a_funct…_(3b18271a821a59b).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/invalid_argument_typ…_-_Invalid_argument_typ…_-_Test_calling_a_funct…_(3b18271a821a59b).snap
@@ -29,17 +29,17 @@ error[invalid-argument-type]: Argument to function `loads` is incorrect
  |            ^ Expected `str | bytes | bytearray`, found `Literal[5]`
  |
 info: Function defined here
-  --> stdlib/json/__init__.pyi:39:5
-   |
-37 |     **kwds: Any,
-38 | ) -> None: ...
-39 | def loads(
-   |     ^^^^^
-40 |     s: str | bytes | bytearray,
-   |     -------------------------- Parameter declared here
-41 |     *,
-42 |     cls: type[JSONDecoder] | None = None,
-   |
+   --> stdlib/json/__init__.pyi:221:5
+    |
+219 |     """
+220 |
+221 | def loads(
+    |     ^^^^^
+222 |     s: str | bytes | bytearray,
+    |     -------------------------- Parameter declared here
+223 |     *,
+224 |     cls: type[JSONDecoder] | None = None,
+    |
 info: rule `invalid-argument-type` is enabled by default

 ```
--- a/crates/ty_python_semantic/resources/mdtest/type_qualifiers/final.md
+++ b/crates/ty_python_semantic/resources/mdtest/type_qualifiers/final.md
@@ -147,8 +147,7 @@ def nonlocal_use():
    X: Final[int] = 1
    def inner():
        nonlocal X
-        # TODO: this should be an error
-        X = 2
+        X = 2  # error: [invalid-assignment] "Reassignment of `Final` symbol `X` is not allowed: Reassignment of `Final` symbol"
 ```

 `main.py`:
--- a/crates/ty_python_semantic/src/module_resolver/module.rs
+++ b/crates/ty_python_semantic/src/module_resolver/module.rs
@@ -3,9 +3,13 @@ use std::str::FromStr;
 use std::sync::Arc;

 use ruff_db::files::File;
+use ruff_python_ast::name::Name;
+use ruff_python_stdlib::identifiers::is_identifier;

 use super::path::SearchPath;
+use crate::Db;
 use crate::module_name::ModuleName;
+use crate::module_resolver::path::SystemOrVendoredPathRef;

 /// Representation of a Python module.
 #[derive(Clone, PartialEq, Eq, Hash, get_size2::GetSize)]
@@ -85,6 +89,100 @@ impl Module {
            ModuleInner::NamespacePackage { .. } => ModuleKind::Package,
        }
    }
+
+    /// Return a list of all submodules of this module.
+    ///
+    /// Returns an empty list if the module is not a package, if it is an empty package,
+    /// or if it is a namespace package (one without an `__init__.py` or `__init__.pyi` file).
+    ///
+    /// The names returned correspond to the "base" name of the module.
+    /// That is, `{self.name}.{basename}` should give the full module name.
+    pub fn all_submodules(&self, db: &dyn Db) -> Vec<Name> {
+        self.all_submodules_inner(db).unwrap_or_default()
+    }
+
+    fn all_submodules_inner(&self, db: &dyn Db) -> Option<Vec<Name>> {
+        fn is_submodule(
+            is_dir: bool,
+            is_file: bool,
+            basename: Option<&str>,
+            extension: Option<&str>,
+        ) -> bool {
+            is_dir
+                || (is_file
+                    && matches!(extension, Some("py" | "pyi"))
+                    && !matches!(basename, Some("__init__.py" | "__init__.pyi")))
+        }
+
+        // It would be complex and expensive to compute all submodules for
+        // namespace packages, since a namespace package doesn't correspond
+        // to a single file; it can span multiple directories across multiple
+        // search paths. For now, we only compute submodules for traditional
+        // packages that exist in a single directory on a single search path.
+        let ModuleInner::FileModule {
+            kind: ModuleKind::Package,
+            file,
+            ..
+        } = &*self.inner
+        else {
+            return None;
+        };
+
+        let path = SystemOrVendoredPathRef::try_from_file(db, *file)?;
+        debug_assert!(
+            matches!(path.file_name(), Some("__init__.py" | "__init__.pyi")),
+            "expected package file `{:?}` to be `__init__.py` or `__init__.pyi`",
+            path.file_name(),
+        );
+
+        Some(match path.parent()? {
+            SystemOrVendoredPathRef::System(parent_directory) => db
+                .system()
+                .read_directory(parent_directory)
+                .inspect_err(|err| {
+                    tracing::debug!(
+                        "Failed to read {parent_directory:?} when looking for \
+                         its possible submodules: {err}"
+                    );
+                })
+                .ok()?
+                .flatten()
+                .filter(|entry| {
+                    let ty = entry.file_type();
+                    let path = entry.path();
+                    is_submodule(
+                        ty.is_directory(),
+                        ty.is_file(),
+                        path.file_name(),
+                        path.extension(),
+                    )
+                })
+                .filter_map(|entry| {
+                    let stem = entry.path().file_stem()?;
+                    is_identifier(stem).then(|| Name::from(stem))
+                })
+                .collect(),
+            SystemOrVendoredPathRef::Vendored(parent_directory) => db
+                .vendored()
+                .read_directory(parent_directory)
+                .into_iter()
+                .filter(|entry| {
+                    let ty = entry.file_type();
+                    let path = entry.path();
+                    is_submodule(
+                        ty.is_directory(),
+                        ty.is_file(),
+                        path.file_name(),
+                        path.extension(),
+                    )
+                })
+                .filter_map(|entry| {
+                    let stem = entry.path().file_stem()?;
+                    is_identifier(stem).then(|| Name::from(stem))
+                })
+                .collect(),
+        })
+    }
 }

 impl std::fmt::Debug for Module {
--- a/crates/ty_python_semantic/src/module_resolver/path.rs
+++ b/crates/ty_python_semantic/src/module_resolver/path.rs
@@ -4,11 +4,12 @@ use std::fmt;
 use std::sync::Arc;

 use camino::{Utf8Path, Utf8PathBuf};
-use ruff_db::files::{File, FileError, system_path_to_file, vendored_path_to_file};
+use ruff_db::files::{File, FileError, FilePath, system_path_to_file, vendored_path_to_file};
 use ruff_db::system::{System, SystemPath, SystemPathBuf};
 use ruff_db::vendored::{VendoredPath, VendoredPathBuf};

 use super::typeshed::{TypeshedVersionsParseError, TypeshedVersionsQueryResult, typeshed_versions};
+use crate::Db;
 use crate::module_name::ModuleName;
 use crate::module_resolver::resolver::ResolverContext;
 use crate::site_packages::SitePackagesDiscoveryError;
@@ -652,6 +653,48 @@ impl fmt::Display for SearchPath {
    }
 }

+#[derive(Debug, Clone)]
+pub(super) enum SystemOrVendoredPathRef<'db> {
+    System(&'db SystemPath),
+    Vendored(&'db VendoredPath),
+}
+
+impl<'db> SystemOrVendoredPathRef<'db> {
+    pub(super) fn try_from_file(db: &'db dyn Db, file: File) -> Option<Self> {
+        match file.path(db) {
+            FilePath::System(system) => Some(Self::System(system)),
+            FilePath::Vendored(vendored) => Some(Self::Vendored(vendored)),
+            FilePath::SystemVirtual(_) => None,
+        }
+    }
+
+    pub(super) fn file_name(&self) -> Option<&str> {
+        match self {
+            Self::System(system) => system.file_name(),
+            Self::Vendored(vendored) => vendored.file_name(),
+        }
+    }
+
+    pub(super) fn parent<'a>(&'a self) -> Option<SystemOrVendoredPathRef<'a>>
+    where
+        'a: 'db,
+    {
+        match self {
+            Self::System(system) => system.parent().map(Self::System),
+            Self::Vendored(vendored) => vendored.parent().map(Self::Vendored),
+        }
+    }
+}
+
+impl std::fmt::Display for SystemOrVendoredPathRef<'_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            SystemOrVendoredPathRef::System(system) => system.fmt(f),
+            SystemOrVendoredPathRef::Vendored(vendored) => vendored.fmt(f),
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
    use ruff_db::Db;
--- a/crates/ty_python_semantic/src/module_resolver/resolver.rs
+++ b/crates/ty_python_semantic/src/module_resolver/resolver.rs
@@ -8,7 +8,7 @@ use rustc_hash::{FxBuildHasher, FxHashSet};

 use ruff_db::files::{File, FilePath, FileRootKind};
 use ruff_db::system::{DirectoryEntry, System, SystemPath, SystemPathBuf};
-use ruff_db::vendored::{VendoredFileSystem, VendoredPath};
+use ruff_db::vendored::VendoredFileSystem;
 use ruff_python_ast::PythonVersion;

 use crate::db::Db;
@@ -17,7 +17,7 @@ use crate::module_resolver::typeshed::{TypeshedVersions, vendored_typeshed_versi
 use crate::{Program, SearchPathSettings};

 use super::module::{Module, ModuleKind};
-use super::path::{ModulePath, SearchPath, SearchPathValidationError};
+use super::path::{ModulePath, SearchPath, SearchPathValidationError, SystemOrVendoredPathRef};

 /// Resolves a module name to a module.
 pub fn resolve_module(db: &dyn Db, module_name: &ModuleName) -> Option<Module> {
@@ -77,21 +77,6 @@ pub(crate) fn path_to_module(db: &dyn Db, path: &FilePath) -> Option<Module> {
    file_to_module(db, file)
 }

-#[derive(Debug, Clone, Copy)]
-enum SystemOrVendoredPathRef<'a> {
-    System(&'a SystemPath),
-    Vendored(&'a VendoredPath),
-}
-
-impl std::fmt::Display for SystemOrVendoredPathRef<'_> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            SystemOrVendoredPathRef::System(system) => system.fmt(f),
-            SystemOrVendoredPathRef::Vendored(vendored) => vendored.fmt(f),
-        }
-    }
-}
-
 /// Resolves the module for the file with the given id.
 ///
 /// Returns `None` if the file is not a module locatable via any of the known search paths.
@@ -99,11 +84,7 @@ impl std::fmt::Display for SystemOrVendoredPathRef<'_> {
 pub(crate) fn file_to_module(db: &dyn Db, file: File) -> Option<Module> {
    let _span = tracing::trace_span!("file_to_module", ?file).entered();

-    let path = match file.path(db) {
-        FilePath::System(system) => SystemOrVendoredPathRef::System(system),
-        FilePath::Vendored(vendored) => SystemOrVendoredPathRef::Vendored(vendored),
-        FilePath::SystemVirtual(_) => return None,
-    };
+    let path = SystemOrVendoredPathRef::try_from_file(db, file)?;

    let module_name = search_paths(db).find_map(|candidate| {
        let relative_path = match path {
--- a/Show More
+++ b/Show More