diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e68981c..684eb4a 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -21,5 +21,5 @@ jobs:
         run: uv run --group dev ruff format --check src/rattle scripts examples docs/conf.py
       - name: Run Ruff lint
         run: uv run --group dev ruff check src/rattle scripts examples docs/conf.py
-      - name: Run Rattle lint
-        run: uv run --group dev python -m rattle lint src/rattle
+      - name: Run Rattle check
+        run: uv run --group dev python -m rattle check src/rattle
diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml
index 9c880e8..be1ba06 100644
--- a/.pre-commit-hooks.yaml
+++ b/.pre-commit-hooks.yaml
@@ -1,12 +1,12 @@
 - id: rattle-lint
-  name: Rattle - lint
+  name: Rattle - check
   description: This hook shows Rattle lints and suggested changes without applying autofixes.
-  entry: rattle lint --diff
+  entry: rattle check --diff
   language: python
   types: [python]
 - id: rattle-fix
-  name: Rattle - lint and apply autofixes
+  name: Rattle - check and apply autofixes
   description: This hook shows Rattle lints and applies suggested changes.
-  entry: rattle fix
+  entry: rattle check --fix
   language: python
   types: [python]
diff --git a/Justfile b/Justfile
index 270c229..b9f8c27 100644
--- a/Justfile
+++ b/Justfile
@@ -27,7 +27,7 @@ venv: install
 lint: _require-uv
   uv run --group dev ruff check src/rattle scripts examples docs/conf.py
   uv run --group dev ruff format --check src/rattle scripts examples docs/conf.py
-  uv run --group dev python -m rattle lint src/rattle
+  uv run --group dev python -m rattle check src/rattle
 
 # Format code
 format: _require-uv
diff --git a/README.md b/README.md
index faa67dc..47e4c0d 100644
--- a/README.md
+++ b/README.md
@@ -97,13 +97,13 @@ forbidden_calls = ["typing.cast"]
 Adjust the list to match the project, then lint the repository:
 
 ```bash
-rattle lint .
+rattle check .
 ```
 
 Apply available autofixes:
 
 ```bash
-rattle fix .
+rattle check --fix .
 ```
 
 Explain rule metadata, examples, and settings:
diff --git a/docs/guide/commands.md b/docs/guide/commands.md
index cecc630..b33cf01 100644
--- a/docs/guide/commands.md
+++ b/docs/guide/commands.md
@@ -8,9 +8,9 @@ $ rattle COMMAND [OPTIONS] ...
 
 Use `--help` on any command to print its supported options.
 
-## Shared lint/fix options
+## Check options
 
-The following options are available on commands that check or fix code.
+The following options are available on `check`, with or without `--fix`.
 
 ### `--config / -c CONFIG`
 
@@ -23,7 +23,7 @@ Like Ruff's `--exclude`, direct path arguments are also excluded when they match
 the pattern.
 
 ```console
-$ rattle lint . --exclude "generated/**"
+$ rattle check . --exclude "generated/**"
 ```
 
 ### `--extend-exclude PATTERN`
@@ -33,7 +33,7 @@ arguments are still checked unless they are excluded by configuration with
 `force-exclude`.
 
 ```console
-$ rattle lint . --extend-exclude "docs/_build/**"
+$ rattle check . --extend-exclude "docs/_build/**"
 ```
 
 ### `--rules / -r RULES`
@@ -55,9 +55,9 @@ A selector that does not resolve to a rule is an error.
 For example:
 
 ```console
-$ rattle lint --rules "use-f-string" path/to/file.py
-$ rattle lint --rules "my-custom-rule" path/to/file.py
-$ rattle lint --rules "fixit,legacy" path/to/file.py
+$ rattle check --rules "use-f-string" path/to/file.py
+$ rattle check --rules "my-custom-rule" path/to/file.py
+$ rattle check --rules "fixit,legacy" path/to/file.py
 ```
 
 ### `--jobs / -j JOBS`
@@ -71,11 +71,11 @@ Print compact diagnostics.
 ### `--quiet / -q`
 
 Print only the final summary. `--quiet` cannot be used with `--diff`, `--stats`,
-or `fix --interactive`.
+or `--interactive`.
 
 ### `--diff / -d`
 
-Show fixes as unified diffs.
+Show available fixes as unified diffs, or applied changes with `--fix`.
 
 ### `--stats / -s`
 
@@ -89,25 +89,26 @@ Override the configured `output-format`: `rattle`, `vscode`, or `custom`.
 
 Override the configured `output-template` used by the `custom` output format.
 
-## `lint`
+## `check`
 
-Check files for Rattle violations. Use `- PATH` to check code from standard
-input as `PATH`.
+Check files for Rattle violations without modifying source files. With no paths,
+check the current directory. Use `- PATH` to check standard input as `PATH`.
 
 ```console
-$ rattle lint [OPTIONS] [PATH ...]
+$ rattle check [OPTIONS] [PATH ...]
 ```
 
 ### `--json`
 
 Print diagnostics as a JSON array on standard output. The summary still goes to
 standard error. Cannot be combined with `--quiet`, `--diff`, `--compact`,
-`--output-format`, or `--output-template`.
+`--output-format`, `--output-template`, or `--fix`.
 
-## `fix`
+### `--fix`
 
-Apply available autofixes to files. Use `- PATH` to fix code from standard
-input as `PATH` and write the fixed code to standard output.
+Apply available autofixes, then report remaining violations. Use `- PATH` to fix
+standard input as `PATH` and write fixed code to standard output; diagnostics
+and the summary go to standard error.
 
 By default, automatic fixing runs available autofixes until the file stops
 changing or no more autofixes are found. Diagnostics shown after fixing are
@@ -116,14 +117,14 @@ applied changes, or `--interactive` to review one initial pass of fixes before
 verification.
 
 ```console
-$ rattle fix [OPTIONS] [--interactive] [PATH ...]
+$ rattle check --fix [OPTIONS] [PATH ...]
 ```
 
 ### `--interactive / -i`
 
 Prompt before applying each autofix. Answer `y` to apply, `n` or Enter to skip,
 or `q` to stop prompting and leave the remaining fixes unapplied. This option
-requires a terminal on standard input and cannot be used with `- PATH`.
+requires `--fix` and a terminal on standard input, and cannot be used with `- PATH`.
 
 (lsp_command)=
 
@@ -222,4 +223,4 @@ Enable debug logging.
 
 ### `RATTLE_METRICS=1`
 
-Print internal run metrics for `lint` and `fix`.
+Print internal run metrics for `check`, with or without `--fix`.
diff --git a/docs/guide/quickstart.md b/docs/guide/quickstart.md
index 7d30979..aa2a007 100644
--- a/docs/guide/quickstart.md
+++ b/docs/guide/quickstart.md
@@ -29,13 +29,13 @@ Rattle also supports editor integrations, LSP, and pre-commit. See the
 See lints and suggested changes for a set of source files:
 
 ```console
-$ rattle lint <path>
+$ rattle check <path>
 ```
 
 Apply suggested changes on those same files automatically:
 
 ```console
-$ rattle fix <path>
+$ rattle check --fix <path>
 ```
 
 If given directories, Rattle will recurse them automatically, finding `.py`
@@ -59,7 +59,7 @@ handler: Callable[[...], int]
 With `modernization` enabled, running Rattle shows the rule violation:
 
 ```console
-$ rattle lint handlers.py
+$ rattle check handlers.py
 use-callable-ellipsis [*] Use Callable[..., T] instead of Callable[[...], T].
  --> handlers.py:4:10
   |
@@ -73,7 +73,7 @@ help: Apply the available autofix
 You can also see suggested changes by passing `--diff`:
 
 ```console
-$ rattle lint --diff handlers.py
+$ rattle check --diff handlers.py
 use-callable-ellipsis [*] Use Callable[..., T] instead of Callable[[...], T].
  --> handlers.py:4:10
   |
@@ -255,7 +255,7 @@ def main():
 ```
 
 ```console
-$ rattle lint --diff sourdough/baker.py
+$ rattle check --diff sourdough/baker.py
 hollywood-name-rule [*] It's underproved!
  --> sourdough/baker.py:2:12
   |
@@ -274,19 +274,19 @@ help: Apply the available autofix
      print(f"hello {name}")
 ```
 
-Note that the `lint` command only shows lint errors and suggested changes.
-The `fix` command applies those changes to the codebase:
+The `check` command only shows lint errors and suggested changes.
+Pass `--fix` to apply those changes to the codebase:
 
 ```console
-$ rattle fix sourdough/baker.py
+$ rattle check --fix sourdough/baker.py
 1 file checked, 1 fix applied
 ```
 
-Pass `--interactive` to confirm each available autofix one at a time.
+Pass `--fix --interactive` to confirm each available autofix one at a time.
 
 Now that the suggested changes have been applied, the codebase is clean:
 
 ```console
-$ rattle lint sourdough/baker.py
+$ rattle check sourdough/baker.py
 1 file clean
 ```
diff --git a/docs/index.md b/docs/index.md
index 6f99b1d..f90fc88 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -93,13 +93,13 @@ forbidden_calls = ["typing.cast"]
 Adjust the list to match the project, then lint the repository:
 
 ```bash
-rattle lint .
+rattle check .
 ```
 
 Apply available autofixes:
 
 ```bash
-rattle fix .
+rattle check --fix .
 ```
 
 Explain rule metadata, examples, and settings:
diff --git a/src/rattle/.agents/skills/create-rattle-lint-rules/SKILL.md b/src/rattle/.agents/skills/create-rattle-lint-rules/SKILL.md
index 6ba8e65..9469001 100644
--- a/src/rattle/.agents/skills/create-rattle-lint-rules/SKILL.md
+++ b/src/rattle/.agents/skills/create-rattle-lint-rules/SKILL.md
@@ -163,10 +163,10 @@ Use the repository's command runner and configuration context. At minimum run:
 ```bash
 rattle validate pyproject.toml
 rattle rules --test --config pyproject.toml .
-rattle lint --diff .
+rattle check --diff .
 ```
 
-Run focused project tests for affected code. Apply `rattle fix` across the
+Run focused project tests for affected code. Apply `rattle check --fix` across the
 repository only when the user requests it.
 
 If the rule is noisy, add valid cases before changing the implementation. Test
diff --git a/src/rattle/cli/app.py b/src/rattle/cli/app.py
index 357626b..cdb973a 100644
--- a/src/rattle/cli/app.py
+++ b/src/rattle/cli/app.py
@@ -8,9 +8,8 @@
 from interfacy.naming import NoAbbreviations
 from interfacy.plugins import ExecuteContext, InterfacyPlugin
 
+from rattle.cli.commands.check import check
 from rattle.cli.commands.explain import explain_command
-from rattle.cli.commands.fix import fix
-from rattle.cli.commands.lint import lint
 from rattle.cli.commands.lsp import lsp
 from rattle.cli.commands.rules import rules_command
 from rattle.cli.commands.validate import validate_command
@@ -23,9 +22,10 @@
 from rattle.config import CollectionError, ConfigError
 
 CONFIG_PARAM = Param(short="c", metavar="<path>")
-LINT_PARAMS = {
+CHECK_PARAMS = {
     "config": CONFIG_PARAM,
     "diff": Param(short="d"),
+    "interactive": Param(short="i"),
     "exclude": Param(short="e", metavar="<pattern>"),
     "extend_exclude": Param(metavar="<pattern>"),
     "jobs": Param(short="j", metavar="<n>"),
@@ -35,10 +35,6 @@
     "output_format": Param(metavar="<rattle|vscode|custom>"),
     "output_template": Param(metavar="<template>"),
 }
-FIX_PARAMS = {
-    **LINT_PARAMS,
-    "interactive": Param(short="i"),
-}
 SIGPIPE_EXIT_CODE = 141
 DOCS_URL = "https://rattle.readthedocs.io/en/latest"
 
@@ -74,8 +70,7 @@ def build_app() -> Interfacy:
         ],
         plugins=[CommandErrorPlugin()],
     )
-    app.add_command(lint, params=LINT_PARAMS)
-    app.add_command(fix, params=FIX_PARAMS)
+    app.add_command(check, params=CHECK_PARAMS)
     app.add_command(
         lsp,
         params={
diff --git a/src/rattle/cli/commands/check.py b/src/rattle/cli/commands/check.py
new file mode 100644
index 0000000..20616e4
--- /dev/null
+++ b/src/rattle/cli/commands/check.py
@@ -0,0 +1,167 @@
+from __future__ import annotations
+
+import sys
+from pathlib import Path
+
+from rattle.api import rattle_paths
+from rattle.cli.fixing import FixRun
+from rattle.cli.options import (
+    STDIN,
+    _resolve_input_paths,
+    build_options,
+    require_known_rules,
+    usage_error,
+)
+from rattle.cli.reporting import FixReport, LintReport, _metrics_hook
+from rattle.rendering.console import AsyncConsole
+from rattle.rendering.models import OutputFormat
+
+
+def _validate_check_options(
+    *,
+    fix: bool,
+    interactive: bool,
+    quiet: bool,
+    diff: bool,
+    stats: bool,
+    compact: bool,
+    json: bool,
+    output_format: OutputFormat | None,
+    output_template: str | None,
+) -> None:
+    if interactive and not fix:
+        usage_error("--interactive requires --fix")
+    if quiet and diff:
+        usage_error("--quiet and --diff cannot be used together")
+    if quiet and stats:
+        usage_error("--quiet and --stats cannot be used together")
+    if quiet and interactive:
+        usage_error("--quiet and --interactive cannot be used together")
+    for enabled, option in (
+        (fix, "--fix"),
+        (quiet, "--quiet"),
+        (diff, "--diff"),
+        (compact, "--compact"),
+        (output_format, "--output-format"),
+        (output_template, "--output-template"),
+    ):
+        if json and enabled:
+            usage_error(f"--json and {option} cannot be used together")
+
+
+def check(
+    *paths: Path,
+    fix: bool = False,
+    rules: str | None = None,
+    jobs: int | None = None,
+    config: Path | None = None,
+    exclude: list[str] | None = None,
+    extend_exclude: list[str] | None = None,
+    output_format: OutputFormat | None = None,
+    output_template: str | None = None,
+    diff: bool = False,
+    interactive: bool = False,
+    compact: bool = False,
+    stats: bool = False,
+    quiet: bool = False,
+    json: bool = False,
+) -> None:
+    """
+    Check files for Rattle violations and optionally apply autofixes.
+
+    Args:
+        paths: Files or directories to check. Use "- PATH" to check code from stdin as PATH; with --fix, write fixed code to stdout.
+        fix: Apply available autofixes, then report remaining violations.
+        quiet: Print only the final summary.
+        config: Use this config file instead of discovered configuration.
+        exclude: Replace configured exclude patterns.
+        extend_exclude: Add exclude patterns.
+        jobs: Number of worker processes to use when checking multiple files, at least 1.
+        rules: Override configured rules with comma-separated selectors.
+        output_format: Override the configured output format.
+        output_template: Override the configured template for the custom output format.
+        interactive: Prompt before applying each autofix. Requires --fix and a terminal on stdin.
+        compact: Print compact diagnostics.
+        diff: Show available fixes as unified diffs, or applied changes with --fix.
+        stats: Print violation counts by rule.
+        json: Print diagnostics as JSON. Cannot be combined with --fix.
+
+    pass "- PATH" to read stdin and treat it as PATH
+    """
+    _validate_check_options(
+        fix=fix,
+        interactive=interactive,
+        quiet=quiet,
+        diff=diff,
+        stats=stats,
+        compact=compact,
+        json=json,
+        output_format=output_format,
+        output_template=output_template,
+    )
+    paths = _resolve_input_paths(paths)
+    is_stdin = paths[0] == STDIN
+    if is_stdin and interactive:
+        usage_error("--interactive cannot be used with stdin")
+    if interactive and not sys.stdin.isatty():
+        usage_error(
+            "--interactive requires a terminal on stdin; "
+            "run without --interactive to apply all fixes"
+        )
+
+    runtime_options = build_options(
+        config=config,
+        exclude=exclude,
+        extend_exclude=extend_exclude,
+        jobs=jobs,
+        rules=rules,
+        output_format=output_format,
+        output_template=output_template,
+    )
+    require_known_rules(paths, runtime_options)
+    console = AsyncConsole()
+    report: FixReport | LintReport
+    try:
+        if fix:
+            report = FixReport(
+                console=console,
+                options=runtime_options,
+                is_stdin=is_stdin,
+                quiet=quiet,
+                compact=compact,
+                stats=stats,
+            )
+            run = FixRun(paths, report, diff=diff)
+            if is_stdin:
+                run.run_stdin()
+            elif interactive:
+                run.run_interactive()
+            else:
+                run.run_automatic()
+        else:
+            report = LintReport(
+                console=console,
+                options=runtime_options,
+                diff=diff,
+                compact=compact,
+                quiet=quiet,
+                stats=stats,
+                json=json,
+            )
+            for result in rattle_paths(
+                paths,
+                include_diff=diff,
+                allow_cached_dirty_results=True,
+                options=runtime_options,
+                metrics_hook=_metrics_hook(console, enabled=runtime_options.print_metrics),
+            ):
+                report.record(result)
+
+        report.submit()
+    finally:
+        console.close()
+    if report.state.exit_code:
+        raise SystemExit(report.state.exit_code)
+
+
+__all__ = ["check"]
diff --git a/src/rattle/cli/commands/lint.py b/src/rattle/cli/commands/lint.py
deleted file mode 100644
index e940c05..0000000
--- a/src/rattle/cli/commands/lint.py
+++ /dev/null
@@ -1,105 +0,0 @@
-from __future__ import annotations
-
-from pathlib import Path
-
-from rattle.api import rattle_paths
-from rattle.cli.options import (
-    _resolve_input_paths,
-    build_options,
-    require_known_rules,
-    usage_error,
-)
-from rattle.cli.reporting import LintReport, _metrics_hook
-from rattle.rendering.console import AsyncConsole
-from rattle.rendering.models import OutputFormat
-
-
-def lint(
-    *paths: Path,
-    rules: str | None = None,
-    jobs: int | None = None,
-    config: Path | None = None,
-    exclude: list[str] | None = None,
-    extend_exclude: list[str] | None = None,
-    output_format: OutputFormat | None = None,
-    output_template: str | None = None,
-    diff: bool = False,
-    compact: bool = False,
-    stats: bool = False,
-    quiet: bool = False,
-    json: bool = False,
-) -> None:
-    """
-    Check files for Rattle violations.
-
-    Args:
-        paths: Files or directories to check. Use "- PATH" to check code from stdin as PATH.
-        quiet: Print only the final summary.
-        config: Use this config file instead of discovered configuration.
-        exclude: Replace configured exclude patterns.
-        extend_exclude: Add exclude patterns.
-        jobs: Number of worker processes to use when linting multiple files, at least 1.
-        rules: Override configured rules with comma-separated selectors.
-        output_format: Override the configured output format.
-        output_template: Override the configured template for the custom output format.
-        compact: Print compact diagnostics.
-        diff: Show available fixes as unified diffs.
-        stats: Print violation counts by rule.
-        json: Print diagnostics as JSON.
-
-    pass "- PATH" to read stdin and treat it as PATH
-    """
-    if quiet and diff:
-        usage_error("--quiet and --diff cannot be used together")
-    if quiet and stats:
-        usage_error("--quiet and --stats cannot be used together")
-    for enabled, option in (
-        (quiet, "--quiet"),
-        (diff, "--diff"),
-        (compact, "--compact"),
-        (output_format, "--output-format"),
-        (output_template, "--output-template"),
-    ):
-        if json and enabled:
-            usage_error(f"--json and {option} cannot be used together")
-
-    paths = _resolve_input_paths(paths)
-
-    runtime_options = build_options(
-        config=config,
-        exclude=exclude,
-        extend_exclude=extend_exclude,
-        jobs=jobs,
-        rules=rules,
-        output_format=output_format,
-        output_template=output_template,
-    )
-    require_known_rules(paths, runtime_options)
-    console = AsyncConsole()
-    report = LintReport(
-        console=console,
-        options=runtime_options,
-        diff=diff,
-        compact=compact,
-        quiet=quiet,
-        stats=stats,
-        json=json,
-    )
-    try:
-        for result in rattle_paths(
-            paths,
-            include_diff=diff,
-            allow_cached_dirty_results=True,
-            options=runtime_options,
-            metrics_hook=_metrics_hook(console, enabled=runtime_options.print_metrics),
-        ):
-            report.record(result)
-
-        report.submit()
-    finally:
-        console.close()
-    if report.state.exit_code:
-        raise SystemExit(report.state.exit_code)
-
-
-__all__ = ["lint"]
diff --git a/src/rattle/cli/environment.py b/src/rattle/cli/environment.py
index 3d5ead4..1d534f2 100644
--- a/src/rattle/cli/environment.py
+++ b/src/rattle/cli/environment.py
@@ -13,7 +13,7 @@
 DEBUG_ENV = "RATTLE_DEBUG"
 METRICS_ENV = "RATTLE_METRICS"
 UV_PROJECT_MARKERS = ("uv.lock",)
-UV_REEXEC_COMMANDS = frozenset({"lint", "fix", "rules", "validate", "lsp", "explain"})
+UV_REEXEC_COMMANDS = frozenset({"check", "rules", "validate", "lsp", "explain"})
 TRUTHY_ENV_VALUES = frozenset({"1", "true", "yes", "on"})
 
 
diff --git a/src/rattle/cli/commands/fix.py b/src/rattle/cli/fixing.py
similarity index 65%
rename from src/rattle/cli/commands/fix.py
rename to src/rattle/cli/fixing.py
index 6724807..ce7b56c 100644
--- a/src/rattle/cli/commands/fix.py
+++ b/src/rattle/cli/fixing.py
@@ -4,52 +4,18 @@
 from pathlib import Path
 
 from rattle.api import rattle_bytes, rattle_paths
-from rattle.cli.options import (
-    _resolve_input_paths,
-    build_options,
-    require_known_rules,
-    usage_error,
-)
 from rattle.cli.reporting import FixReport, _metrics_hook
 from rattle.config import (
     generate_config,
 )
 from rattle.config.models import Config
 from rattle.diagnostics import FileContent, Result
-from rattle.rendering.console import AsyncConsole, echo
-from rattle.rendering.models import OutputFormat
+from rattle.rendering.console import echo
 from rattle.util import capture
 
 MAX_AUTOFIX_PASSES = 10
 
 
-def _validate_fix_options(
-    paths: tuple[Path, ...],
-    *,
-    quiet: bool,
-    diff: bool,
-    stats: bool,
-    interactive: bool,
-) -> bool:
-    if quiet and diff:
-        usage_error("--quiet and --diff cannot be used together")
-    if quiet and stats:
-        usage_error("--quiet and --stats cannot be used together")
-    if quiet and interactive:
-        usage_error("--quiet and --interactive cannot be used together")
-
-    is_stdin = bool(paths[0] and str(paths[0]) == "-")
-    if is_stdin and interactive:
-        usage_error("--interactive cannot be used with stdin")
-    if interactive and not sys.stdin.isatty():
-        usage_error(
-            "--interactive requires a terminal on stdin; "
-            "run without --interactive to apply all fixes"
-        )
-
-    return is_stdin
-
-
 def _prompt_for_fix() -> tuple[bool, bool]:
     while True:
         echo("Apply autofix? [y/N/q] ", nl=False, err=True)
@@ -254,84 +220,4 @@ def _submit_applied_fixes(
             self.report.submit_applied_fix(result, show_diff=True)
 
 
-def fix(
-    *paths: Path,
-    rules: str | None = None,
-    quiet: bool = False,
-    jobs: int | None = None,
-    config: Path | None = None,
-    exclude: list[str] | None = None,
-    extend_exclude: list[str] | None = None,
-    output_format: OutputFormat | None = None,
-    output_template: str | None = None,
-    diff: bool = False,
-    interactive: bool = False,
-    compact: bool = False,
-    stats: bool = False,
-) -> None:
-    """
-    Apply available autofixes to files.
-
-    Args:
-        paths: Files or directories to fix. Use "- PATH" to fix code from stdin as PATH and write to stdout.
-        quiet: Print only the final summary.
-        config: Use this config file instead of discovered configuration.
-        exclude: Replace configured exclude patterns.
-        extend_exclude: Add exclude patterns.
-        jobs: Number of worker processes to use when linting multiple files, at least 1.
-        rules: Override configured rules with comma-separated selectors.
-        output_format: Override the configured output format.
-        output_template: Override the configured template for the custom output format.
-        interactive: Prompt before applying each autofix.
-        compact: Print compact diagnostics.
-        diff: Show applied fixes as unified diffs.
-        stats: Print violation counts by rule.
-
-    pass "- PATH" to read stdin, treat it as PATH, and write fixed code to stdout
-    """
-    paths = _resolve_input_paths(paths)
-    is_stdin = _validate_fix_options(
-        paths,
-        quiet=quiet,
-        diff=diff,
-        stats=stats,
-        interactive=interactive,
-    )
-
-    runtime_options = build_options(
-        config=config,
-        exclude=exclude,
-        extend_exclude=extend_exclude,
-        jobs=jobs,
-        rules=rules,
-        output_format=output_format,
-        output_template=output_template,
-    )
-    require_known_rules(paths, runtime_options)
-
-    console = AsyncConsole()
-    report = FixReport(
-        console=console,
-        options=runtime_options,
-        is_stdin=is_stdin,
-        quiet=quiet,
-        compact=compact,
-        stats=stats,
-    )
-    run = FixRun(paths, report, diff=diff)
-    try:
-        if is_stdin:
-            run.run_stdin()
-        elif interactive:
-            run.run_interactive()
-        else:
-            run.run_automatic()
-
-        report.submit()
-    finally:
-        console.close()
-    if report.state.exit_code:
-        raise SystemExit(report.state.exit_code)
-
-
-__all__ = ["fix"]
+__all__ = ["FixRun"]
diff --git a/src/rattle/cli/options.py b/src/rattle/cli/options.py
index d1893f8..4b698e1 100644
--- a/src/rattle/cli/options.py
+++ b/src/rattle/cli/options.py
@@ -41,7 +41,7 @@ def _resolve_input_paths(paths: tuple[Path, ...]) -> tuple[Path, ...]:
         if len(paths) != 2:
             usage_error(
                 'Reading from stdin needs exactly one path after "-" to name the code, '
-                "for example: rattle lint - src/module.py"
+                "for example: rattle check - src/module.py"
             )
         return paths
     return tuple(require_existing_path(path, argument="path") for path in paths)
diff --git a/tests/config/test_matching.py b/tests/config/test_matching.py
index 3f48d8d..b97b6b8 100644
--- a/tests/config/test_matching.py
+++ b/tests/config/test_matching.py
@@ -326,7 +326,7 @@ def test_format_output(self) -> None:
 
             with self.subTest("linting vscode"):
                 filepath.write_text(content)
-                result = runner.invoke(main, ["lint", filepath.as_posix()], catch_exceptions=False)
+                result = runner.invoke(main, ["check", filepath.as_posix()], catch_exceptions=False)
                 assert result.exit_code == 1
                 assert any(
                     re.fullmatch(output_format_regex, line) for line in result.stdout.splitlines()
@@ -335,7 +335,7 @@ def test_format_output(self) -> None:
             with self.subTest("fixing vscode"):
                 filepath.write_text(content)
                 result = runner.invoke(
-                    main, ["fix", "--diff", filepath.as_posix()], catch_exceptions=False
+                    main, ["check", "--fix", "--diff", filepath.as_posix()], catch_exceptions=False
                 )
                 assert result.exit_code == 0
                 assert any(
@@ -357,7 +357,7 @@ def test_format_output(self) -> None:
 
             with self.subTest("linting custom"):
                 filepath.write_text(content)
-                result = runner.invoke(main, ["lint", filepath.as_posix()], catch_exceptions=False)
+                result = runner.invoke(main, ["check", filepath.as_posix()], catch_exceptions=False)
                 assert result.exit_code == 1
                 assert any(
                     re.fullmatch(custom_output_format_regex, line)
@@ -367,7 +367,7 @@ def test_format_output(self) -> None:
             with self.subTest("fixing custom"):
                 filepath.write_text(content)
                 result = runner.invoke(
-                    main, ["fix", "--diff", filepath.as_posix()], catch_exceptions=False
+                    main, ["check", "--fix", "--diff", filepath.as_posix()], catch_exceptions=False
                 )
                 assert result.exit_code == 0
                 assert any(
@@ -401,6 +401,6 @@ def test_format_output(self) -> None:
                 nested_file.write_text("name = '{name}'.format(name='Jane Doe')")
 
                 result = runner.invoke(
-                    main, ["lint", nested_file.as_posix()], catch_exceptions=False
+                    main, ["check", nested_file.as_posix()], catch_exceptions=False
                 )
                 assert re.search(r"CUSTOM use-f-string .*nested_f_string\.py", result.output)
diff --git a/tests/integration/test_cli.py b/tests/integration/test_cli.py
index 2d9e5f5..e1cd8de 100644
--- a/tests/integration/test_cli.py
+++ b/tests/integration/test_cli.py
@@ -67,7 +67,7 @@ def func():
                 path.write_text(content)
                 result = self.runner.invoke(
                     main,
-                    ["lint", "-r", "no-redundant-f-string", path.as_posix()],
+                    ["check", "-r", "no-redundant-f-string", path.as_posix()],
                     catch_exceptions=False,
                 )
 
@@ -83,7 +83,7 @@ def func():
                 path.write_text(content)
                 result = self.runner.invoke(
                     main,
-                    ["lint", "-r", "no-redundant-f-string", "--diff", path.as_posix()],
+                    ["check", "-r", "no-redundant-f-string", "--diff", path.as_posix()],
                     catch_exceptions=False,
                 )
 
@@ -97,7 +97,7 @@ def func():
                 path.write_text(content)
                 result = self.runner.invoke(
                     main,
-                    ["fix", "-r", "no-redundant-f-string", path.as_posix()],
+                    ["check", "--fix", "-r", "no-redundant-f-string", path.as_posix()],
                     catch_exceptions=False,
                 )
 
@@ -112,7 +112,7 @@ def func():
                 path.write_text(content)
                 result = self.runner.invoke(
                     main,
-                    ["fix", "-r", "no-redundant-f-string", path.as_posix()],
+                    ["check", "--fix", "-r", "no-redundant-f-string", path.as_posix()],
                     catch_exceptions=False,
                 )
 
@@ -146,7 +146,7 @@ def func():
                 path.write_text(ruff_content)
                 result = self.runner.invoke(
                     main,
-                    ["fix", "-r", "no-redundant-f-string", path.as_posix()],
+                    ["check", "--fix", "-r", "no-redundant-f-string", path.as_posix()],
                     catch_exceptions=False,
                 )
 
@@ -171,7 +171,7 @@ def func():
                 path.write_text(ruff_content)
                 result = self.runner.invoke(
                     main,
-                    ["fix", "-r", "no-redundant-f-string", path.as_posix()],
+                    ["check", "--fix", "-r", "no-redundant-f-string", path.as_posix()],
                     catch_exceptions=False,
                 )
 
@@ -186,7 +186,7 @@ def func():
                 path.write_text(content)
                 result = self.runner.invoke(
                     main,
-                    ["fix", "-r", "no-redundant-f-string", path.as_posix()],
+                    ["check", "--fix", "-r", "no-redundant-f-string", path.as_posix()],
                     catch_exceptions=False,
                 )
 
@@ -198,7 +198,7 @@ def func():
             with self.subTest("linting via stdin"):
                 result = self.runner.invoke(
                     main,
-                    ["lint", "-r", "no-redundant-f-string", "-", path.as_posix()],
+                    ["check", "-r", "no-redundant-f-string", "-", path.as_posix()],
                     input=content,
                     catch_exceptions=False,
                 )
@@ -214,7 +214,7 @@ def func():
 
                 result = self.runner.invoke(
                     main,
-                    ["fix", "-r", "no-redundant-f-string", "-", path.as_posix()],
+                    ["check", "--fix", "-r", "no-redundant-f-string", "-", path.as_posix()],
                     input=content,
                     catch_exceptions=False,
                 )
@@ -224,14 +224,14 @@ def func():
 
     def test_this_file_is_clean(self) -> None:
         path = Path(__file__).resolve().as_posix()
-        result = self.runner.invoke(main, ["lint", path], catch_exceptions=False)
+        result = self.runner.invoke(main, ["check", path], catch_exceptions=False)
         assert result.stdout == ""
         assert result.exit_code == 0
         assert result.stderr == "1 file clean\n"
 
     def test_this_project_is_clean(self) -> None:
         project_dir = Path(__file__).resolve().parent.parent.as_posix()
-        result = self.runner.invoke(main, ["lint", project_dir], catch_exceptions=False)
+        result = self.runner.invoke(main, ["check", project_dir], catch_exceptions=False)
         assert result.stdout == ""
         assert result.exit_code == 0
 
@@ -241,7 +241,7 @@ def test_directory_with_violations(self) -> None:
             (tdp / "clean.py").write_text("name = 'Kirby'\nprint(f'hello {name}')")
             (tdp / "dirty.py").write_text("name = 'Kirby'\nprint('hello %s' % name)\n")
 
-            result = self.runner.invoke(main, ["lint", "-r", "use-f-string", td])
+            result = self.runner.invoke(main, ["check", "-r", "use-f-string", td])
             assert "use-f-string [*] Use an f-string instead of `%` formatting" in result.output
             assert re.search(r" --> .*dirty\.py:2:7", result.output)
             assert result.exit_code == 1
@@ -255,7 +255,7 @@ def test_directory_with_selector_overrides_from_cli(self) -> None:
 
             result = self.runner.invoke(
                 main,
-                ["lint", "-r", "use-f-string", dirty.as_posix()],
+                ["check", "-r", "use-f-string", dirty.as_posix()],
                 catch_exceptions=False,
             )
             assert "use-f-string [*] Use an f-string instead of `%` formatting" in result.output
@@ -293,7 +293,7 @@ def visit_Name(self, node):
             result = self.runner.invoke(
                 main,
                 [
-                    "lint",
+                    "check",
                     "--config",
                     (tdp / "pyproject.toml").as_posix(),
                     "--rules",
@@ -326,7 +326,7 @@ def test_directory_respects_inherited_ruff_file_excludes(self) -> None:
 
             result = self.runner.invoke(
                 main,
-                ["lint", "-r", "use-f-string", td],
+                ["check", "-r", "use-f-string", td],
                 catch_exceptions=False,
             )
 
@@ -352,7 +352,7 @@ def test_directory_respects_rattle_file_excludes(self) -> None:
 
             result = self.runner.invoke(
                 main,
-                ["lint", "-r", "use-f-string", td],
+                ["check", "-r", "use-f-string", td],
                 catch_exceptions=False,
             )
 
@@ -371,7 +371,7 @@ def test_directory_respects_cli_exclude(self) -> None:
             result = self.runner.invoke(
                 main,
                 [
-                    "lint",
+                    "check",
                     "-r",
                     "use-f-string",
                     td,
@@ -409,7 +409,7 @@ def test_cli_exclude_overrides_inherited_ruff_file_excludes(self) -> None:
 
             result = self.runner.invoke(
                 main,
-                ["lint", "-r", "use-f-string", td, "--exclude", "included.py"],
+                ["check", "-r", "use-f-string", td, "--exclude", "included.py"],
                 catch_exceptions=False,
             )
 
@@ -426,7 +426,7 @@ def test_directory_respects_cli_extend_exclude(self) -> None:
 
             result = self.runner.invoke(
                 main,
-                ["lint", "-r", "use-f-string", td, "--extend-exclude", "generated.py"],
+                ["check", "-r", "use-f-string", td, "--extend-exclude", "generated.py"],
                 catch_exceptions=False,
             )
 
@@ -435,7 +435,7 @@ def test_directory_respects_cli_extend_exclude(self) -> None:
             assert result.exit_code == 1
             assert result.stderr == "1 file checked, 1 violation in 1 file, 1 autofixable\n"
 
-    def test_lint_stats_groups_violations_by_rule(self) -> None:
+    def test_check_stats_groups_violations_by_rule(self) -> None:
         with TemporaryDirectory() as td:
             tdp = Path(td).resolve()
             nested = tdp / "pkg"
@@ -449,7 +449,7 @@ def test_lint_stats_groups_violations_by_rule(self) -> None:
             try:
                 result = self.runner.invoke(
                     main,
-                    ["lint", "-r", "use-f-string", "--stats", tdp.as_posix()],
+                    ["check", "-r", "use-f-string", "--stats", tdp.as_posix()],
                     catch_exceptions=False,
                 )
             finally:
@@ -465,7 +465,7 @@ def test_directory_with_errors(self) -> None:
             (tdp / "clean.py").write_text("name = 'Kirby'\nprint(f'hello {name}')")
             (tdp / "broken.py").write_text("print)\n")
 
-            result = self.runner.invoke(main, ["lint", "-r", "use-f-string", td])
+            result = self.runner.invoke(main, ["check", "-r", "use-f-string", td])
             assert "invalid-syntax: tokenizer error: unmatched ')'" in result.output
             assert re.search(r" --> .*broken\.py:1:1", result.output)
             assert result.exit_code == 1
@@ -478,7 +478,7 @@ def test_directory_with_violations_and_errors(self) -> None:
             (tdp / "dirty.py").write_text("name = 'Kirby'\nprint('hello %s' % name)\n")
             (tdp / "broken.py").write_text("print)\n")
 
-            result = self.runner.invoke(main, ["lint", "-r", "use-f-string", td])
+            result = self.runner.invoke(main, ["check", "-r", "use-f-string", td])
             assert "use-f-string [*] Use an f-string instead of `%` formatting" in result.output
             assert re.search(r" --> .*dirty\.py:2:7", result.output)
             assert "invalid-syntax: tokenizer error: unmatched ')'" in result.output
@@ -534,7 +534,7 @@ def foo():
 
             expected = clean.read_text()
 
-            result = self.runner.invoke(main, ["fix", "-r", "legacy", td])
+            result = self.runner.invoke(main, ["check", "--fix", "-r", "legacy", td])
 
             with self.subTest("clean"):
                 assert expected == clean.read_text()
@@ -548,7 +548,7 @@ def foo():
             assert result.stdout == ""
             assert result.stderr == "3 files checked, 4 fixes applied\n"
 
-    def test_lint_directory_with_no_rules_enabled(self) -> None:
+    def test_check_directory_with_no_rules_enabled(self) -> None:
         content = dedent(
             """\
                 import foo
@@ -558,7 +558,7 @@ def func():
                     value = f"hello world"
             """
         )
-        with self.subTest("lint"), TemporaryDirectory() as td:
+        with self.subTest("check"), TemporaryDirectory() as td:
             tdp = Path(td).resolve()
             path = tdp / "file.py"
 
@@ -567,14 +567,14 @@ def func():
             path.write_text(content)
             result = self.runner.invoke(
                 main,
-                ["lint", path.as_posix()],
+                ["check", path.as_posix()],
                 catch_exceptions=False,
             )
 
             assert result.stdout == ""
             assert result.exit_code == 0
 
-        with self.subTest("fix"), TemporaryDirectory() as td:
+        with self.subTest("check --fix"), TemporaryDirectory() as td:
             tdp = Path(td).resolve()
             path = tdp / "file.py"
 
@@ -583,7 +583,7 @@ def func():
             path.write_text(content)
             result = self.runner.invoke(
                 main,
-                ["fix", path.as_posix()],
+                ["check", "--fix", path.as_posix()],
                 catch_exceptions=False,
             )
 
@@ -607,7 +607,7 @@ def save_before_accepting(*_args: object) -> str:
     ):
         result = CliRunner().invoke(
             main,
-            ["fix", "--interactive", "--rules", "use-literal", path.as_posix()],
+            ["check", "--fix", "--interactive", "--rules", "use-literal", path.as_posix()],
             catch_exceptions=False,
         )
 
@@ -638,7 +638,9 @@ def test_fix_respects_recursive_exclusions(
     )
 
     with patch.dict(os.environ, {"RATTLE_DISABLE_CACHE": "1"}):
-        result = CliRunner().invoke(main, ["fix", tmp_path.as_posix()], catch_exceptions=False)
+        result = CliRunner().invoke(
+            main, ["check", "--fix", tmp_path.as_posix()], catch_exceptions=False
+        )
 
     assert result.exit_code == 0
     assert path.read_bytes() == expected
@@ -651,7 +653,9 @@ def test_percent_format_fix_preserves_starred_tuple_value(tmp_path: Path) -> Non
 
     with patch.dict(os.environ, {"RATTLE_DISABLE_CACHE": "1"}):
         result = CliRunner().invoke(
-            main, ["fix", "--rules", "use-f-string", path.as_posix()], catch_exceptions=False
+            main,
+            ["check", "--fix", "--rules", "use-f-string", path.as_posix()],
+            catch_exceptions=False,
         )
 
     namespace: dict[str, object] = {}
@@ -660,7 +664,7 @@ def test_percent_format_fix_preserves_starred_tuple_value(tmp_path: Path) -> Non
     assert result.exit_code in (0, 1)
 
 
-def test_lint_cache_detects_metadata_preserving_edit(tmp_path: Path) -> None:
+def test_check_cache_detects_metadata_preserving_edit(tmp_path: Path) -> None:
     path = tmp_path / "sample.py"
     path.write_bytes(b'import os\nos.getenv("x")\n')
     (tmp_path / "pyproject.toml").write_text(
@@ -672,11 +676,11 @@ def test_lint_cache_detects_metadata_preserving_edit(tmp_path: Path) -> None:
         os.environ,
         {"RATTLE_CACHE_DIR": (tmp_path / "cache").as_posix(), "RATTLE_DISABLE_CACHE": ""},
     ):
-        clean = runner.invoke(main, ["lint", "--json", path.as_posix()], catch_exceptions=False)
+        clean = runner.invoke(main, ["check", "--json", path.as_posix()], catch_exceptions=False)
         original_stat = path.stat()
         path.write_bytes(b'import os\nos.system("x")\n')
         os.utime(path, ns=(original_stat.st_atime_ns, original_stat.st_mtime_ns))
-        cached = runner.invoke(main, ["lint", "--json", path.as_posix()], catch_exceptions=False)
+        cached = runner.invoke(main, ["check", "--json", path.as_posix()], catch_exceptions=False)
 
     assert clean.exit_code == 0
     assert json.loads(clean.stdout) == []
@@ -691,7 +695,9 @@ def test_fix_writes_empty_module_replacement(empty_module_project: Path) -> None
     path.write_bytes(b"pass\n")
 
     with patch.dict(os.environ, {"RATTLE_DISABLE_CACHE": "1"}):
-        result = CliRunner().invoke(main, ["fix", path.as_posix()], catch_exceptions=False)
+        result = CliRunner().invoke(
+            main, ["check", "--fix", path.as_posix()], catch_exceptions=False
+        )
 
     assert path.read_bytes() == b""
     assert result.exit_code == 0
@@ -704,7 +710,7 @@ def test_fix_writes_empty_module_replacement(empty_module_project: Path) -> None
         pytest.param("vendor/scripts/run.py", 1, ["forbidden-call"], id="outside-exemption"),
     ],
 )
-def test_lint_anchors_per_file_exemptions(
+def test_check_anchors_per_file_exemptions(
     tmp_path: Path, relative_path: str, expected_exit: int, expected_rules: list[str]
 ) -> None:
     path = tmp_path / relative_path
@@ -718,7 +724,7 @@ def test_lint_anchors_per_file_exemptions(
 
     with patch.dict(os.environ, {"RATTLE_DISABLE_CACHE": "1"}):
         result = CliRunner().invoke(
-            main, ["lint", "--json", path.as_posix()], catch_exceptions=False
+            main, ["check", "--json", path.as_posix()], catch_exceptions=False
         )
 
     assert result.exit_code == expected_exit
@@ -732,7 +738,9 @@ def test_percent_format_fix_applies_literal_tuple_safely(tmp_path: Path) -> None
 
     with patch.dict(os.environ, {"RATTLE_DISABLE_CACHE": "1"}):
         result = CliRunner().invoke(
-            main, ["fix", "--rules", "use-f-string", path.as_posix()], catch_exceptions=False
+            main,
+            ["check", "--fix", "--rules", "use-f-string", path.as_posix()],
+            catch_exceptions=False,
         )
 
     namespace: dict[str, object] = {}
@@ -758,7 +766,9 @@ def test_percent_format_fix_preserves_conversion_order(tmp_path: Path) -> None:
 
     with patch.dict(os.environ, {"RATTLE_DISABLE_CACHE": "1"}):
         result = CliRunner().invoke(
-            main, ["fix", "--rules", "use-f-string", path.as_posix()], catch_exceptions=False
+            main,
+            ["check", "--fix", "--rules", "use-f-string", path.as_posix()],
+            catch_exceptions=False,
         )
 
     namespace: dict[str, object] = {}
@@ -768,7 +778,7 @@ def test_percent_format_fix_preserves_conversion_order(tmp_path: Path) -> None:
     assert result.exit_code in (0, 1)
 
 
-def test_lint_cache_detects_metadata_preserving_config_edit(tmp_path: Path) -> None:
+def test_check_cache_detects_metadata_preserving_config_edit(tmp_path: Path) -> None:
     for index in range(20):
         (tmp_path / f"sample{index:02}.py").write_text("import os\nos.system('x')\n")
     config_path = tmp_path / "pyproject.toml"
@@ -782,13 +792,13 @@ def test_lint_cache_detects_metadata_preserving_config_edit(tmp_path: Path) -> N
         {"RATTLE_CACHE_DIR": (tmp_path / "cache").as_posix(), "RATTLE_DISABLE_CACHE": ""},
     ):
         clean = runner.invoke(
-            main, ["lint", "--json", "--jobs", "1", tmp_path.as_posix()], catch_exceptions=False
+            main, ["check", "--json", "--jobs", "1", tmp_path.as_posix()], catch_exceptions=False
         )
         original_stat = config_path.stat()
         config_path.write_text(config_path.read_text().replace("os.getenv", "os.system"))
         os.utime(config_path, ns=(original_stat.st_atime_ns, original_stat.st_mtime_ns))
         changed = runner.invoke(
-            main, ["lint", "--json", "--jobs", "1", tmp_path.as_posix()], catch_exceptions=False
+            main, ["check", "--json", "--jobs", "1", tmp_path.as_posix()], catch_exceptions=False
         )
 
     assert clean.exit_code == 0
@@ -803,7 +813,7 @@ def test_lint_cache_detects_metadata_preserving_config_edit(tmp_path: Path) -> N
 
 @pytest.mark.parametrize("edited_name", ["rules.py", "helpers.py"])
 @pytest.mark.parametrize("file_count", [1, 20], ids=["result-cache", "clean-status-cache"])
-def test_lint_cache_detects_metadata_preserving_rule_edit(
+def test_check_cache_detects_metadata_preserving_rule_edit(
     tmp_path: Path, edited_name: str, file_count: int
 ) -> None:
     paths = [tmp_path / f"sample{index:02}.py" for index in range(file_count)]
@@ -831,7 +841,7 @@ def test_lint_cache_detects_metadata_preserving_rule_edit(
         "-B",
         "-m",
         "rattle",
-        "lint",
+        "check",
         "--json",
         "--jobs",
         "1",
@@ -856,3 +866,151 @@ def test_lint_cache_detects_metadata_preserving_rule_edit(
     assert [diagnostic["rule"] for diagnostic in json.loads(changed.stdout)] == [
         "marker-check"
     ] * file_count
+
+
+@pytest.mark.parametrize("fix", [False, True], ids=["preview", "apply"])
+def test_check_diff_only_writes_when_fix_is_requested(tmp_path: Path, fix: bool) -> None:
+    path = tmp_path / "sample.py"
+    source = "value = list([0])\n"
+    path.write_text(source)
+    (tmp_path / "pyproject.toml").write_text(
+        '[tool.rattle]\nroot=true\nformatter="none"\nenable=["use-literal"]\n'
+    )
+    args = ["check", "--diff", path.as_posix()]
+    if fix:
+        args.append("--fix")
+
+    result = CliRunner().invoke(main, args, catch_exceptions=False)
+
+    assert result.exit_code == (0 if fix else 1)
+    assert path.read_text() == ("value = [0]\n" if fix else source)
+    assert "--- a/sample.py" in result.stdout
+    assert "+++ b/sample.py" in result.stdout
+
+
+@pytest.mark.parametrize(
+    ("options", "message"),
+    [
+        (["--interactive"], "--interactive requires --fix"),
+        (["--fix", "--json"], "--json and --fix cannot be used together"),
+        (
+            ["--fix", "--quiet", "--interactive"],
+            "--quiet and --interactive cannot be used together",
+        ),
+        (["--fix", "--quiet", "--diff"], "--quiet and --diff cannot be used together"),
+        (["--fix", "--quiet", "--stats"], "--quiet and --stats cannot be used together"),
+        (["--quiet", "--diff"], "--quiet and --diff cannot be used together"),
+        (["--quiet", "--stats"], "--quiet and --stats cannot be used together"),
+        (["--json", "--quiet"], "--json and --quiet cannot be used together"),
+        (["--json", "--diff"], "--json and --diff cannot be used together"),
+        (["--json", "--compact"], "--json and --compact cannot be used together"),
+        (
+            ["--json", "--output-format", "vscode"],
+            "--json and --output-format cannot be used together",
+        ),
+        (
+            ["--json", "--output-template", "{path}:{line}"],
+            "--json and --output-template cannot be used together",
+        ),
+    ],
+)
+def test_check_rejects_invalid_modes_without_writing(
+    tmp_path: Path, options: list[str], message: str
+) -> None:
+    path = tmp_path / "sample.py"
+    source = "value = list([0])\n"
+    path.write_text(source)
+    (tmp_path / "pyproject.toml").write_text(
+        '[tool.rattle]\nroot=true\nformatter="none"\nenable=["use-literal"]\n'
+    )
+
+    result = CliRunner().invoke(main, ["check", *options, path.as_posix()], catch_exceptions=False)
+
+    assert result.exit_code == 2
+    assert message in result.stderr
+    assert path.read_text() == source
+    assert result.stdout == ""
+
+
+@pytest.mark.parametrize("fix", [False, True], ids=["check", "fix"])
+def test_check_defaults_to_current_directory(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch, fix: bool
+) -> None:
+    monkeypatch.chdir(tmp_path)
+    path = tmp_path / "sample.py"
+    source = "value = list([0])\n"
+    path.write_text(source)
+    (tmp_path / "pyproject.toml").write_text(
+        '[tool.rattle]\nroot=true\nformatter="none"\nenable=["use-literal"]\n'
+    )
+
+    result = CliRunner().invoke(
+        main, ["check", "--fix"] if fix else ["check"], catch_exceptions=False
+    )
+
+    assert result.exit_code == (0 if fix else 1)
+    assert path.read_text() == ("value = [0]\n" if fix else source)
+
+
+@pytest.mark.parametrize(
+    ("answer", "expected", "expected_exit"),
+    [
+        ("y\n", "value = [0]\n", 0),
+        ("n\n", "value = list([0])\n", 1),
+        ("q\n", "value = list([0])\n", 1),
+    ],
+)
+def test_check_interactive_applies_only_accepted_fixes(
+    tmp_path: Path, answer: str, expected: str, expected_exit: int
+) -> None:
+    path = tmp_path / "sample.py"
+    path.write_text("value = list([0])\n")
+    (tmp_path / "pyproject.toml").write_text(
+        '[tool.rattle]\nroot=true\nformatter="none"\nenable=["use-literal"]\n'
+    )
+
+    with patch.object(InputStream, "isatty", return_value=True):
+        result = CliRunner().invoke(
+            main,
+            ["check", "--fix", "--interactive", path.as_posix()],
+            input=answer,
+            catch_exceptions=False,
+        )
+
+    assert result.exit_code == expected_exit
+    assert path.read_text() == expected
+    assert "Apply autofix?" in result.stderr
+
+
+@pytest.mark.parametrize("stdin", [False, True], ids=["non-terminal", "stdin-source"])
+def test_check_interactive_requires_a_terminal_and_file_input(tmp_path: Path, stdin: bool) -> None:
+    path = tmp_path / "sample.py"
+    source = "value = list([0])\n"
+    path.write_text(source)
+    paths = ["-", path.as_posix()] if stdin else [path.as_posix()]
+
+    result = CliRunner().invoke(
+        main, ["check", "--fix", "--interactive", *paths], input=source, catch_exceptions=False
+    )
+
+    assert result.exit_code == 2
+    assert ("cannot be used with stdin" if stdin else "requires a terminal") in result.stderr
+    assert result.stdout == ""
+    assert path.read_text() == source
+
+
+def test_check_fix_reports_remaining_violations_from_final_source(tmp_path: Path) -> None:
+    path = tmp_path / "sample.py"
+    path.write_text("import os\nvalue = list([0])\nos.system(value)\n")
+    (tmp_path / "pyproject.toml").write_text(
+        '[tool.rattle]\nroot=true\nformatter="none"\nenable=["use-literal", "forbidden-call"]\n'
+        '[tool.rattle.options."forbidden-call"]\nforbidden_calls=["os.system"]\n'
+    )
+
+    result = CliRunner().invoke(main, ["check", "--fix", path.as_posix()], catch_exceptions=False)
+
+    assert result.exit_code == 1
+    assert path.read_text() == "import os\nvalue = [0]\nos.system(value)\n"
+    assert "forbidden-call" in result.stdout
+    assert "use-literal" not in result.stdout
+    assert result.stderr == "1 file checked, 1 violation in 1 file, 1 fix applied\n"
diff --git a/tests/integration/test_lsp.py b/tests/integration/test_lsp.py
index 522e5a7..a411ee7 100644
--- a/tests/integration/test_lsp.py
+++ b/tests/integration/test_lsp.py
@@ -284,15 +284,14 @@ def task(fail: bool = False) -> None:
     assert runs == [True]
 
 
-def test_lsp_publishes_syntax_error_diagnostics() -> None:
+def test_lsp_publishes_syntax_error_diagnostics(tmp_path: Path) -> None:
+    uri = (tmp_path / "syntax_err.py").as_uri()
     lsp = LSP(
         Options(rules=[RuleNameSelector("no-annotated-self")]),
         LSPOptions(tcp=None, ws=None, stdio=False, debounce_interval=0),
     )
-    lsp.lsp.protocol._workspace = Workspace("/tmp")
-    item = TextDocumentItem(
-        uri="file:///tmp/syntax_err.py", language_id="python", version=1, text="def foo("
-    )
+    lsp.lsp.protocol._workspace = Workspace(tmp_path.as_uri())
+    item = TextDocumentItem(uri=uri, language_id="python", version=1, text="def foo(")
     lsp.lsp.workspace.put_text_document(item)
 
     published: list[PublishDiagnosticsParams] = []
@@ -301,7 +300,7 @@ def publish(params: PublishDiagnosticsParams) -> None:
         published.append(params)
 
     lsp.lsp.text_document_publish_diagnostics = publish
-    lsp.validate("file:///tmp/syntax_err.py", 1)
+    lsp.validate(uri, 1)
 
     assert len(published) == 1
     assert len(published[0].diagnostics) == 1
@@ -363,17 +362,18 @@ def test_lsp_format_refreshes_side_effect_import_configuration(tmp_path: Path) -
         lsp.close()
 
 
-def test_lsp_format_empty_document() -> None:
+def test_lsp_format_empty_document(tmp_path: Path) -> None:
+    uri = (tmp_path / "empty.py").as_uri()
     lsp = LSP(
         Options(),
         LSPOptions(tcp=None, ws=None, stdio=False, debounce_interval=0),
     )
-    lsp.lsp.protocol._workspace = Workspace("/tmp")
-    item = TextDocumentItem(uri="file:///tmp/empty.py", language_id="python", version=1, text="")
+    lsp.lsp.protocol._workspace = Workspace(tmp_path.as_uri())
+    item = TextDocumentItem(uri=uri, language_id="python", version=1, text="")
     lsp.lsp.workspace.put_text_document(item)
 
     params = DocumentFormattingParams(
-        text_document=TextDocumentIdentifier(uri="file:///tmp/empty.py"),
+        text_document=TextDocumentIdentifier(uri=uri),
         options=FormattingOptions(tab_size=4, insert_spaces=True),
     )
     edits = lsp.format(params)
diff --git a/tests/test_cli_environment.py b/tests/test_cli_environment.py
index c4312f0..ffa7c4e 100644
--- a/tests/test_cli_environment.py
+++ b/tests/test_cli_environment.py
@@ -29,10 +29,13 @@ def install_rattle(environment: Path) -> Path:
     return executable
 
 
-def test_hands_off_to_rattle_installed_in_project_environment(project: Path) -> None:
+@pytest.mark.parametrize("options", [[], ["--fix"]])
+def test_hands_off_to_rattle_installed_in_project_environment(
+    project: Path, options: list[str]
+) -> None:
     executable = install_rattle(project / ".venv")
 
-    assert _project_rattle_for_reexec(["lint", "."]) == executable
+    assert _project_rattle_for_reexec(["check", *options, "."]) == executable
 
 
 def test_stays_in_process_when_already_running_in_project_environment(
@@ -41,13 +44,13 @@ def test_stays_in_process_when_already_running_in_project_environment(
     install_rattle(project / ".venv")
     monkeypatch.setattr(sys, "prefix", str(project / ".venv"))
 
-    assert _project_rattle_for_reexec(["lint", "."]) is None
+    assert _project_rattle_for_reexec(["check", "."]) is None
 
 
 def test_stays_in_process_when_project_environment_lacks_rattle(project: Path) -> None:
     (project / ".venv").mkdir()
 
-    assert _project_rattle_for_reexec(["lint", "."]) is None
+    assert _project_rattle_for_reexec(["check", "."]) is None
 
 
 @pytest.mark.parametrize("configured", ["envs/ci", "absolute"])
@@ -61,11 +64,11 @@ def test_uses_configured_project_environment(
     executable = install_rattle(environment)
     install_rattle(project / ".venv")
 
-    assert _project_rattle_for_reexec(["lint", "."]) == executable
+    assert _project_rattle_for_reexec(["check", "."]) == executable
 
 
 def test_stays_in_process_after_handoff(project: Path, monkeypatch: pytest.MonkeyPatch) -> None:
     install_rattle(project / ".venv")
     monkeypatch.setenv("RATTLE_UV_RUN_REEXEC", "1")
 
-    assert _project_rattle_for_reexec(["lint", "."]) is None
+    assert _project_rattle_for_reexec(["check", "."]) is None