chore(deps): update rustix for RUSTSEC-2026-0486

test(i18n): allow untranslated framework and JDK names
chore: unblock acceptance checks on current main
2026-11-12 20:56:00 +02:00 · 2026-11-11 17:43:39 +08:00 · 2026-11-11 17:42:21 +08:00 · 2026-11-11 17:34:33 +08:00 · 2026-11-11 17:29:50 +08:00 · 2026-11-11 17:27:26 +08:00
@@ -1,83 +0,0 @@
---
-name: eval
-description: Run the code-intelligence evals (`pnpm eval`), pick the worst failing scenario, diagnose it from the attached timeline, fix it, prove the fix with before / after numbers measured on this machine without regressing other scenarios, and open one PR. Use for "跑 eval", "优化 Java 代码智能", "eval 失败了", an issue labelled `eval`, or any change to Java navigation / usages / gutter markers that needs numbers.
---
-
-# Eval loop: measure → fix → prove
-
-`pnpm eval` drives the production workbench in Chromium against a release `openidea-server`
-with real language servers (Java / jdtls for now) and judges every scenario on what the user
-sees: time to feedback, to the first result, to the final one, and the results themselves vs
-`evals/<language>/golden/`. One machine, before and after: numbers from different machines or
-from the nightly host don't judge a fix.
-
-## 0. Preconditions
-
- `jdtls` on PATH and `JAVA_HOME` pointing at a JDK of the pinned `JAVA` version (projects
-  compile against it, and the JDK scenarios' results are in its sources; jdtls itself runs on
-  a newer installed JDK when it needs one). Pinned versions: `.github/tool-versions.env`. A
-  mismatch prints a warning and the report records both: say so in the PR when it applies.
- First run builds `cargo build --release -p ide-host --bin openidea-server` and the perf
-  bundle; later iterations of a frontend-only change can use `--no-build` after a
-  `pnpm exec vite build --mode perf --outDir target/eval/dist`, a backend-only one after the
-  cargo build alone.
- Run evals one at a time on this machine, with nothing heavy (builds, other evals) beside them.
-
-## 1. Baseline on the base commit
-
-```sh
-git switch --detach origin/main     # or the fix branch's merge base
-pnpm eval --save-baseline           # target/eval/baseline.json, this machine only
-```
-
-Read `target/eval/report.json`. Each verdict has `status`, `failures` (`kind`: `error`,
-`timeout`, `degraded`, `correctness`, `budget`, `golden`), `regressions`, `repro` (the command
-that reruns it) and, for failures, `diagnostics`: every command sent to the server in the
-slowest run's window (`cmd`, `start`, `ms`, `ok`, `bytes`, `items`), background tasks, server
-status changes and the server's log tail.
-
-## 2. Pick one problem
-
-Worst first: wrong or missing results and silent degradation, then timeouts, then the
-feedback budget (100 ms), then the slowest `completeMs`. One problem per PR. Say which
-scenario and metric, with its value vs budget.
-
-## 3. Diagnose from the timeline
-
- Commands in the window ordered by `start`: what ran, what waited on what, what's serial
-  that could overlap, which request returned many `items`/`bytes`, which failed.
- `feedbackMs` far above 16 ms with a fast `firstResultMs`: the UI shows nothing while it
-  waits (a hint or popup that only appears after a delay).
- A task still running across the window: background work competing with the request.
- For the frontend side rerun with `--trace` and open `target/eval/traces/<id>@<cond>.json`
-  in Chrome's Performance panel.
- Name the cause at class level (as in `issue-fix`): it usually affects sibling scenarios.
-
-## 4. Fix, then rerun that scenario until it passes
-
-```sh
-pnpm eval --only <scenario> --condition <warm|cold>   # the verdict's `repro`
-```
-
-Correctness is enforced, so a faster answer that drops, truncates or serves stale results
-fails. Don't trade a budget miss for a degraded answer.
-
-## 5. Full suite, then PR
-
-```sh
-pnpm eval                           # vs the baseline from step 1: no new failures or regressions
-```
-
-PR per `issue-fix` §6, plus in **How it was verified** the before / after table from
-`target/eval/report.md` (both on this machine, commits named) and the tool versions line.
-
-## Guard rails
-
- Goldens (`evals/*/golden/`) and budgets (`evals/budgets.json`) are human-owned. Don't edit
-  them, and don't run `--update-golden`, to make a scenario pass. When a golden looks wrong
-  (a tool bump, a deliberate behaviour change), stop and say so: a PR that touches them gets
-  `needs-decision`.
- Don't weaken a scenario's checks or timeouts in `evals/<language>/scenarios.ts` to pass.
-  Adding a scenario (for a case the sweep or a user found) is fine; record its golden with
-  `--update-golden --only <id>` and ask a person to review the file.
- A flaky timing (passes on rerun) is not a regression: rerun once before acting on one.
@@ -1 +0,0 @@
-../../.agents/skills/eval
@@ -1,2 +0,0 @@
-custom:
-  - https://github.com/l0ng-ai/openidea#sponsor
@@ -1,14 +0,0 @@
-# Language server and tool versions for Language smoke (.github/workflows/language-smoke.yml)
-# and the code-intelligence evals (pnpm eval). Pinned so a release can't fail an unrelated
-# PR or move a golden result; bump them deliberately (and re-record goldens: pnpm eval --update-golden).
-VTSLS=0.3.0
-TYPESCRIPT=6.0.3
-BASEDPYRIGHT=1.40.2
-RUFF=0.17.3
-GOPLS=v0.24.0
-JDTLS=1.63.0-202610191322
-KOTLIN_LSP=263.7084.0
-GRADLE=8.14.3
-INTELEPHENSE=1.18.5
-# The JDK projects compile against (JAVA_HOME): library navigation opens its sources.
-JAVA=21
@@ -24,7 +24,6 @@ on:
      - "package.json"
      - "pnpm-lock.yaml"
      - ".github/workflows/language-smoke.yml"
-      - ".github/tool-versions.env"
  pull_request:
    branches: [main]
    types: [opened, synchronize, reopened]
@@ -39,6 +38,16 @@ concurrency:
 env:
  CARGO_TERM_COLOR: always
  CARGO_INCREMENTAL: 0
+  # Pinned so a server release can't fail an unrelated PR; bump them deliberately.
+  VTSLS: 0.3.0
+  TYPESCRIPT: 6.0.3
+  BASEDPYRIGHT: 1.40.2
+  RUFF: 0.17.3
+  GOPLS: v0.24.0
+  JDTLS: 1.63.0-202610191322
+  KOTLIN_LSP: 263.7084.0
+  GRADLE: 8.14.3
+  INTELEPHENSE: 1.18.5

 jobs:
  smoke:
@@ -52,8 +61,6 @@ jobs:
    timeout-minutes: 40
    steps:
      - uses: actions/checkout@v4
-      # Tool versions, shared with the evals (pnpm eval).
-      - run: grep -E '^[A-Z0-9_]+=' .github/tool-versions.env >> "$GITHUB_ENV"
      - uses: dtolnay/rust-toolchain@stable
        with: { components: "rust-analyzer, rustfmt" }
      # One build cache for every language; main saves it.
@@ -89,7 +96,7 @@ jobs:

      - if: matrix.language == 'java' || matrix.language == 'kotlin'
        uses: actions/setup-java@v4
-        with: { distribution: temurin, java-version: "${{ env.JAVA }}" }
+        with: { distribution: temurin, java-version: "21" }
      - if: matrix.language == 'java'
        run: |
          mkdir -p "$RUNNER_TEMP/jdtls"
@@ -40,7 +40,6 @@ CLAUDE.local.md
 .claude/skills/*
 !.claude/skills/verify
 !.claude/skills/issue-fix
-!.claude/skills/eval

 # Local reference screenshots
 pycharm-screenshots/
@@ -9,11 +9,9 @@
    "dist",
    "target",
    "src/bindings.ts",
-    "evals/*/golden",
    "src/editor/core/cm/angular/parser*.ts",
    "src/editor/core/cm/jsp/parser*.ts",
    "src/editor/core/cm/astro/parser*.ts",
-    "src/editor/core/cm/django/parser*.ts",
    "plugins/themes.md",
    "pnpm-lock.yaml",
    "**/*.toml",
@@ -24,8 +24,8 @@ Visual style: dark, low-contrast greys, one cool accent
  Plugin docs: `plugins/README.md`, `plugins/themes.md`.
 - `java/` — JDT LS extension bundles (`java-usages`, `kotlin-bridge`) and the patched
  Lombok agent, embedded into the app by `ide-sdk` / `ide-tools`.
- `e2e/` — Playwright UI tests (`pnpm e2e`). `evals/` — code-intelligence evals (`pnpm eval`).
-  `fixtures/` — sample projects per language for manual and automated testing.
+- `e2e/` — Playwright UI tests (`pnpm e2e`). `fixtures/` — sample projects per language
+  for manual and automated testing.
 - `docs/` — the Mintlify documentation site (`docs.json` navigation, `en/` and `zh/` pages);
  preview with `npx mint dev` in `docs/`.

@@ -59,12 +59,9 @@ Unclear product decisions → `needs-decision` and stop.

 ## Skills

-Do not use Impeccable or its related skills in this repository, including globally installed copies.
-
 Shared agent skills live in `.agents/skills/` (`.claude/skills/` links to them):
 `verify` drives the running app through Tauri MCP and captures screenshot evidence;
-`issue-fix` takes an issue from reproduction to one PR;
-`eval` takes a failing code-intelligence eval to a fix with before / after numbers.
+`issue-fix` takes an issue from reproduction to one PR.

 ## Commands

@@ -84,11 +81,6 @@ Shared agent skills live in `.agents/skills/` (`.claude/skills/` links to them):
  `pnpm gen:bindings`.
 - `pnpm perf` (UI interaction latency / frames / leaks), `pnpm perf:rust` (criterion
  benches vs budgets). Budgets: `perf/budgets.json`.
- `pnpm eval [--only <id>] [--runs n] [--save-baseline]` — Java code intelligence (navigation,
-  usages, gutter markers) in the production workbench against a release `openidea-server` and
-  jdtls: time to feedback / first result / complete, results vs `evals/<language>/golden/`.
-  Report: `target/eval/report.json`. Goldens and `evals/budgets.json` are changed by people only.
-  Tool versions: `.github/tool-versions.env` (shared with Language smoke).
 - `pnpm release:prepare <version>` — the release commit's changes: app version everywhere,
  `Cargo.lock`, and the plugin API snapshot when `wit/` moved to a new version.

@@ -791,7 +791,7 @@ dependencies = [
 "maybe-owned",
 "rustix",
 "rustix-linux-procfs",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 "winx",
 ]

@@ -1522,7 +1522,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d045de693cb712d0b22c6a64be5b953f67b3ce00ab5ad3dd5d8b441886ab8e1a"
 dependencies = [
 "quote",
- "syn 3.0.9",
+ "syn 2.0.119",
 ]

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

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

 [[package]]
@@ -2637,6 +2637,7 @@ version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "337d46834ee672ab3e48caca2cb0c78cc174fb12b3a68d0d88f99a0519a5e36e"
 dependencies = [
+ "generic-array 0.14.7",
 "rustversion",
 "typenum",
 ]
@@ -4144,7 +4145,7 @@ checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"

 [[package]]
 name = "ide-agent"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "dunce",
 "encoding_rs",
@@ -4168,7 +4169,7 @@ dependencies = [

 [[package]]
 name = "ide-analysis"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "ast-grep-core",
 "ide-core",
@@ -4182,7 +4183,7 @@ dependencies = [

 [[package]]
 name = "ide-android"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "serde",
@@ -4193,7 +4194,7 @@ dependencies = [

 [[package]]
 name = "ide-build"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "blake3",
 "chardetng",
@@ -4211,7 +4212,7 @@ dependencies = [

 [[package]]
 name = "ide-cli"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "dirs 6.0.0",
 "serde",
@@ -4225,7 +4226,7 @@ dependencies = [

 [[package]]
 name = "ide-clipboard"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "gtk",
 "objc2 0.6.5",
@@ -4235,7 +4236,7 @@ dependencies = [

 [[package]]
 name = "ide-core"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "dunce",
 "encoding_rs",
@@ -4252,7 +4253,7 @@ dependencies = [

 [[package]]
 name = "ide-coverage"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "ide-run",
@@ -4266,11 +4267,10 @@ dependencies = [

 [[package]]
 name = "ide-dap"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "futures",
 "ide-core",
- "ide-heap",
 "ide-jdwp",
 "ide-jsonrpc",
 "ide-jvm-attach",
@@ -4292,7 +4292,7 @@ dependencies = [

 [[package]]
 name = "ide-db"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "bb8",
 "blake3",
@@ -4302,7 +4302,6 @@ dependencies = [
 "ide-core",
 "ide-http",
 "ide-ssh",
- "notify",
 "oracledb",
 "parking_lot",
 "reqwest",
@@ -4323,7 +4322,7 @@ dependencies = [

 [[package]]
 name = "ide-docker"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "serde",
@@ -4336,7 +4335,7 @@ dependencies = [

 [[package]]
 name = "ide-extension"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "base64 0.22.1",
 "blake3",
@@ -4357,7 +4356,7 @@ dependencies = [

 [[package]]
 name = "ide-fonts"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "objc2-core-foundation",
 "objc2-core-text",
@@ -4369,7 +4368,7 @@ dependencies = [

 [[package]]
 name = "ide-github"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "ide-vcs",
@@ -4380,27 +4379,9 @@ dependencies = [
 "which",
 ]

-[[package]]
-name = "ide-heap"
-version = "0.1.43"
-dependencies = [
- "criterion",
- "ide-core",
- "libc",
- "memmap2",
- "proptest",
- "serde",
- "serde_json",
- "specta",
- "tempfile",
- "thiserror 2.0.21",
- "tracing",
- "uuid",
-]
-
 [[package]]
 name = "ide-host"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "base64 0.22.1",
 "blake3",
@@ -4420,7 +4401,6 @@ dependencies = [
 "ide-db",
 "ide-docker",
 "ide-extension",
- "ide-heap",
 "ide-http",
 "ide-index",
 "ide-jsonrpc",
@@ -4459,7 +4439,6 @@ dependencies = [
 "specta-typescript",
 "tempfile",
 "tokio",
- "tokio-tungstenite",
 "toml 0.9.12+spec-1.1.0",
 "tracing",
 "tracing-subscriber",
@@ -4470,7 +4449,7 @@ dependencies = [

 [[package]]
 name = "ide-http"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "ide-vfs",
@@ -4489,7 +4468,7 @@ dependencies = [

 [[package]]
 name = "ide-index"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "blake3",
 "criterion",
@@ -4511,7 +4490,7 @@ dependencies = [

 [[package]]
 name = "ide-jdwp"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "ide-jvm-inspect",
 "proptest",
@@ -4523,7 +4502,7 @@ dependencies = [

 [[package]]
 name = "ide-jsonrpc"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "encoding_rs",
 "futures",
@@ -4540,7 +4519,7 @@ dependencies = [

 [[package]]
 name = "ide-jvm-attach"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "libc",
 "tempfile",
@@ -4549,7 +4528,7 @@ dependencies = [

 [[package]]
 name = "ide-jvm-inspect"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "futures",
 "serde",
@@ -4560,7 +4539,7 @@ dependencies = [

 [[package]]
 name = "ide-language"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "blake3",
 "criterion",
@@ -4616,10 +4595,9 @@ dependencies = [

 [[package]]
 name = "ide-lsp"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "dunce",
- "encoding_rs",
 "futures",
 "globset",
 "ide-core",
@@ -4644,7 +4622,7 @@ dependencies = [

 [[package]]
 name = "ide-mcp"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "bytes",
 "dunce",
@@ -4663,7 +4641,7 @@ dependencies = [

 [[package]]
 name = "ide-notebook"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "futures",
 "ide-core",
@@ -4686,7 +4664,7 @@ dependencies = [

 [[package]]
 name = "ide-plugin"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "blake3",
 "dunce",
@@ -4709,10 +4687,9 @@ dependencies = [

 [[package]]
 name = "ide-profiler"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "ide-core",
- "ide-jvm-attach",
 "ide-run",
 "serde",
 "serde_json",
@@ -4723,7 +4700,7 @@ dependencies = [

 [[package]]
 name = "ide-remote"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "dunce",
 "globset",
@@ -4742,7 +4719,7 @@ dependencies = [

 [[package]]
 name = "ide-run"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "dunce",
 "encoding_rs",
@@ -4766,7 +4743,7 @@ dependencies = [

 [[package]]
 name = "ide-scaffold"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "ide-tools",
@@ -4782,7 +4759,7 @@ dependencies = [

 [[package]]
 name = "ide-sdk"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "dunce",
 "ide-core",
@@ -4797,13 +4774,12 @@ dependencies = [
 "tempfile",
 "toml 0.9.12+spec-1.1.0",
 "tracing",
- "url",
 "zip",
 ]

 [[package]]
 name = "ide-search"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "criterion",
 "encoding_rs",
@@ -4824,7 +4800,7 @@ dependencies = [

 [[package]]
 name = "ide-spell"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "parking_lot",
@@ -4837,7 +4813,7 @@ dependencies = [

 [[package]]
 name = "ide-ssh"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "dirs 6.0.0",
 "flate2",
@@ -4847,22 +4823,18 @@ dependencies = [
 "parking_lot",
 "russh",
 "russh-sftp",
- "rustls",
- "rustls-platform-verifier",
 "serde",
 "serde_json",
 "specta",
- "suppaftp",
 "tempfile",
 "tokio",
- "tokio-rustls",
 "tracing",
 "uuid",
 ]

 [[package]]
 name = "ide-syntax"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "ide-language",
@@ -4877,7 +4849,7 @@ dependencies = [

 [[package]]
 name = "ide-terminal"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "libc",
@@ -4890,7 +4862,7 @@ dependencies = [

 [[package]]
 name = "ide-text"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "criterion",
 "ide-core",
@@ -4903,7 +4875,7 @@ dependencies = [

 [[package]]
 name = "ide-tools"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "flate2",
 "hex",
@@ -4924,7 +4896,7 @@ dependencies = [

 [[package]]
 name = "ide-vcs"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "blake3",
 "dunce",
@@ -4945,7 +4917,7 @@ dependencies = [

 [[package]]
 name = "ide-vfs"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "chardetng",
 "dunce",
@@ -4969,11 +4941,11 @@ dependencies = [

 [[package]]
 name = "ide-web"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
- "dirs 6.0.0",
 "ide-core",
 "open",
+ "parking_lot",
 "percent-encoding",
 "serde",
 "specta",
@@ -4985,7 +4957,7 @@ dependencies = [

 [[package]]
 name = "ide-workspace"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "blake3",
 "dunce",
@@ -5185,7 +5157,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 dependencies = [
 "hermit-abi",
 "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -5554,29 +5526,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "lazy-regex"
-version = "3.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0a2cce8a22920a29fdcc8c9170aa5d29edd9fbcf8bea856e24c2cb1c2419f67"
-dependencies = [
- "lazy-regex-proc_macros",
- "once_cell",
- "regex",
-]
-
-[[package]]
-name = "lazy-regex-proc_macros"
-version = "3.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f1e4b1f1d8c71edb4ff2b2150ec4606445fd2ddf67ddc097655daf59286baa6"
-dependencies = [
- "proc-macro2",
- "quote",
- "regex",
- "syn 3.0.9",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.5.1"
@@ -5883,7 +5832,7 @@ dependencies = [
 "png 0.18.1",
 "serde",
 "thiserror 2.0.21",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]

 [[package]]
@@ -5991,7 +5940,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -6586,7 +6535,7 @@ dependencies = [

 [[package]]
 name = "openidea"
-version = "0.1.43"
+version = "0.1.41"
 dependencies = [
 "base64 0.22.1",
 "blake3",
@@ -6943,26 +6892,6 @@ dependencies = [
 "siphasher",
 ]

-[[package]]
-name = "pin-project"
-version = "1.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.119",
-]
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.17"
@@ -7711,9 +7640,9 @@ dependencies = [

 [[package]]
 name = "russh"
-version = "0.65.1"
+version = "0.64.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94be3d86c71b9ed220a675c405e35c7a02565a009bf8da2e9cc13a700320a5c5"
+checksum = "ba61e87b9ec9a39a59a6bbed4c0b8ff7fb07073405b24a767a1f2c8560ac8f58"
 dependencies = [
 "aes",
 "bitflags 2.13.2",
@@ -7855,7 +7784,7 @@ dependencies = [
 "errno",
 "libc",
 "linux-raw-sys",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -7923,7 +7852,7 @@ dependencies = [
 "security-framework",
 "security-framework-sys",
 "webpki-root-certs",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -8579,7 +8508,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
 "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]

 [[package]]
@@ -9011,23 +8940,6 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"

-[[package]]
-name = "suppaftp"
-version = "12.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b58fcf921745cca6f0127c9f822069947da8c6dbeff52e9004750bcc448171f"
-dependencies = [
- "async-trait",
- "chrono",
- "lazy-regex",
- "log",
- "pin-project",
- "rustls-pki-types",
- "thiserror 2.0.21",
- "tokio",
- "tokio-rustls",
-]
-
 [[package]]
 name = "swift-rs"
 version = "1.0.9"
@@ -9636,10 +9548,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
 "fastrand",
- "getrandom 0.4.3",
+ "getrandom 0.3.4",
 "once_cell",
 "rustix",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -9868,10 +9780,7 @@ checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857"
 dependencies = [
 "futures-util",
 "log",
- "rustls",
- "rustls-pki-types",
 "tokio",
- "tokio-rustls",
 "tungstenite",
 ]

@@ -10174,7 +10083,7 @@ dependencies = [
 "png 0.18.1",
 "serde",
 "thiserror 2.0.21",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]

 [[package]]
@@ -10565,8 +10474,6 @@ dependencies = [
 "httparse",
 "log",
 "rand 0.9.5",
- "rustls",
- "rustls-pki-types",
 "sha1 0.10.7",
 "thiserror 2.0.21",
 "utf-8",
@@ -10598,7 +10505,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
 dependencies = [
 "memoffset",
 "tempfile",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]

 [[package]]
@@ -11466,7 +11373,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -11487,7 +11394,7 @@ dependencies = [
 "objc2-foundation 0.3.2",
 "objc2-quartz-core 0.3.2",
 "raw-window-handle",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 "windows-version",
 ]

@@ -11905,7 +11812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d6f32a0ff4a9f6f01231eb2059cc85479330739333e0e58cadf03b6af2cca10"
 dependencies = [
 "cfg-if",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -5,7 +5,7 @@ members = ["crates/*", "src-tauri"]
 exclude = ["sdk", "plugins"]

 [workspace.package]
-version = "0.1.43"
+version = "0.1.41"
 edition = "2024"
 rust-version = "1.96"
 license = "Apache-2.0"
@@ -51,7 +51,6 @@ ide-cli = { path = "crates/ide-cli" }
 ide-jvm-attach = { path = "crates/ide-jvm-attach" }
 ide-jvm-inspect = { path = "crates/ide-jvm-inspect" }
 ide-jdwp = { path = "crates/ide-jdwp" }
-ide-heap = { path = "crates/ide-heap" }

 # serialization & IPC typing
 serde = { version = "1", features = ["derive"] }
@@ -68,7 +67,6 @@ parking_lot = "0.12"
 rayon = "1"
 dashmap = "6"
 futures = "0.3"
-tokio-tungstenite = { version = "0.28", default-features = false, features = ["connect", "__rustls-tls"] }

 # errors & diagnostics
 thiserror = "2"
@@ -88,7 +86,6 @@ trash = "5"
 blake3 = "1"
 dunce = "1"
 dirs = "6"
-memmap2 = "0.9"
 zip = { version = "9.2.3", default-features = false, features = ["deflate"] }

 # search, index, language
@@ -19,8 +19,6 @@
  <a href="#plugins">Plugins</a>
  &nbsp;·&nbsp;
  <a href="#community">Community</a>
-  &nbsp;·&nbsp;
-  <a href="#sponsor">Sponsor</a>
 </p>

 https://github.com/user-attachments/assets/234dd54c-1255-4b3a-b35c-533d78d737c0
@@ -70,17 +68,6 @@ the [official plugins](plugins/official). The plugin API is still a preview.

 - Contributing: see [CONTRIBUTING.md](CONTRIBUTING.md) and the [contributor docs](https://openidea.sh/en/contribute/setup).

-## Sponsor
-
-If OpenIDEA saves you time, you can support its development with Alipay or WeChat Pay.
-
-<table>
-  <tr>
-    <td align="center"><img src=".github/assets/sponsor-alipay.png" alt="Alipay QR code" width="200"><br>Alipay</td>
-    <td align="center"><img src=".github/assets/sponsor-wechat.png" alt="WeChat Pay QR code" width="200"><br>WeChat Pay</td>
-  </tr>
-</table>
-
 ## License

 [Apache 2.0](LICENSE). Bundled third-party assets are listed in [`THIRD_PARTY_LICENSES.md`](THIRD_PARTY_LICENSES.md).
@@ -1,102 +0,0 @@
-//! A short-lived ACP session to learn models, effort levels and other config options
-//! before the user's first task (Cursor and other ACP agents do not expose these in
-//! `initialize` alone).
-
-use super::{Conn, Dialect};
-use crate::config;
-use crate::model::AgentConfigOption;
-use crate::provider::ProviderSpec;
-use crate::{Shared, client_info};
-use parking_lot::Mutex;
-use serde_json::{Value, json};
-use std::sync::Arc;
-use std::time::Duration;
-
-const DISCOVER_TIMEOUT: Duration = if cfg!(test) { Duration::from_secs(3) } else { Duration::from_secs(120) };
-
-/// Opens `session/new`, reads `configOptions`, and records per-model `thought_level` choices.
-pub(crate) async fn run(shared: &Arc<Shared>, spec: &ProviderSpec) -> Result<(), String> {
-    let root = shared.paths.project_root.clone();
-    let launch = spec.clone();
-    let launch = tokio::task::spawn_blocking({
-        let root = root.clone();
-        move || launch.resolve_for_launch(&root)
-    })
-    .await
-    .map_err(|e| e.to_string())?;
-    let cwd = dunce::canonicalize(&root).unwrap_or(root);
-    let stderr: Arc<Mutex<Vec<String>>> = Arc::default();
-    let lines = stderr.clone();
-    let on_stderr: Box<dyn Fn(String) + Send + Sync> = Box::new(move |l| lines.lock().push(l));
-    let client = Dialect::wrap(Arc::new(ide_jsonrpc::NoopHandler));
-    let peer = (shared.connector)(&launch, &cwd, client.clone(), on_stderr)
-        .map_err(|e| format!("Couldn't start {} (`{}`): {e}", launch.name, launch.command))?;
-    let conn = Conn::new(peer.clone(), client);
-    let work = async {
-        conn.initialize(&client_info()).await.map_err(|e| e.to_string())?;
-        let cwd_s = cwd.to_string_lossy().into_owned();
-        // No project MCP during discovery: Cursor can spend a long time spawning servers.
-        let new: Value = conn
-            .request("session/new", json!({ "cwd": cwd_s, "mcpServers": [] }), None)
-            .await
-            .map_err(|e| e.to_string())?;
-        let mut options = config::options_of(&new);
-        config::add_client_options(&launch.id, &mut options);
-        let model_option = options.iter().find(|o| o.category.as_deref() == Some("model"));
-        let effort = levels_for_model_from_slice(&options);
-        let levels: Vec<(String, Vec<AgentConfigOption>)> = match (model_option, effort) {
-            (Some(model), Some(effort)) if !model.values.is_empty() => {
-                model.values.iter().map(|v| (v.value.clone(), effort.clone())).collect()
-            }
-            (Some(model), Some(effort)) => model.current.clone().map(|m| vec![(m, effort)]).unwrap_or_default(),
-            _ => Vec::new(),
-        };
-        let option_ids: Vec<_> = options.iter().map(|o| o.id.as_str()).collect();
-        tracing::info!(
-            "agent {}: settings discovery got {} config option(s) {:?}, {} model effort list(s)",
-            launch.id,
-            options.len(),
-            option_ids,
-            levels.len()
-        );
-        shared.remember_discovered(&launch.id, &options, &[], &levels);
-        Ok::<(), String>(())
-    };
-    let result = tokio::time::timeout(DISCOVER_TIMEOUT, work).await;
-    peer.kill();
-    match result {
-        Ok(Ok(())) => Ok(()),
-        Ok(Err(e)) => Err(match stderr.lock().last() {
-            Some(line) => format!("{e}: {line}"),
-            None => e,
-        }),
-        Err(_) => {
-            let tail = stderr.lock().join("\n");
-            if tail.is_empty() {
-                Err("the agent did not answer in time".into())
-            } else {
-                Err(format!("the agent did not answer in time:\n{tail}"))
-            }
-        }
-    }
-}
-
-fn is_thought_level(o: &AgentConfigOption) -> bool {
-    o.category.as_deref() == Some("thought_level")
-        || matches!(o.id.as_str(), "effort" | "reasoning_effort" | "thinking" | "reasoning")
-}
-
-fn levels_for_model_from_slice(options: &[AgentConfigOption]) -> Option<Vec<AgentConfigOption>> {
-    let levels: Vec<_> = options
-        .iter()
-        .filter(|o| is_thought_level(o))
-        .cloned()
-        .map(|mut o| {
-            if o.category.as_deref() != Some("thought_level") {
-                o.category = Some("thought_level".into());
-            }
-            o
-        })
-        .collect();
-    (!levels.is_empty()).then_some(levels)
-}
@@ -14,7 +14,6 @@
 //! - Agent → client ([`Dialect`]): `session/update`s are normalized ([`normalize`]) and
 //!   permission requests get the v1 `toolCall`.

-pub(crate) mod discover;
 mod normalize;

 use ide_jsonrpc::{Handler, Peer, RpcError, codes};
@@ -58,9 +57,6 @@ fn client_capabilities() -> Value {
        "terminal": false,
        // Subagents as sessions of their own (ACP subagents RFD; v2 baseline).
        "subagents": {},
-        // Cursor exposes model parameters (e.g. Composer `fast`) as separate config options
-        // only when the client advertises this flag (undocumented Cursor ACP extension).
-        "_meta": { "parameterizedModelPicker": true },
    })
 }

@@ -93,81 +93,9 @@ fn the_negotiating_request_carries_both_versions() {
    assert!(p["capabilities"].is_object());
    assert_eq!(p["clientCapabilities"]["subagents"], json!({}));
    assert_eq!(p["clientCapabilities"]["terminal"], false);
-    assert_eq!(
-        p["clientCapabilities"]["_meta"]["parameterizedModelPicker"], true,
-        "Cursor and similar agents need parameterized model options (e.g. fast on/off)"
-    );
    // What we sent in the capture is what claude-agent-acp negotiated v2 and v1 from.
-    let sent = frames(TURN, "out")[0]["params"]["clientCapabilities"].clone();
-    let mut expected = sent;
-    expected["_meta"] = p["clientCapabilities"]["_meta"].clone();
-    assert_eq!(expected, p["clientCapabilities"]);
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn discovery_reads_effort_and_fast_from_session_new_then_stops_the_agent() {
-    #[derive(Default)]
-    struct DiscoveryAgent {
-        peer: std::sync::OnceLock<Peer>,
-        calls: parking_lot::Mutex<Vec<(String, Value)>>,
-    }
-    impl Handler for DiscoveryAgent {
-        fn on_notification(&self, _: &str, _: Value) {}
-        fn on_request(&self, method: &str, params: Value) -> Result<Value, (i64, String)> {
-            self.calls.lock().push((method.to_owned(), params));
-            match method {
-                "initialize" => Ok(json!({
-                    "protocolVersion": 1,
-                    "agentCapabilities": { "loadSession": true }
-                })),
-                "session/new" => Ok(json!({
-                    "sessionId": "discover",
-                    "configOptions": [
-                        {"id": "model", "category": "model", "type": "select", "currentValue": "m1",
-                         "options": [{"value": "m1", "name": "One"}, {"value": "m2", "name": "Two"}]},
-                        {"id": "effort", "type": "select", "currentValue": "medium",
-                         "options": [{"value": "low"}, {"value": "medium"}, {"value": "high"}]},
-                        {"id": "fast", "type": "select", "currentValue": "false",
-                         "options": [{"value": "false", "name": "Off"}, {"value": "true", "name": "On"}]}
-                    ]
-                })),
-                _ => Ok(json!({})),
-            }
-        }
-    }
-    let agent = Arc::new(DiscoveryAgent::default());
-    let tmp = tempfile::tempdir().unwrap();
-    let agent_for_connector = agent.clone();
-    let connector: crate::Connector = Arc::new(move |_, _, client, _| {
-        let (ca, cb) = tokio::io::duplex(1 << 20);
-        let (car, caw) = tokio::io::split(ca);
-        let (cbr, cbw) = tokio::io::split(cb);
-        let agent_peer = Peer::connect_framed(cbr, cbw, agent_for_connector.clone(), Framing::Lines);
-        let _ = agent_for_connector.peer.set(agent_peer);
-        Ok(Peer::connect_framed(car, caw, client, Framing::Lines))
-    });
-    let mgr = crate::AgentManager::with_connector(
-        crate::AgentPaths {
-            project_root: tmp.path().to_path_buf(),
-            store_dir: tmp.path().join("store"),
-            worktrees_dir: tmp.path().join("worktrees"),
-            models_file: tmp.path().join("models.json"),
-            custom_agents_dir: None,
-            home_dir: None,
-        },
-        tokio::runtime::Handle::current(),
-        connector,
-    );
-    mgr.commands("cursor", None).await.unwrap();
-    let calls = agent.calls.lock();
-    assert_eq!(calls.iter().map(|(m, _)| m.as_str()).collect::<Vec<_>>(), ["initialize", "session/new"]);
-    assert_eq!(calls[1].1["mcpServers"], json!([]));
-    let cursor = mgr.providers().into_iter().find(|p| p.id == "cursor").unwrap();
-    let fast = cursor.config.iter().find(|o| o.id == "fast").expect("fast option");
-    assert_eq!(fast.category.as_deref(), Some("model_config"));
-    assert_eq!(fast.current.as_deref(), Some("false"));
-    assert!(cursor.thought_levels.contains_key("m1") && cursor.thought_levels.contains_key("m2"));
-    assert!(cursor.thought_levels["m1"].iter().any(|o| o.category.as_deref() == Some("thought_level")));
+    let sent = &frames(TURN, "out")[0]["params"];
+    assert_eq!(sent["clientCapabilities"], p["clientCapabilities"]);
 }

 #[test]
@@ -107,15 +107,7 @@ pub(crate) fn parse_options(options: &Value) -> Vec<AgentConfigOption> {
            Some(AgentConfigOption {
                name: str_of(o, "name").unwrap_or_else(|| id.clone()),
                description: str_of(o, "description"),
-                category: str_of(o, "category").or_else(|| {
-                    matches!(id.as_str(), "model" | "mode")
-                        .then(|| id.clone())
-                        .or_else(|| {
-                            matches!(id.as_str(), "effort" | "reasoning_effort" | "thinking" | "reasoning")
-                                .then(|| "thought_level".into())
-                        })
-                        .or_else(|| matches!(id.as_str(), "fast").then(|| "model_config".into()))
-                }),
+                category: str_of(o, "category").or_else(|| matches!(id.as_str(), "model" | "mode").then(|| id.clone())),
                current: str_of(o, "currentValue"),
                values,
                via: AgentConfigVia::Option,
@@ -341,21 +333,6 @@ mod tests {
        assert!(bypass_approvals(&url_mode));
    }

-    #[test]
-    fn effort_and_fast_categories_are_inferred_from_ids() {
-        let c = options_of(&json!({
-            "configOptions": [
-                {"id": "effort", "type": "select", "currentValue": "high",
-                 "options": [{"value": "low"}, {"value": "high"}]},
-                {"id": "fast", "type": "select", "currentValue": "false",
-                 "options": [{"value": "false", "name": "Off"}, {"value": "true", "name": "On"}]}
-            ]
-        }));
-        assert_eq!(c.len(), 2);
-        assert_eq!(c[0].category.as_deref(), Some("thought_level"));
-        assert_eq!(c[1].category.as_deref(), Some("model_config"));
-    }
-
    #[test]
    fn command_sources_in_updates_and_stored_tasks() {
        let update = json!({"availableCommands": [
@@ -8,7 +8,6 @@
 use super::native::claude::history;
 use serde::Serialize;
 use specta::Type;
-use std::io::BufRead;
 use std::path::{Path, PathBuf};

 /// A session on this machine that no task holds yet.
@@ -63,28 +62,11 @@ fn message_text(e: &serde_json::Value) -> Option<String> {
    }
 }

-/// Whether a session that ran in `cwd` belongs to the project at `root` (in it or below it).
-fn in_project(cwd: Option<&str>, root: &Path) -> bool {
-    cwd.is_some_and(|cwd| Path::new(cwd).starts_with(root))
-}
-
-/// Claude Code transcripts of the project at `root`: `<config>/projects/<escaped cwd>/<id>.jsonl`.
-/// Only the folders named after `root` or a folder below it are read, so other projects'
-/// transcripts (often gigabytes) are never opened.
-pub fn claude_sessions(config_dir: &Path, root: &Path) -> Vec<ExternalSession> {
+/// Claude Code transcripts: `<config>/projects/*/<id>.jsonl`.
+pub fn claude_sessions(config_dir: &Path) -> Vec<ExternalSession> {
    let mut out = Vec::new();
    let projects = config_dir.join("projects");
-    let escaped = history::escape(root);
-    let dirs: Vec<PathBuf> = std::fs::read_dir(&projects)
-        .into_iter()
-        .flatten()
-        .flatten()
-        .filter(|d| {
-            let name = d.file_name().to_string_lossy().into_owned();
-            name == escaped || name.starts_with(&format!("{escaped}-"))
-        })
-        .map(|d| d.path())
-        .collect();
+    let dirs: Vec<PathBuf> = std::fs::read_dir(&projects).into_iter().flatten().flatten().map(|d| d.path()).collect();
    for dir in dirs {
        let files: Vec<PathBuf> = std::fs::read_dir(&dir)
            .into_iter()
@@ -111,10 +93,6 @@ pub fn claude_sessions(config_dir: &Path, root: &Path) -> Vec<ExternalSession> {
                .filter_map(|e| e.get("cwd").and_then(serde_json::Value::as_str))
                .next()
                .map(str::to_owned);
-            // Escaping is lossy (`a/b-c` and `a/b/c` share a folder): the transcript decides.
-            if !in_project(cwd.as_deref(), root) {
-                continue;
-            }
            out.push(ExternalSession {
                provider: "claude".to_owned(),
                session_id: id,
@@ -160,13 +138,12 @@ fn codex_user_text(line: &serde_json::Value) -> Option<String> {

 /// One rollout file's session, or `None` when it names no `session_meta`.
 fn codex_file(path: &Path) -> Option<ExternalSession> {
-    let file = std::fs::File::open(path).ok()?;
+    let text = std::fs::read_to_string(path).ok()?;
    let mut id: Option<(String, Option<String>)> = None;
    let mut title: Option<String> = None;
    // `session_meta` is first, but cap the scan: giant rollouts must not stall listing.
-    for line in std::io::BufReader::new(file).lines().take(400) {
-        let Ok(line) = line else { break };
-        let Ok(v) = serde_json::from_str::<serde_json::Value>(&line) else { continue };
+    for line in text.lines().take(400) {
+        let Ok(v) = serde_json::from_str::<serde_json::Value>(line) else { continue };
        if id.is_none()
            && let Some(meta) = codex_meta(&v)
        {
@@ -206,11 +183,11 @@ fn rollout_files(dir: &Path, depth: usize, out: &mut Vec<PathBuf>) {
    }
 }

-/// Codex sessions of the project at `root`: `<home>/.codex/sessions/**`.
-pub fn codex_sessions(codex_home: &Path, root: &Path) -> Vec<ExternalSession> {
+/// Codex sessions: `<home>/.codex/sessions/**`.
+pub fn codex_sessions(codex_home: &Path) -> Vec<ExternalSession> {
    let mut files = Vec::new();
    rollout_files(&codex_home.join("sessions"), 4, &mut files);
-    files.iter().filter_map(|p| codex_file(p)).filter(|s| in_project(s.cwd.as_deref(), root)).collect()
+    files.iter().filter_map(|p| codex_file(p)).collect()
 }

 #[cfg(test)]
@@ -245,7 +222,7 @@ mod tests {
            ],
        );
        write(&tmp.path().join("projects/-work-app/empty.jsonl"), &[]);
-        let sessions = claude_sessions(tmp.path(), Path::new("/work/app"));
+        let sessions = claude_sessions(tmp.path());
        assert_eq!(sessions.len(), 1);
        let s = &sessions[0];
        assert_eq!((s.provider.as_str(), s.session_id.as_str()), ("claude", "abc123"));
@@ -257,8 +234,8 @@ mod tests {
    #[test]
    fn claude_title_falls_back_to_the_first_prompt() {
        let tmp = tempfile::tempdir().unwrap();
-        write(&tmp.path().join("projects/-work-app/def456.jsonl"), &[claude_user("u1", "hello there")]);
-        let sessions = claude_sessions(tmp.path(), Path::new("/work/app"));
+        write(&tmp.path().join("projects/-x/def456.jsonl"), &[claude_user("u1", "hello there")]);
+        let sessions = claude_sessions(tmp.path());
        assert_eq!(sessions.len(), 1);
        assert_eq!(sessions[0].title, "hello there");
    }
@@ -276,7 +253,7 @@ mod tests {
            ],
        );
        write(&tmp.path().join("sessions/notes.jsonl"), &[json!({"nope": true})]);
-        let sessions = codex_sessions(tmp.path(), Path::new("/work"));
+        let sessions = codex_sessions(tmp.path());
        assert_eq!(sessions.len(), 1);
        let s = &sessions[0];
        assert_eq!((s.provider.as_str(), s.session_id.as_str()), ("codex", "thread-1"));
@@ -287,39 +264,7 @@ mod tests {
    #[test]
    fn missing_directories_list_nothing() {
        let tmp = tempfile::tempdir().unwrap();
-        assert!(claude_sessions(&tmp.path().join("nope"), Path::new("/work")).is_empty());
-        assert!(codex_sessions(&tmp.path().join("nope"), Path::new("/work")).is_empty());
-    }
-
-    #[test]
-    fn only_sessions_of_the_project_are_listed() {
-        let tmp = tempfile::tempdir().unwrap();
-        let user = |cwd: &str| {
-            json!({"type": "user", "uuid": "u1", "parentUuid": null,
-                "message": {"role": "user", "content": "hi"}, "cwd": cwd})
-        };
-        write(&tmp.path().join("projects/-work-app/in-root.jsonl"), &[user("/work/app")]);
-        write(&tmp.path().join("projects/-work-app-web/below.jsonl"), &[user("/work/app/web")]);
-        // `/work/app-old` escapes like a folder below `/work/app`; its transcript says otherwise.
-        write(&tmp.path().join("projects/-work-app-old/sibling.jsonl"), &[user("/work/app-old")]);
-        write(&tmp.path().join("projects/-other/elsewhere.jsonl"), &[user("/other")]);
-        let mut ids: Vec<String> =
-            claude_sessions(tmp.path(), Path::new("/work/app")).into_iter().map(|s| s.session_id).collect();
-        ids.sort();
-        assert_eq!(ids, ["below", "in-root"]);
-
-        let rollout = |name: &str, cwd: &str| {
-            write(
-                &tmp.path().join(format!("codex/sessions/2026/01/02/{name}.jsonl")),
-                &[json!({"payload": {"type": "session_meta", "payload": {"id": name, "cwd": cwd}}})],
-            )
-        };
-        rollout("mine", "/work/app/api");
-        rollout("theirs", "/other");
-        let codex: Vec<String> = codex_sessions(&tmp.path().join("codex"), Path::new("/work/app"))
-            .into_iter()
-            .map(|s| s.session_id)
-            .collect();
-        assert_eq!(codex, ["mine"]);
+        assert!(claude_sessions(&tmp.path().join("nope")).is_empty());
+        assert!(codex_sessions(&tmp.path().join("nope")).is_empty());
    }
 }
@@ -16,7 +16,6 @@ mod model;
 mod native;
 mod provider;
 pub mod registry;
-pub mod security;
 mod skills;
 mod timeline;
 mod worktree;
@@ -40,9 +39,6 @@ use std::time::Duration;
 /// Receives the events of one project's tasks.
 pub type AgentSink = Arc<dyn Fn(AgentEvent) + Send + Sync>;

-/// Returns the active command execution security policy for the project.
-pub type SecurityHook = Arc<dyn Fn() -> ide_core::settings::AgentSecuritySettings + Send + Sync>;
-
 /// Entry changes are batched for this long before they are sent.
 const FLUSH_DELAY: Duration = Duration::from_millis(40);
 /// Updates that arrive this late after `session/load` returns are still replayed history.
@@ -106,7 +102,6 @@ struct Shared {
    runtime: tokio::runtime::Handle,
    connector: Connector,
    sink: RwLock<Option<AgentSink>>,
-    security: RwLock<Option<SecurityHook>>,
    known: Mutex<HashMap<String, Known>>,
    providers: RwLock<Vec<provider::ProviderSpec>>,
    /// Last probe of each provider.
@@ -182,15 +177,9 @@ impl Shared {
                    let shared = self.clone();
                    // Keep the lookup alive if a composer unmounts while it is waiting.
                    self.runtime.spawn(async move {
-                        tracing::info!("agent {}: settings discovery started", spec.id);
-                        let discovered = if spec.driver == provider::Driver::Acp {
-                            acp::discover::run(&shared, &spec).await.map(|_| None)
-                        } else if spec.driver == provider::Driver::Claude {
-                            native::claude::discover(spec.clone(), shared.paths.project_root.clone()).await.map(Some)
-                        } else {
-                            return;
-                        };
-                        if let Ok(Some(found)) = discovered {
+                        if let Ok(found) =
+                            native::claude::discover(spec.clone(), shared.paths.project_root.clone()).await
+                        {
                            let commands =
                                config::commands_of(&json!({ "availableCommands": found.commands }), &spec.id);
                            let options = config::options_of(&json!({ "configOptions": found.options }));
@@ -209,8 +198,6 @@ impl Shared {
                                shared.remember_discovered(&spec.id, &options, &commands, &levels);
                            })
                            .await;
-                        } else if let Err(e) = discovered {
-                            tracing::info!("agent {}: settings discovery failed: {e}", spec.id);
                        }
                        let _ = done.send(true);
                    });
@@ -233,17 +220,12 @@ impl Shared {
    fn knows_all_levels(&self, provider: &str) -> bool {
        let cache = self.known.lock();
        let Some(known) = cache.get(provider) else { return false };
-        let models: Vec<&str> = known
+        known
            .config
            .iter()
            .filter(|o| o.category.as_deref() == Some("model"))
-            .flat_map(|o| o.values.iter().map(|v| v.value.as_str()))
-            .collect();
-        // No advertised models yet: nothing to attach effort levels to.
-        if models.is_empty() {
-            return false;
-        }
-        models.iter().all(|id| known.thought_levels.contains_key(*id))
+            .flat_map(|o| &o.values)
+            .all(|v| known.thought_levels.contains_key(&v.value))
    }

    fn root_key(&self) -> String {
@@ -452,7 +434,6 @@ impl AgentManager {
            runtime,
            connector,
            sink: RwLock::new(None),
-            security: RwLock::new(None),
            known: Mutex::new(known),
            providers,
            probes: Mutex::new(HashMap::new()),
@@ -496,11 +477,6 @@ impl AgentManager {
        tasks
    }

-    /// Sets the callback used to read the active command execution security policy.
-    pub fn set_security_hook(&self, hook: SecurityHook) {
-        *self.shared.security.write() = Some(hook);
-    }
-
    /// The agents (custom ones re-read), whether each is installed, and what they offered last time.
    pub fn providers(&self) -> Vec<AgentProvider> {
        let specs = provider::load(self.shared.paths.custom_agents_dir.as_deref());
@@ -525,9 +501,7 @@ impl AgentManager {
            let new = specs.iter().find(|p| &p.id == id);
            matches!((old, new), (Some(a), Some(b)) if a.command == b.command && a.args == b.args && a.env == b.env)
        });
-        *prev = specs.clone();
-        drop(probes);
-        drop(prev);
+        *prev = specs;
        list
    }

@@ -548,30 +522,6 @@ impl AgentManager {
        provider::set_builtin_env(&dir, id, env)
    }

-    /// Saves a new custom ACP agent through its agent file.
-    pub fn save_custom_agent(&self, input: CustomAgentInput) -> IdeResult<()> {
-        let Some(dir) = self.shared.paths.custom_agents_dir.clone() else {
-            return Err(IdeError::unavailable("there is no custom agents directory"));
-        };
-        provider::save_custom(&dir, &input)
-    }
-
-    /// Removes a custom agent's file (registry installs go through `registry_remove`).
-    pub fn remove_custom_agent(&self, id: &str) -> IdeResult<()> {
-        let Some(dir) = self.shared.paths.custom_agents_dir.clone() else {
-            return Err(IdeError::unavailable("there is no custom agents directory"));
-        };
-        provider::remove_custom(&dir, id)
-    }
-
-    /// Imports a JetBrains `acp.json` file's `agent_servers` entries as custom agents.
-    pub fn import_acp_agents(&self, text: &str) -> IdeResult<Vec<AcpImportOutcome>> {
-        let Some(dir) = self.shared.paths.custom_agents_dir.clone() else {
-            return Err(IdeError::unavailable("there is no custom agents directory"));
-        };
-        provider::import_acp(&dir, text)
-    }
-
    /// Re-reads configured/installed agents, drops cached probes, and notifies subscribers.
    pub fn reload_providers(&self) {
        let specs = provider::load(self.shared.paths.custom_agents_dir.as_deref());
@@ -602,16 +552,10 @@ impl AgentManager {
        let mut offered = offered;
        if task.is_none()
            && (offered.is_empty() || !self.shared.has_config(&provider) || !self.shared.knows_all_levels(&provider))
-            && let Some(spec) = self
-                .shared
-                .spec(&provider)
-                .filter(|s| matches!(s.driver, provider::Driver::Claude | provider::Driver::Acp))
+            && let Some(spec) = self.shared.spec(&provider).filter(|s| s.driver == provider::Driver::Claude)
        {
-            let claude = spec.driver == provider::Driver::Claude;
            self.shared.fetch_settings(spec).await;
-            if claude {
-                offered = self.shared.known_commands(&provider);
-            }
+            offered = self.shared.known_commands(&provider);
        }
        for &(name, description) in builtin_commands(&provider) {
            if !offered.iter().any(|c| c.name == name) {
@@ -648,19 +592,17 @@ impl AgentManager {
        self.tasks.read().values().filter_map(|t| t.state.lock().session_id.clone()).collect()
    }

-    /// Sessions of this project on this machine that no task holds yet, newest first. Reads
-    /// transcripts from disk: call it off the UI and command threads.
+    /// Sessions on this machine that no task holds yet, newest first (#312).
    pub fn external_sessions(&self) -> Vec<ExternalSession> {
        let mut out = Vec::new();
-        let root = self.shared.paths.project_root.clone();
        if let Some(spec) = self.shared.spec("claude")
            && let Some(dir) = native::claude::cli::config_dir(&spec.env)
        {
-            out.extend(external::claude_sessions(&dir, &root));
+            out.extend(external::claude_sessions(&dir));
        }
        let home = self.shared.paths.home_dir.clone().or_else(home_dir);
        if let Some(home) = home {
-            out.extend(external::codex_sessions(&home.join(".codex"), &root));
+            out.extend(external::codex_sessions(&home.join(".codex")));
        }
        let known = self.imported_session_ids();
        out.retain(|s| !known.contains(&s.session_id));
@@ -944,38 +886,14 @@ impl AgentManager {
            }
            o.clone()
        };
-        let previous = target.current.clone();
-        // Cursor's `session/set_config_option` (Fast, effort) can take seconds. Show the
-        // choice first so the switch and slider move immediately.
-        apply_config_choice(&task, option, &value);
-        task.persist();
-        task.emit_task();
-
        let live = task.live.lock().clone().filter(|l| !l.peer.is_closed());
        let mut model_options =
-            target.category.as_deref() != Some("model") || previous.as_deref() == Some(value.as_str());
+            target.category.as_deref() != Some("model") || target.current.as_deref() == Some(value.as_str());
        if let Some(live) = live.filter(|_| option != config::CURSOR_APPROVAL) {
            let (method, mut params) = config::set_request(&target, &value);
            params["sessionId"] = json!(live.session);
-            let reply: Value = match live.peer.request(method, params, None).await {
-                Ok(reply) => reply,
-                Err(e) => {
-                    {
-                        let mut s = task.state.lock();
-                        s.wanted.retain(|c| c.id != option);
-                        if let Some(prev) = previous.clone() {
-                            s.wanted.push(AgentConfigChoice { id: option.to_owned(), value: prev });
-                        }
-                        if let Some(o) = s.task.config.iter_mut().find(|o| o.id == option) {
-                            o.current = previous.clone();
-                        }
-                        s.task.model = model_of(&s.task.config).or(s.task.model.take());
-                    }
-                    task.persist();
-                    task.emit_task();
-                    return Err(IdeError::internal(task.describe(e)));
-                }
-            };
+            let reply: Value =
+                live.peer.request(method, params, None).await.map_err(|e| IdeError::internal(task.describe(e)))?;
            if let Some(options) = reply.get("configOptions") {
                config::merge_update(&mut task.state.lock().task.config, options);
                model_options = true;
@@ -986,6 +904,8 @@ impl AgentManager {
            if !model_options {
                s.task.config.retain(|o| o.category.as_deref() != Some("thought_level"));
            }
+            s.wanted.retain(|c| c.id != option);
+            s.wanted.push(AgentConfigChoice { id: option.to_owned(), value: value.clone() });
            if let Some(o) = s.task.config.iter_mut().find(|o| o.id == option) {
                o.current = Some(value);
            }
@@ -1312,17 +1232,6 @@ impl AgentManager {
        };
        // A copy of the task (a fork) may work in the same worktree.
        let shared = self.tasks.read().values().any(|t| t.id != id && t.state.lock().task.cwd.0 == cwd);
-        self.tasks.write().remove(id);
-        *task.deleted.lock() = true;
-        let _ = std::fs::remove_file(self.shared.paths.store_dir.join(format!("{id}.json")));
-        let saved = task.state.lock().saved.clone();
-        if let Some(saved) = saved
-            && !self.tasks.read().values().any(|t| t.state.lock().saved.as_ref() == Some(&saved))
-        {
-            let _ = std::fs::remove_dir_all(self.shared.paths.store_dir.join(saved));
-        }
-        // The list drops the task now; removing a large worktree's folder can take a while.
-        self.shared.emit(AgentEvent::Removed { id: id.to_owned() });
        if remove_worktree && !shared && isolation == Isolation::Worktree && cwd.exists() {
            // On Windows the agent's processes lock the folder (their working directory,
            // open files) until they have exited.
@@ -1332,25 +1241,31 @@ impl AgentManager {
            let worktrees = self.shared.paths.worktrees_dir.clone();
            blocking(move || worktree::remove(&root, &worktrees, &cwd)).await?;
        }
+        self.tasks.write().remove(id);
+        *task.deleted.lock() = true;
+        let _ = std::fs::remove_file(self.shared.paths.store_dir.join(format!("{id}.json")));
+        let saved = task.state.lock().saved.clone();
+        if let Some(saved) = saved
+            && !self.tasks.read().values().any(|t| t.state.lock().saved.as_ref() == Some(&saved))
+        {
+            let _ = std::fs::remove_dir_all(self.shared.paths.store_dir.join(saved));
+        }
+        self.shared.emit(AgentEvent::Removed { id: id.to_owned() });
        Ok(())
    }

    /// Files the task changed since it started.
    pub async fn changes(&self, id: &str) -> IdeResult<Vec<AgentChange>> {
        let task = self.task(id)?;
-        let at = task.base();
+        let (cwd, base) = task.cwd_and_base();
        let before = task.state.lock().before.clone();
-        blocking(move || at.changes(&before)).await
+        blocking(move || Ok(worktree::without_untouched(worktree::changes(&cwd, &base)?, &before))).await
    }

    /// Content of `path` (in the task's directory) when the task started.
    pub async fn base_text(&self, id: &str, path: PathBuf) -> IdeResult<Option<String>> {
-        let at = self.task(id)?.base();
-        blocking(move || match at.rev()? {
-            Some(rev) => worktree::file_at(at.cwd(), &path, &rev),
-            None => Ok(None),
-        })
-        .await
+        let (cwd, base) = self.task(id)?.cwd_and_base();
+        blocking(move || worktree::file_at(&cwd, &path, &base)).await
    }

    /// Rollback: puts the task's changed files among `rel_paths` (all with `None`) back as they
@@ -1360,28 +1275,19 @@ impl AgentManager {
        if task.state.lock().busy {
            return Err(IdeError::invalid("the agent is working: stop it before rolling back its changes"));
        }
-        let at = task.base();
+        let (cwd, base) = task.cwd_and_base();
        let (before, saved) = {
            let s = task.state.lock();
            (s.before.clone(), s.saved.as_ref().map(|name| self.shared.paths.store_dir.join(name)))
        };
        let restamped = blocking(move || {
-            let changes = at.changes(&before)?;
-            let rev = at.rev()?;
-            let sources = match rev.as_deref() {
-                Some(rev) => worktree::rename_sources(at.cwd(), rev)?,
-                None => Default::default(),
-            };
+            let changes = worktree::without_untouched(worktree::changes(&cwd, &base)?, &before);
            let mut restamped = Vec::new();
            for change in changes.iter().filter(|c| rel_paths.as_ref().is_none_or(|p| p.contains(&c.rel_path))) {
-                // A rename goes back to its old path too; the new one is taken away first, so a
-                // case-only rename on a case-insensitive disk ends as the old file.
-                for change in std::iter::once(change).chain(sources.get(&change.rel_path)) {
-                    worktree::restore(at.cwd(), rev.as_deref(), change, &before, saved.as_deref())?;
-                    // Back to the user's own edits: not a change of the task any more.
-                    if before.contains_key(&change.rel_path) {
-                        restamped.push((change.rel_path.clone(), worktree::stamp(&change.path.0)));
-                    }
+                worktree::restore(&cwd, &base, change, &before, saved.as_deref())?;
+                // Back to the user's own edits: not a change of the task any more.
+                if before.contains_key(&change.rel_path) {
+                    restamped.push((change.rel_path.clone(), worktree::stamp(&change.path.0)));
                }
            }
            Ok(restamped)
@@ -1397,41 +1303,6 @@ impl AgentManager {
        Ok(())
    }

-    /// Accept: copies the task's changed files among `rel_paths` (all with `None`) from its
-    /// worktree into the local checkout, uncommitted, for the user to review and commit.
-    /// Files the checkout changed itself are left alone and reported. Only worktree tasks
-    /// have anything to accept.
-    pub async fn accept_changes(&self, id: &str, rel_paths: Option<Vec<String>>) -> IdeResult<AgentAcceptOutcome> {
-        let task = self.task(id)?;
-        if task.state.lock().busy {
-            return Err(IdeError::invalid("the agent is working: stop it before accepting its changes"));
-        }
-        let (isolation, cwd, base, root, before) = {
-            let s = task.state.lock();
-            (
-                s.task.isolation,
-                s.task.cwd.0.clone(),
-                s.task.base_commit.clone(),
-                s.task.project_root.clone().map(|p| p.0).unwrap_or_else(|| self.shared.paths.project_root.clone()),
-                (*s.before).clone(),
-            )
-        };
-        if isolation != Isolation::Worktree {
-            return Err(IdeError::invalid("the task works in the local checkout: there is nothing to accept"));
-        }
-        let Some(base) = base else {
-            return Err(IdeError::invalid("the task has no base revision to accept from"));
-        };
-        blocking(move || {
-            let wanted: Vec<AgentChange> = worktree::without_untouched(worktree::changes(&cwd, &base)?, &before)
-                .into_iter()
-                .filter(|c| rel_paths.as_ref().is_none_or(|p| p.contains(&c.rel_path)))
-                .collect();
-            worktree::accept(&root, &cwd, &base, &wanted)
-        })
-        .await
-    }
-
    /// Stops every agent (project closed).
    pub fn shutdown(&self) {
        for task in self.tasks.read().values() {
@@ -1482,15 +1353,15 @@ impl Task {
        })
    }

-    fn base(&self) -> worktree::TaskBase {
+    fn cwd_and_base(&self) -> (PathBuf, String) {
        let s = self.state.lock();
-        let cwd = s.task.cwd.0.clone();
-        match s.task.isolation {
-            Isolation::Local => worktree::TaskBase::Local { cwd, start: s.task.base_commit.clone() },
-            Isolation::Worktree => {
-                worktree::TaskBase::Worktree { cwd, base: s.task.base_commit.clone().unwrap_or_else(|| "HEAD".into()) }
-            }
-        }
+        // In the project's own checkout the user commits too: compare against the current HEAD,
+        // as the Commit tool window does, so commits made since the task started drop out.
+        let base = match s.task.isolation {
+            Isolation::Local => None,
+            Isolation::Worktree => s.task.base_commit.clone(),
+        };
+        (s.task.cwd.0.clone(), base.unwrap_or_else(|| "HEAD".into()))
    }

    fn emit_task(&self) {
@@ -2250,44 +2121,6 @@ impl Task {
            .iter()
            .map(|question| question.answer_key.clone().unwrap_or_else(|| question.question.clone()))
            .collect();
-        if let Some(hook) = self.shared.security.read().clone()
-            && let Some(command) = security::extract_command(params)
-        {
-            match security::evaluate_command(&command, &hook()) {
-                security::PolicyDecision::Blocked(pattern) => {
-                    let reject = options.iter().find(|o| o.kind.starts_with("reject")).cloned();
-                    let _ = self.push_entry(AgentEntry::Permission {
-                        id,
-                        title,
-                        options,
-                        questions: Vec::new(),
-                        chosen: Some(format!("Blocked by policy ({pattern})")),
-                    });
-                    return match reject {
-                        Some(option) => json!({ "outcome": { "outcome": "selected", "optionId": option.id } }),
-                        None => json!({ "outcome": { "outcome": "cancelled" } }),
-                    };
-                }
-                security::PolicyDecision::Allowed => {
-                    if let Some(allow) = options
-                        .iter()
-                        .find(|o| o.kind == "allow_once")
-                        .or_else(|| options.iter().find(|o| o.kind.starts_with("allow")))
-                        .cloned()
-                    {
-                        let _ = self.push_entry(AgentEntry::Permission {
-                            id,
-                            title,
-                            options,
-                            questions: Vec::new(),
-                            chosen: Some(format!("{} (whitelisted)", allow.name)),
-                        });
-                        return json!({ "outcome": { "outcome": "selected", "optionId": allow.id } });
-                    }
-                }
-                security::PolicyDecision::AskUser => {}
-            }
-        }
        let (tx, rx) = std::sync::mpsc::channel();
        let entry =
            self.push_entry(AgentEntry::Permission { id, title, options: options.clone(), questions, chosen: None });
@@ -2601,7 +2434,7 @@ fn with_details(message: String, data: Option<&Value>) -> String {
    }
 }

-pub(crate) fn client_info() -> Value {
+fn client_info() -> Value {
    json!({ "name": "OpenIDEA", "version": env!("CARGO_PKG_VERSION") })
 }

@@ -2660,16 +2493,6 @@ fn retry_of(update: &Value, now: f64) -> Option<AgentRetry> {
    })
 }

-fn apply_config_choice(task: &Task, option: &str, value: &str) {
-    let mut s = task.state.lock();
-    s.wanted.retain(|c| c.id != option);
-    s.wanted.push(AgentConfigChoice { id: option.to_owned(), value: value.to_owned() });
-    if let Some(o) = s.task.config.iter_mut().find(|o| o.id == option) {
-        o.current = Some(value.to_owned());
-    }
-    s.task.model = model_of(&s.task.config).or(s.task.model.take());
-}
-
 fn model_of(config: &[AgentConfigOption]) -> Option<String> {
    config.iter().find(|o| o.category.as_deref() == Some("model")).and_then(|o| o.current.clone())
 }
@@ -602,49 +602,3 @@ pub struct McpServerInput {
 fn default_true() -> bool {
    true
 }
-
-/// Payload for creating a custom ACP agent (always the ACP driver); the id
-/// becomes the `<config>/agents/<id>.toml` file name.
-#[derive(Clone, Debug, Deserialize, Type)]
-#[serde(rename_all = "camelCase", deny_unknown_fields)]
-pub struct CustomAgentInput {
-    pub id: String,
-    pub name: String,
-    pub command: String,
-    #[serde(default)]
-    pub args: Vec<String>,
-    #[serde(default)]
-    pub env: BTreeMap<String, String>,
-}
-
-/// What importing one entry of a JetBrains `acp.json` file did.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct AcpImportOutcome {
-    /// The `agent_servers` key the entry was imported from.
-    pub name: String,
-    /// The id its agent file would get (also when skipped).
-    pub id: String,
-    pub saved: bool,
-    /// Why the entry was skipped; empty when it was saved.
-    #[serde(default)]
-    pub reason: String,
-}
-
-/// What accepting a worktree task's changes copied into the local checkout.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct AgentAcceptOutcome {
-    /// Relative paths copied into the checkout (uncommitted), including ones already identical.
-    pub accepted: Vec<String>,
-    /// Files left alone because the checkout has its own edits to them.
-    pub skipped: Vec<AgentAcceptSkipped>,
-}
-
-/// A file accept left alone, with why.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct AgentAcceptSkipped {
-    pub path: String,
-    pub reason: String,
-}
@@ -31,7 +31,7 @@ pub(super) fn transcript(config_dir: &Path, cwd: &Path, id: &str) -> PathBuf {
 }

 /// The project directory name Claude Code uses for `cwd`.
-pub(crate) fn escape(cwd: &Path) -> String {
+pub(super) fn escape(cwd: &Path) -> String {
    cwd.to_string_lossy().chars().map(|c| if c.is_ascii_alphanumeric() { c } else { '-' }).collect()
 }

@@ -2,7 +2,7 @@
 //! `<config>/agents/<id>.toml` (written by hand, or by installing one from the ACP
 //! Registry, see `registry`).

-use crate::{AcpImportOutcome, AgentCommandReadOnlyReason, AgentProvider, AgentSource, CustomAgentInput};
+use crate::{AgentCommandReadOnlyReason, AgentProvider, AgentSource};
 use ide_core::{IdeError, IdeResult};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
@@ -278,127 +278,6 @@ fn update_builtin(custom_dir: &Path, id: &str, change: impl FnOnce(&mut CustomAg
    Ok(())
 }

-/// Saves a new custom agent; refuses built-in and ACP Registry ids, taken ids
-/// and an empty command. The id is also the agent file's name, so it must be
-/// a safe file stem.
-pub(crate) fn save_custom(custom_dir: &Path, input: &CustomAgentInput) -> IdeResult<()> {
-    let id = validated_custom_id(&input.id)?;
-    if builtin_spec(&id).is_some() {
-        return Err(IdeError::invalid(format!("{id} is a built-in agent; change its command instead")));
-    }
-    if input.command.trim().is_empty() {
-        return Err(IdeError::invalid("the agent command must not be empty"));
-    }
-    let file = custom_dir.join(format!("{id}.toml"));
-    if file.try_exists()? {
-        if CustomAgent::read(&file).is_ok_and(|a| a.registry.is_some()) {
-            return Err(IdeError::invalid(format!(
-                "{id} is installed from the ACP Registry; uninstall it there to replace it"
-            )));
-        }
-        return Err(IdeError::invalid(format!("there is already a custom agent '{id}'")));
-    }
-    CustomAgent {
-        name: Some(input.name.clone()),
-        driver: Driver::Acp,
-        command: input.command.clone(),
-        args: input.args.clone(),
-        env: input.env.clone(),
-        registry: None,
-    }
-    .write(&file)?;
-    Ok(())
-}
-
-/// Removes a custom agent's file; refuses built-in, ACP Registry and missing ids.
-pub(crate) fn remove_custom(custom_dir: &Path, id: &str) -> IdeResult<()> {
-    let id = validated_custom_id(id)?;
-    let id = id.as_str();
-    if builtin_spec(id).is_some() {
-        return Err(IdeError::invalid(format!("{id} is a built-in agent and cannot be removed")));
-    }
-    let file = custom_dir.join(format!("{id}.toml"));
-    let agent =
-        CustomAgent::read(&file).map_err(|_| IdeError::not_found(format!("there is no custom agent '{id}'")))?;
-    if agent.registry.is_some() {
-        return Err(IdeError::invalid(format!("{id} is installed from the ACP Registry; uninstall it there")));
-    }
-    match std::fs::remove_file(&file) {
-        Err(e) if e.kind() != std::io::ErrorKind::NotFound => Err(e.into()),
-        _ => Ok(()),
-    }
-}
-
-/// Imports a JetBrains `acp.json` file's `agent_servers` entries as custom
-/// agents, one outcome per entry; entries that collide, lack a command or
-/// have no usable name are skipped with a reason.
-pub(crate) fn import_acp(custom_dir: &Path, text: &str) -> IdeResult<Vec<AcpImportOutcome>> {
-    #[derive(Deserialize)]
-    struct AcpJson {
-        #[serde(default)]
-        agent_servers: BTreeMap<String, AcpServer>,
-    }
-    #[derive(Deserialize)]
-    struct AcpServer {
-        #[serde(default)]
-        command: String,
-        #[serde(default)]
-        args: Vec<String>,
-        #[serde(default)]
-        env: BTreeMap<String, String>,
-    }
-    let parsed: AcpJson =
-        serde_json::from_str(text).map_err(|e| IdeError::invalid(format!("not an acp.json file: {e}")))?;
-    let mut outcomes = Vec::with_capacity(parsed.agent_servers.len());
-    for (name, server) in parsed.agent_servers {
-        let id = slugify_id(&name);
-        let mut outcome = AcpImportOutcome { name, id: id.clone(), saved: false, reason: String::new() };
-        if id.is_empty() {
-            outcome.reason = "the name has no usable characters for an id".to_owned();
-        } else if builtin_spec(&id).is_some() {
-            outcome.reason = format!("{id} is a built-in agent");
-        } else if server.command.trim().is_empty() {
-            outcome.reason = "the entry has no command".to_owned();
-        } else if custom_dir.join(format!("{id}.toml")).try_exists()? {
-            outcome.reason = format!("there is already a custom agent '{id}'");
-        } else {
-            CustomAgent {
-                name: Some(outcome.name.clone()),
-                driver: Driver::Acp,
-                command: server.command,
-                args: server.args,
-                env: server.env,
-                registry: None,
-            }
-            .write(&custom_dir.join(format!("{id}.toml")))?;
-            outcome.saved = true;
-        }
-        outcomes.push(outcome);
-    }
-    Ok(outcomes)
-}
-
-/// A custom agent id doubles as a file stem: letters, digits, `-` and `_` only.
-fn validated_custom_id(id: &str) -> IdeResult<String> {
-    if !id.is_empty() && id.chars().all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_') {
-        return Ok(id.to_owned());
-    }
-    Err(IdeError::invalid(format!("'{id}' is not a usable agent id (letters, digits, '-' and '_' only)")))
-}
-
-/// Turns an `acp.json` server name into a file-stem id (`"My Agent!"` → `"my-agent"`).
-fn slugify_id(name: &str) -> String {
-    let mut id = String::with_capacity(name.len());
-    for c in name.chars() {
-        if c.is_ascii_alphanumeric() {
-            id.push(c.to_ascii_lowercase());
-        } else if !id.ends_with('-') {
-            id.push('-');
-        }
-    }
-    id.trim_matches('-').to_owned()
-}
-
 /// An agent file, `<config>/agents/<id>.toml`.
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
@@ -874,80 +753,4 @@ mod tests {
        assert_eq!(spec.source, AgentSource::Registry { version: "0.10.0".into(), update: None });
        assert!(toml::from_str::<CustomAgent>("command = \"x\"\n[registry]\nid = \"x\"\n").is_err());
    }
-
-    fn custom_input(id: &str) -> CustomAgentInput {
-        CustomAgentInput {
-            id: id.into(),
-            name: "Mine".into(),
-            command: "/opt/mine".into(),
-            args: vec!["acp".into()],
-            env: BTreeMap::from([("K".to_owned(), "v".to_owned())]),
-        }
-    }
-
-    #[test]
-    fn custom_agents_save_list_and_remove() {
-        let dir = tempfile::tempdir().unwrap();
-        save_custom(dir.path(), &custom_input("mine")).unwrap();
-        let mine = load(Some(dir.path())).into_iter().find(|s| s.id == "mine").unwrap();
-        assert_eq!((mine.name.as_str(), mine.command.as_str()), ("Mine", "/opt/mine"));
-        assert_eq!(mine.env, vec![("K".to_owned(), "v".to_owned())]);
-        assert_eq!(mine.source, AgentSource::Custom);
-        remove_custom(dir.path(), "mine").unwrap();
-        assert!(!load(Some(dir.path())).iter().any(|s| s.id == "mine"));
-        remove_custom(dir.path(), "mine").unwrap_err();
-    }
-
-    #[test]
-    fn custom_agents_refuse_builtin_registry_and_bad_ids() {
-        let dir = tempfile::tempdir().unwrap();
-        save_custom(dir.path(), &custom_input("claude")).unwrap_err();
-        save_custom(dir.path(), &custom_input("../evil")).unwrap_err();
-        save_custom(dir.path(), &custom_input("")).unwrap_err();
-        let mut empty_command = custom_input("mine");
-        empty_command.command = "  ".into();
-        save_custom(dir.path(), &empty_command).unwrap_err();
-        save_custom(dir.path(), &custom_input("mine")).unwrap();
-        save_custom(dir.path(), &custom_input("mine")).unwrap_err();
-        remove_custom(dir.path(), "claude").unwrap_err();
-        // An id that isn't a plain file stem never reaches outside the agents directory.
-        let outside = dir.path().join("outside.toml");
-        std::fs::write(&outside, "command = \"/bin/sh\"\n").unwrap();
-        let agents = dir.path().join("agents");
-        std::fs::create_dir(&agents).unwrap();
-        remove_custom(&agents, "../outside").unwrap_err();
-        assert!(outside.exists());
-        std::fs::write(
-            dir.path().join("amp-acp.toml"),
-            "command = \"/registry/amp\"\n[registry]\nid = \"amp-acp\"\nversion = \"1.0\"\n",
-        )
-        .unwrap();
-        save_custom(dir.path(), &custom_input("amp-acp")).unwrap_err();
-        remove_custom(dir.path(), "amp-acp").unwrap_err();
-    }
-
-    #[test]
-    fn acp_json_imports_servers_and_skips_collisions() {
-        let dir = tempfile::tempdir().unwrap();
-        save_custom(dir.path(), &custom_input("taken")).unwrap();
-        let outcomes = import_acp(
-            dir.path(),
-            r#"{"agent_servers": {
-                "My Agent!": {"command": "/opt/agent", "args": ["--acp"], "env": {"K": "v"}},
-                "taken": {"command": "/opt/taken"},
-                "claude": {"command": "/opt/claude"},
-                "!!!": {"command": "/opt/noname"},
-                "silent": {"args": []}
-            }}"#,
-        )
-        .unwrap();
-        let saved: Vec<&str> = outcomes.iter().filter(|o| o.saved).map(|o| o.id.as_str()).collect();
-        assert_eq!(saved, ["my-agent"]);
-        assert!(outcomes.iter().filter(|o| !o.saved).all(|o| !o.reason.is_empty()));
-        let mine = load(Some(dir.path())).into_iter().find(|s| s.id == "my-agent").unwrap();
-        assert_eq!((mine.name.as_str(), mine.command.as_str()), ("My Agent!", "/opt/agent"));
-        assert_eq!(mine.source, AgentSource::Custom);
-        import_acp(dir.path(), "not json").unwrap_err();
-        assert!(import_acp(dir.path(), "{}").unwrap().is_empty());
-    }
 }
@@ -1,487 +0,0 @@
-//! Command execution security policy (Whitelist / Blacklist) for coding agents.
-
-use ide_core::settings::AgentSecuritySettings;
-use serde_json::Value;
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum PolicyDecision {
-    /// Command matched a blacklist pattern (`pattern`).
-    Blocked(String),
-    /// Command matched the whitelist and no blacklist pattern.
-    Allowed,
-    /// Neither matched; prompt the user as usual.
-    AskUser,
-}
-
-/// Extracts the shell command string from an ACP `session/request_permission` payload
-/// when the request is for executing a command.
-pub fn extract_command(params: &Value) -> Option<String> {
-    let tool = params.get("toolCall").or_else(|| params.pointer("/subject/toolCall"))?;
-    let raw_cmd = tool.pointer("/rawInput/command").or_else(|| tool.pointer("/rawInput/cmd"));
-    if let Some(cmd) = raw_cmd.and_then(command_from_value) {
-        return Some(cmd);
-    }
-    let kind = tool.get("kind").and_then(Value::as_str).unwrap_or_default();
-    let name = tool.get("name").and_then(Value::as_str).unwrap_or_default();
-    let title =
-        tool.get("title").and_then(Value::as_str).or_else(|| params.get("title").and_then(Value::as_str))?.trim();
-    if let Some(cmd) = title.strip_prefix("Run ").map(str::trim).filter(|s| !s.is_empty()) {
-        return Some(cmd.to_owned());
-    }
-    if (kind == "execute" || matches!(name, "Bash" | "PowerShell" | "Execute" | "Run" | "terminal"))
-        && !title.is_empty()
-        && title != "Terminal"
-        && title != "Run a command"
-    {
-        return Some(title.to_owned());
-    }
-    None
-}
-
-fn command_from_value(val: &Value) -> Option<String> {
-    match val {
-        Value::String(s) => {
-            let trimmed = s.trim();
-            (!trimmed.is_empty()).then(|| trimmed.to_owned())
-        }
-        Value::Array(items) => {
-            let words: Vec<&str> = items.iter().filter_map(Value::as_str).collect();
-            if words.is_empty() {
-                return None;
-            }
-            let cmd = match words.as_slice() {
-                [_, flag, script] if flag.starts_with('-') && flag.ends_with('c') => (*script).trim().to_owned(),
-                _ => words.join(" ").trim().to_owned(),
-            };
-            (!cmd.is_empty()).then_some(cmd)
-        }
-        _ => None,
-    }
-}
-
-/// Checks whether a single pattern matches `command` using prefix + glob rules:
-/// - If `pattern` contains `*` or `?`, matches using glob wildcards (where `*` matches
-///   any sequence of characters). A trailing ` *` in the pattern also matches the bare
-///   command without arguments (e.g. `git status *` matches `git status`).
-/// - Otherwise, matches when `command` equals `pattern` or starts with `pattern` followed
-///   by whitespace (prefix match at word boundary).
-pub fn matches_command(pattern: &str, command: &str) -> bool {
-    let pat = pattern.trim();
-    let cmd = command.trim();
-    if pat.is_empty() || cmd.is_empty() {
-        return false;
-    }
-    if pat.contains('*') || pat.contains('?') {
-        if let Some(stem) = pat.strip_suffix(" *")
-            && cmd == stem.trim()
-        {
-            return true;
-        }
-        wildcard_match(pat.as_bytes(), cmd.as_bytes())
-    } else {
-        cmd == pat || cmd.strip_prefix(pat).is_some_and(|rest| rest.starts_with(char::is_whitespace))
-    }
-}
-
-fn wildcard_match(pat: &[u8], text: &[u8]) -> bool {
-    let (mut p, mut t) = (0, 0);
-    let (mut star_p, mut star_t) = (None, 0);
-    while t < text.len() {
-        if p < pat.len() && (pat[p] == b'?' || pat[p] == text[t]) {
-            p += 1;
-            t += 1;
-        } else if p < pat.len() && pat[p] == b'*' {
-            star_p = Some(p);
-            p += 1;
-            star_t = t;
-        } else if let Some(sp) = star_p {
-            p = sp + 1;
-            star_t += 1;
-            t = star_t;
-        } else {
-            return false;
-        }
-    }
-    while p < pat.len() && pat[p] == b'*' {
-        p += 1;
-    }
-    p == pat.len()
-}
-
-/// Matches an allowed command entry against a sub-command.
-/// An allow entry is a whole command or a prefix only up to a word boundary:
-/// e.g. `git status` matches `git status` and `git status -s`, but NOT `git statusx`.
-/// Any accidental trailing `*` in the allow entry is stripped so `git status*` behaves
-/// cleanly as a prefix at word boundaries instead of a glob wildcard.
-pub fn matches_allow_entry(entry: &str, command: &str) -> bool {
-    let mut entry = entry.trim();
-    if let Some(stripped) = entry.strip_suffix('*') {
-        entry = stripped.trim_end();
-    }
-    let cmd = command.trim();
-    if entry.is_empty() || cmd.is_empty() {
-        return false;
-    }
-    cmd == entry || cmd.strip_prefix(entry).is_some_and(|rest| rest.starts_with(char::is_whitespace))
-}
-
-/// Checks whether a word is an environment variable assignment (`IDENTIFIER=...`).
-fn is_env_assignment_word(word: &str) -> bool {
-    let Some((name, _)) = word.split_once('=') else {
-        return false;
-    };
-    if name.is_empty() {
-        return false;
-    }
-    let mut chars = name.chars();
-    match chars.next() {
-        Some(c) if c.is_ascii_alphabetic() || c == '_' => {}
-        _ => return false,
-    }
-    chars.all(|c| c.is_ascii_alphanumeric() || c == '_')
-}
-
-/// Returns true if the sub-command starts with an environment variable assignment,
-/// e.g. `FOO=bar cmd` or `PORT=3000`.
-fn has_leading_env_assignment(cmd: &str) -> bool {
-    let trimmed = cmd.trim_start();
-    let bytes = trimmed.as_bytes();
-    let mut i = 0;
-    let mut quote: Option<u8> = None;
-    while i < bytes.len() {
-        let b = bytes[i];
-        if b == b'\\' && quote != Some(b'\'') && i + 1 < bytes.len() {
-            i += 2;
-            continue;
-        }
-        if let Some(q) = quote {
-            if b == q {
-                quote = None;
-            }
-            i += 1;
-            continue;
-        }
-        if b == b'\'' || b == b'"' {
-            quote = Some(b);
-            i += 1;
-            continue;
-        }
-        if b.is_ascii_whitespace() {
-            break;
-        }
-        i += 1;
-    }
-    let first_word = &trimmed[..i];
-    is_env_assignment_word(first_word)
-}
-
-/// Checks whether `command` contains shell constructs that must never be auto-approved:
-/// - Command substitution: `$(...)` or backticks
-/// - Redirection: `>`, `>>`, `<`
-/// - Here-docs: `<<`
-/// - Subshells: `(...)`
-/// - Leading environment assignments: `VAR=val cmd`
-pub fn has_unsafe_shell_syntax(command: &str) -> bool {
-    let cmd = command.trim();
-    if cmd.is_empty() {
-        return false;
-    }
-
-    if has_leading_env_assignment(cmd) {
-        return true;
-    }
-
-    let bytes = cmd.as_bytes();
-    let mut i = 0;
-    let mut quote: Option<u8> = None;
-
-    while i < bytes.len() {
-        let b = bytes[i];
-
-        if b == b'\\' && quote != Some(b'\'') && i + 1 < bytes.len() {
-            i += 2;
-            continue;
-        }
-
-        if let Some(q) = quote {
-            if b == q {
-                quote = None;
-                i += 1;
-                continue;
-            }
-            // Inside double quotes: $(...) and `...` are evaluated by the shell.
-            if q == b'"' {
-                if b == b'`' {
-                    return true;
-                }
-                if b == b'$' && i + 1 < bytes.len() && bytes[i + 1] == b'(' {
-                    return true;
-                }
-            }
-            i += 1;
-            continue;
-        }
-
-        match b {
-            b'\'' | b'"' => {
-                quote = Some(b);
-                i += 1;
-            }
-            b'`' => return true,
-            b'$' if i + 1 < bytes.len() && bytes[i + 1] == b'(' => return true,
-            b'<' | b'>' => return true,
-            b'(' | b')' => return true,
-            _ => i += 1,
-        }
-    }
-
-    false
-}
-
-/// Splits a shell command into sub-commands separated by `;`, `&&`, `||`, `|`, or `\n`
-/// (outside single/double quotes) so compound commands cannot bypass policy checks.
-fn split_subcommands(command: &str) -> Vec<&str> {
-    let bytes = command.as_bytes();
-    let mut out = Vec::new();
-    let mut start = 0;
-    let mut i = 0;
-    let mut quote: Option<u8> = None;
-
-    while i < bytes.len() {
-        let b = bytes[i];
-        if let Some(q) = quote {
-            if b == b'\\' && q == b'"' && i + 1 < bytes.len() {
-                i += 2;
-                continue;
-            }
-            if b == q {
-                quote = None;
-            }
-            i += 1;
-            continue;
-        }
-        match b {
-            b'\'' | b'"' => {
-                quote = Some(b);
-                i += 1;
-            }
-            b'\\' if i + 1 < bytes.len() => {
-                i += 2;
-            }
-            b';' | b'\n' => {
-                let seg = command[start..i].trim();
-                if !seg.is_empty() {
-                    out.push(seg);
-                }
-                i += 1;
-                start = i;
-            }
-            b'&' | b'|' => {
-                let seg = command[start..i].trim();
-                if !seg.is_empty() {
-                    out.push(seg);
-                }
-                if i + 1 < bytes.len() && bytes[i + 1] == b {
-                    i += 2;
-                } else {
-                    i += 1;
-                }
-                start = i;
-            }
-            _ => i += 1,
-        }
-    }
-    let tail = command[start..].trim();
-    if !tail.is_empty() {
-        out.push(tail);
-    }
-    out
-}
-
-/// Evaluates `command` against `settings`:
-/// 1. Blacklist takes precedence: if the full command or any sub-command matches a
-///    `blocked_commands` entry, returns [`PolicyDecision::Blocked`].
-/// 2. Whitelist: allowed_commands cannot auto-approve when empty.
-/// 3. Every sub-command in a chain must be safe (no command substitution, redirection,
-///    subshell, or env assignments) and match at least one `allowed_commands` entry
-///    exactly or up to word boundary; otherwise falls back to [`PolicyDecision::AskUser`].
-pub fn evaluate_command(command: &str, settings: &AgentSecuritySettings) -> PolicyDecision {
-    let cmd = command.trim();
-    if cmd.is_empty() {
-        return PolicyDecision::AskUser;
-    }
-    let subcommands = split_subcommands(cmd);
-
-    for pat in &settings.blocked_commands {
-        let pat = pat.trim();
-        if pat.is_empty() {
-            continue;
-        }
-        if matches_command(pat, cmd) || subcommands.iter().any(|sub| matches_command(pat, sub)) {
-            return PolicyDecision::Blocked(pat.to_owned());
-        }
-    }
-
-    if settings.allowed_commands.is_empty() || subcommands.is_empty() {
-        return PolicyDecision::AskUser;
-    }
-
-    let all_allowed = subcommands.iter().all(|sub| {
-        let s = sub.trim();
-        if s.is_empty() || has_unsafe_shell_syntax(s) {
-            return false;
-        }
-        settings.allowed_commands.iter().any(|entry| matches_allow_entry(entry, s))
-    });
-
-    if all_allowed {
-        return PolicyDecision::Allowed;
-    }
-
-    PolicyDecision::AskUser
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-
-    #[test]
-    fn prefix_and_glob_matching() {
-        assert!(matches_command("git status", "git status"));
-        assert!(matches_command("git status", "git status -s"));
-        assert!(!matches_command("git status", "git statusbar"));
-        assert!(matches_command("git status*", "git status"));
-        assert!(matches_command("git status*", "git status --short"));
-        assert!(matches_command("npm test *", "npm test"));
-        assert!(matches_command("npm test *", "npm test unit"));
-        assert!(matches_command("rm -rf *", "rm -rf /tmp/foo"));
-        assert!(matches_command("rm -rf *", "rm -rf /"));
-    }
-
-    #[test]
-    fn blacklist_takes_precedence_and_catches_chained_commands() {
-        let settings = AgentSecuritySettings::default();
-        assert_eq!(evaluate_command("rm -rf /tmp/build", &settings), PolicyDecision::Blocked("rm -rf *".into()));
-        assert_eq!(evaluate_command("git status && rm -rf /", &settings), PolicyDecision::Blocked("rm -rf *".into()));
-        assert_eq!(evaluate_command(":(){ :|:& };:", &settings), PolicyDecision::Blocked(":(){ :|:& };:".into()));
-    }
-
-    #[test]
-    fn allow_entry_matching_word_boundary() {
-        assert!(matches_allow_entry("git status", "git status"));
-        assert!(matches_allow_entry("git status", "git status -s"));
-        assert!(!matches_allow_entry("git status", "git statusbar"));
-        assert!(!matches_allow_entry("git status", "git statusx"));
-        // Trailing asterisk in allow entry normalizes cleanly to word boundary prefix
-        assert!(matches_allow_entry("git status*", "git status"));
-        assert!(matches_allow_entry("git status*", "git status --short"));
-        assert!(!matches_allow_entry("git status*", "git statusbar"));
-        assert!(matches_allow_entry("ls", "ls"));
-        assert!(matches_allow_entry("ls", "ls -la"));
-        assert!(!matches_allow_entry("ls", "lsof"));
-        assert!(matches_allow_entry("cargo check", "cargo check"));
-        assert!(matches_allow_entry("cargo check", "cargo check --workspace"));
-        assert!(!matches_allow_entry("cargo check", "cargo checkmate"));
-    }
-
-    #[test]
-    fn unsafe_shell_syntax_detection() {
-        // Command substitutions: $(...) and `...`
-        assert!(has_unsafe_shell_syntax("echo $(whoami)"));
-        assert!(has_unsafe_shell_syntax("echo \"user: $(whoami)\""));
-        assert!(has_unsafe_shell_syntax("echo `whoami`"));
-        assert!(has_unsafe_shell_syntax("echo \"`whoami`\""));
-
-        // Redirections: >, >>, <
-        assert!(has_unsafe_shell_syntax("git status > /tmp/out"));
-        assert!(has_unsafe_shell_syntax("git status >> /tmp/out"));
-        assert!(has_unsafe_shell_syntax("cat < /tmp/in"));
-        assert!(has_unsafe_shell_syntax("cat << 'EOF'"));
-
-        // Subshells: (...)
-        assert!(has_unsafe_shell_syntax("(cd /tmp && ls)"));
-        assert!(has_unsafe_shell_syntax("git status && (exit 1)"));
-
-        // Environment assignments: VAR=val ...
-        assert!(has_unsafe_shell_syntax("FOO=bar git status"));
-        assert!(has_unsafe_shell_syntax("PORT=3000 npm test"));
-        assert!(has_unsafe_shell_syntax("_SECRET=123 cargo test"));
-        assert!(has_unsafe_shell_syntax("A=\"b c\" git status"));
-
-        // Safe constructs with characters inside quotes or command flags
-        assert!(!has_unsafe_shell_syntax("git commit -m \"fix <bug> and (issue)\""));
-        assert!(!has_unsafe_shell_syntax("git commit -m 'fix <bug>'"));
-        assert!(!has_unsafe_shell_syntax("cargo test --test=unit"));
-        assert!(!has_unsafe_shell_syntax("git status -s"));
-    }
-
-    #[test]
-    fn default_settings_has_no_auto_approval_and_blocks_dangerous_defaults() {
-        let settings = AgentSecuritySettings::default();
-        assert!(settings.allowed_commands.is_empty(), "allowed_commands must start empty");
-        // Safe commands ask user by default
-        assert_eq!(evaluate_command("git status", &settings), PolicyDecision::AskUser);
-        assert_eq!(evaluate_command("ls", &settings), PolicyDecision::AskUser);
-        assert_eq!(evaluate_command("cargo check", &settings), PolicyDecision::AskUser);
-        // Blacklist patterns are still blocked by default
-        assert_eq!(evaluate_command("rm -rf /", &settings), PolicyDecision::Blocked("rm -rf *".into()));
-        assert_eq!(evaluate_command("rm -rf /tmp/test", &settings), PolicyDecision::Blocked("rm -rf *".into()));
-    }
-
-    #[test]
-    fn whitelist_allows_safe_single_and_chained_commands_only() {
-        let settings = AgentSecuritySettings {
-            allowed_commands: vec!["git status".into(), "git diff".into(), "cargo test".into()],
-            blocked_commands: vec!["rm -rf *".into()],
-        };
-        assert_eq!(evaluate_command("git status -s", &settings), PolicyDecision::Allowed);
-        assert_eq!(evaluate_command("git diff HEAD~1", &settings), PolicyDecision::Allowed);
-        assert_eq!(evaluate_command("git status && cargo test", &settings), PolicyDecision::Allowed);
-
-        // Word boundary: git statusx must not match git status
-        assert_eq!(evaluate_command("git statusx", &settings), PolicyDecision::AskUser);
-
-        // Unsafe syntax (redirection, command substitution, env assignment) falls back to AskUser
-        assert_eq!(evaluate_command("git status > out.txt", &settings), PolicyDecision::AskUser);
-        assert_eq!(evaluate_command("git status $(whoami)", &settings), PolicyDecision::AskUser);
-        assert_eq!(evaluate_command("FOO=bar git status", &settings), PolicyDecision::AskUser);
-
-        // Chaining an unapproved command must still ask the user.
-        assert_eq!(evaluate_command("git status && curl https://example.com", &settings), PolicyDecision::AskUser);
-        assert_eq!(evaluate_command("cargo publish", &settings), PolicyDecision::AskUser);
-
-        // Blacklist still takes precedence over whitelist
-        assert_eq!(evaluate_command("git status && rm -rf /", &settings), PolicyDecision::Blocked("rm -rf *".into()));
-    }
-
-    #[test]
-    fn extracts_command_from_v1_v2_and_codex_payloads() {
-        let claude = json!({
-            "toolCall": {
-                "title": "git status",
-                "kind": "execute",
-                "rawInput": { "command": "git status --short" }
-            }
-        });
-        assert_eq!(extract_command(&claude).as_deref(), Some("git status --short"));
-
-        let codex = json!({
-            "toolCall": {
-                "title": "Run cargo test",
-                "kind": "execute",
-                "rawInput": { "command": ["/bin/zsh", "-lc", "cargo test --workspace"] }
-            }
-        });
-        assert_eq!(extract_command(&codex).as_deref(), Some("cargo test --workspace"));
-
-        let write = json!({
-            "toolCall": {
-                "title": "Write foo.txt",
-                "kind": "edit",
-                "rawInput": { "file_path": "foo.txt" }
-            }
-        });
-        assert_eq!(extract_command(&write), None);
-    }
-}
@@ -43,11 +43,6 @@ struct FakeAgent {
    /// Hold the late mode reply until the prompt's permission request is already waiting.
    hold_late_mode: bool,
    empty_config: AtomicBool,
-    /// Blocks `session/new` until discovery times out (see `acp::discover` test timeout).
-    hold_session_new: AtomicBool,
-    /// Sleeps this long at the start of `session/set_config_option`, after noting the time.
-    delay_config: Duration,
-    config_entered: Mutex<Option<std::time::Instant>>,
    /// Config options `session/new` reports after the model one (per-model efforts, say).
    extra_options: Mutex<Vec<Value>>,
    model_options: Mutex<HashMap<String, Vec<Value>>>,
@@ -162,9 +157,6 @@ impl Handler for FakeAgent {
                )
            }
            "session/new" => {
-                if self.hold_session_new.load(Ordering::Acquire) {
-                    std::thread::sleep(Duration::from_secs(5));
-                }
                if self.empty_config.load(Ordering::Acquire) {
                    return Ok(json!({"sessionId": "s1"}));
                }
@@ -198,10 +190,6 @@ impl Handler for FakeAgent {
                }
            }
            "session/set_config_option" | "session/set_mode" => {
-                if method == "session/set_config_option" && !self.delay_config.is_zero() {
-                    *self.config_entered.lock() = Some(std::time::Instant::now());
-                    std::thread::sleep(self.delay_config);
-                }
                self.calls.lock().push(format!("{method} {}", params.get("value").or(params.get("modeId")).unwrap()));
                if params["configId"] == "model" && !self.model_options.lock().is_empty() {
                    return Ok(json!({"configOptions": self.options_for(params["value"].as_str().unwrap())}));
@@ -492,7 +480,7 @@ for line in sys.stdin:
        }
        let concurrent = async {
            if outcome == "session_report" {
-                tokio::time::timeout(Duration::from_secs(10), async {
+                tokio::time::timeout(Duration::from_secs(2), async {
                    while !root.join("initialized").exists() {
                        tokio::time::sleep(Duration::from_millis(10)).await;
                    }
@@ -564,7 +552,7 @@ for line in sys.stdin:
            };
            assert_eq!(subtypes, expected, "{outcome}");
            let pid = std::fs::read_to_string(root.join("pid")).unwrap();
-            tokio::time::timeout(Duration::from_secs(10), async {
+            tokio::time::timeout(Duration::from_secs(2), async {
                while std::process::Command::new("kill").args(["-0", pid.trim()]).output().unwrap().status.success() {
                    tokio::time::sleep(Duration::from_millis(10)).await;
                }
@@ -2643,92 +2631,6 @@ async fn session_settings_win_over_discovery_in_memory_and_on_disk() {
    }
 }

-#[tokio::test(flavor = "multi_thread")]
-async fn provider_reload_does_not_start_acp_discovery() {
-    let agent = Arc::new(FakeAgent::default());
-    let mgr = manager(tempfile::tempdir().unwrap().path(), agent.clone());
-    mgr.reload_providers();
-    tokio::time::sleep(Duration::from_millis(100)).await;
-    assert!(agent.calls.lock().is_empty(), "reload must not spawn cursor-agent");
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn composer_commands_discover_cursor_effort_and_fast() {
-    let agent = Arc::new(FakeAgent {
-        extra_options: Mutex::new(vec![
-            json!({"id": "effort", "type": "select", "currentValue": "medium",
-                "options": [{"value": "low"}, {"value": "medium"}, {"value": "high"}]}),
-            json!({"id": "fast", "type": "select", "currentValue": "false",
-                "options": [{"value": "false", "name": "Off"}, {"value": "true", "name": "On"}]}),
-        ]),
-        ..Default::default()
-    });
-    let mgr = manager(tempfile::tempdir().unwrap().path(), agent.clone());
-    mgr.commands("cursor", None).await.unwrap();
-    let calls = agent.calls.lock();
-    assert!(calls.iter().any(|m| m.as_str() == "session/new"));
-    assert_eq!(calls.iter().filter(|m| m.as_str() == "initialize").count(), 1);
-    let cursor = mgr.providers().into_iter().find(|p| p.id == "cursor").unwrap();
-    assert_eq!(cursor.config.iter().find(|o| o.id == "fast").unwrap().current.as_deref(), Some("false"));
-    assert!(
-        cursor
-            .thought_levels
-            .values()
-            .next()
-            .is_some_and(|levels| { levels.iter().any(|o| o.category.as_deref() == Some("thought_level")) })
-    );
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn config_choice_shows_before_the_agent_answers() {
-    let agent = Arc::new(FakeAgent {
-        extra_options: Mutex::new(vec![json!({
-            "id": "fast", "category": "model_config", "type": "select", "currentValue": "true",
-            "options": [{"value": "true", "name": "On"}, {"value": "false", "name": "Off"}]
-        })]),
-        delay_config: Duration::from_millis(300),
-        ..Default::default()
-    });
-    let mgr = manager(tempfile::tempdir().unwrap().path(), agent.clone());
-    let shown: Arc<Mutex<Option<std::time::Instant>>> = Arc::default();
-    let mark = shown.clone();
-    mgr.subscribe(Arc::new(move |e| {
-        if let AgentEvent::Task { task } = e
-            && task.config.iter().any(|o| o.id == "fast" && o.current.as_deref() == Some("false"))
-            && mark.lock().is_none()
-        {
-            *mark.lock() = Some(std::time::Instant::now());
-        }
-    }));
-    let task = mgr
-        .create(NewAgentTask {
-            project_root: None,
-            prompt: text("again"),
-            provider: "claude".into(),
-            config: vec![],
-            isolation: Isolation::Local,
-            base: None,
-        })
-        .await
-        .unwrap();
-    wait_for(&mgr, &task.id, AgentStatus::Ready).await;
-    mgr.set_config(&task.id, "fast", "false".into()).await.unwrap();
-    let shown = (*shown.lock()).expect("the switch moved");
-    let entered = (*agent.config_entered.lock()).expect("the agent received the change");
-    assert!(shown < entered, "the composer updates before the agent answers");
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn discovery_times_out_when_session_new_hangs() {
-    let agent = Arc::new(FakeAgent { hold_session_new: AtomicBool::new(true), ..Default::default() });
-    let mgr = manager(tempfile::tempdir().unwrap().path(), agent.clone());
-    let started = std::time::Instant::now();
-    mgr.commands("cursor", None).await.unwrap();
-    assert!(started.elapsed() < Duration::from_secs(10), "discovery should time out quickly in tests");
-    let cursor = mgr.providers().into_iter().find(|p| p.id == "cursor").unwrap();
-    assert!(!cursor.config.iter().any(|o| o.category.as_deref() == Some("model")));
-}
-
 #[tokio::test(flavor = "multi_thread")]
 async fn discovered_effort_levels_fill_models_no_session_has_reported() {
    let tmp = tempfile::tempdir().unwrap();
@@ -2868,301 +2770,3 @@ async fn rolling_back_restores_the_start_of_the_task_and_keeps_the_users_own_edi
    mgr.delete(&task.id, false).await.unwrap();
    assert!(!dir.join("store").join(format!("{}.before", task.id)).exists());
 }
-
-/// A git repository in a temporary folder, for local tasks whose checkout moves under them.
-struct Checkout {
-    _tmp: tempfile::TempDir,
-    dir: PathBuf,
-    eol: Eol,
-}
-
-/// How the checkout keeps line endings: as committed, or CRLF on disk with `core.autocrlf`
-/// (Git for Windows' default), where the files' bytes never equal the committed blobs.
-#[derive(Debug, Clone, Copy)]
-enum Eol {
-    Lf,
-    Crlf,
-}
-
-const EOLS: [Eol; 2] = [Eol::Lf, Eol::Crlf];
-
-impl Checkout {
-    fn new(eol: Eol) -> Self {
-        let tmp = tempfile::tempdir().unwrap();
-        let dir = dunce::canonicalize(tmp.path()).unwrap();
-        let checkout = Self { _tmp: tmp, dir, eol };
-        checkout.git(&["init", "-q", "-b", "main"]);
-        let autocrlf = match eol {
-            Eol::Lf => "false",
-            Eol::Crlf => "true",
-        };
-        checkout.git(&["config", "core.autocrlf", autocrlf]);
-        checkout.write(".gitignore", "store/\nworktrees/\nagents/\nmodels.json\n");
-        checkout
-    }
-
-    fn git(&self, args: &[&str]) {
-        let ok = std::process::Command::new("git")
-            .args(["-c", "user.name=t", "-c", "user.email=t@t", "-c", "commit.gpgsign=false"])
-            .args(args)
-            .current_dir(&self.dir)
-            .status()
-            .unwrap()
-            .success();
-        assert!(ok, "{args:?}");
-    }
-
-    fn commit(&self, message: &str) {
-        self.git(&["add", "."]);
-        self.git(&["commit", "-q", "-m", message]);
-    }
-
-    fn write(&self, rel: &str, text: &str) {
-        let text = match self.eol {
-            Eol::Lf => text.to_owned(),
-            Eol::Crlf => text.replace('\n', "\r\n"),
-        };
-        std::fs::write(self.dir.join(rel), text).unwrap();
-    }
-
-    /// The file's text with LF line endings (a rollback writes the committed bytes back).
-    fn read(&self, rel: &str) -> String {
-        std::fs::read_to_string(self.dir.join(rel)).unwrap().replace("\r\n", "\n")
-    }
-
-    /// A local task, stopped so it can be rolled back.
-    async fn task(&self) -> (AgentManager, AgentTask) {
-        let mgr = manager(&self.dir, Arc::new(FakeAgent::default()));
-        let task = mgr
-            .create(NewAgentTask {
-                project_root: None,
-                prompt: text("Hello"),
-                provider: "claude".into(),
-                config: Vec::new(),
-                isolation: Isolation::Local,
-                base: None,
-            })
-            .await
-            .unwrap();
-        wait_for(&mgr, &task.id, AgentStatus::NeedsInput).await;
-        mgr.cancel(&task.id, None).unwrap();
-        wait_for(&mgr, &task.id, AgentStatus::Ready).await;
-        (mgr, task)
-    }
-}
-
-async fn changed(mgr: &AgentManager, id: &str) -> Vec<String> {
-    mgr.changes(id).await.unwrap().into_iter().map(|c| c.rel_path).collect()
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn work_uncommitted_by_a_reset_during_a_local_task_is_not_rolled_back() {
-    for eol in EOLS {
-        let repo = Checkout::new(eol);
-        repo.write("a.txt", "base\n");
-        repo.write("mine.txt", "base\n");
-        repo.commit("init");
-        repo.write("mine.txt", "my work\n");
-        repo.commit("my work");
-        let (mgr, task) = repo.task().await;
-        repo.write("a.txt", "agent\n");
-        // The user takes the last commit back into the working tree (`git reset --soft`, an
-        // undone commit): its changes are the user's, not the agent's.
-        repo.git(&["reset", "-q", "--soft", "HEAD~1"]);
-        assert_eq!(changed(&mgr, &task.id).await, ["a.txt"], "{eol:?}");
-
-        let base = mgr.base_text(&task.id, repo.dir.join("a.txt")).await.unwrap();
-        assert_eq!(base.map(|b| b.replace("\r\n", "\n")).as_deref(), Some("base\n"), "{eol:?}");
-        mgr.rollback_changes(&task.id, None).await.unwrap();
-        assert_eq!(repo.read("a.txt"), "base\n", "{eol:?}");
-        assert_eq!(repo.read("mine.txt"), "my work\n", "{eol:?}: the user's work survives the rollback");
-        assert!(changed(&mgr, &task.id).await.is_empty(), "{eol:?}");
-    }
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn files_a_mixed_reset_during_a_local_task_leaves_behind_are_not_rolled_back() {
-    for eol in EOLS {
-        let repo = Checkout::new(eol);
-        repo.write("a.txt", "base\n");
-        repo.write("mine.txt", "base\n");
-        repo.commit("init");
-        repo.write("mine.txt", "my work\n");
-        repo.write("mine-new.txt", "my new file\n");
-        repo.commit("my work");
-        let (mgr, task) = repo.task().await;
-        repo.write("a.txt", "agent\n");
-        // `git reset HEAD~1`: the commit's new file is untracked now, its edit unstaged.
-        repo.git(&["reset", "-q", "HEAD~1"]);
-        assert_eq!(changed(&mgr, &task.id).await, ["a.txt"], "{eol:?}");
-
-        mgr.rollback_changes(&task.id, None).await.unwrap();
-        assert_eq!(repo.read("a.txt"), "base\n", "{eol:?}");
-        assert_eq!(repo.read("mine.txt"), "my work\n", "{eol:?}");
-        assert_eq!(repo.read("mine-new.txt"), "my new file\n", "{eol:?}");
-    }
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn a_branch_switched_to_during_a_local_task_is_left_alone() {
-    for eol in EOLS {
-        let repo = Checkout::new(eol);
-        repo.write("a.txt", "base\n");
-        repo.write("other.txt", "base\n");
-        repo.commit("init");
-        repo.git(&["checkout", "-q", "-b", "feature"]);
-        repo.write("other.txt", "feature\n");
-        repo.write("only-feature.txt", "feature\n");
-        repo.commit("feature");
-        repo.git(&["checkout", "-q", "main"]);
-        repo.write("only-main.txt", "main\n");
-        repo.commit("main");
-        let (mgr, task) = repo.task().await;
-        repo.write("a.txt", "agent\n");
-        // The agent's uncommitted edit comes along to a branch that doesn't contain the task's start.
-        repo.git(&["checkout", "-q", "feature"]);
-        assert_eq!(changed(&mgr, &task.id).await, ["a.txt"], "{eol:?}");
-
-        mgr.rollback_changes(&task.id, None).await.unwrap();
-        assert_eq!(repo.read("a.txt"), "base\n", "{eol:?}");
-        assert_eq!(repo.read("other.txt"), "feature\n", "{eol:?}");
-        assert_eq!(repo.read("only-feature.txt"), "feature\n", "{eol:?}");
-        assert!(!repo.dir.join("only-main.txt").exists(), "{eol:?}");
-        assert!(changed(&mgr, &task.id).await.is_empty(), "{eol:?}");
-    }
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn commits_made_during_a_local_task_are_kept_by_its_rollback() {
-    for eol in EOLS {
-        let repo = Checkout::new(eol);
-        repo.write("a.txt", "base\n");
-        repo.commit("init");
-        let (mgr, task) = repo.task().await;
-        repo.write("a.txt", "agent\n");
-        repo.write("b.txt", "agent\n");
-        // The user commits what the agent did to `a.txt` so far: it drops out of the task's changes.
-        repo.git(&["add", "a.txt"]);
-        repo.git(&["commit", "-q", "-m", "keep"]);
-        assert_eq!(changed(&mgr, &task.id).await, ["b.txt"], "{eol:?}");
-        repo.write("a.txt", "agent\nagain\n");
-        assert_eq!(changed(&mgr, &task.id).await, ["a.txt", "b.txt"], "{eol:?}");
-
-        mgr.rollback_changes(&task.id, None).await.unwrap();
-        assert_eq!(repo.read("a.txt"), "agent\n", "{eol:?}: back to the commit, not to before it");
-        assert!(!repo.dir.join("b.txt").exists(), "{eol:?}");
-        assert!(changed(&mgr, &task.id).await.is_empty(), "{eol:?}");
-    }
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn rolling_back_a_rename_brings_the_old_file_back() {
-    for eol in EOLS {
-        let repo = Checkout::new(eol);
-        repo.write("Old.java", "class Old {}\n");
-        repo.write("Case.java", "class Case {}\n");
-        repo.commit("init");
-        let (mgr, task) = repo.task().await;
-        repo.git(&["mv", "Old.java", "New.java"]);
-        repo.git(&["mv", "Case.java", "CASE.java"]);
-        // Renames list their new path only.
-        let listed = changed(&mgr, &task.id).await;
-        assert_eq!(listed, ["CASE.java", "New.java"], "{eol:?}");
-
-        mgr.rollback_changes(&task.id, Some(listed)).await.unwrap();
-        assert_eq!(repo.read("Old.java"), "class Old {}\n", "{eol:?}");
-        assert!(!repo.dir.join("New.java").exists(), "{eol:?}");
-        assert_eq!(repo.read("Case.java"), "class Case {}\n", "{eol:?}");
-        let names: Vec<String> = std::fs::read_dir(&repo.dir)
-            .unwrap()
-            .map(|e| e.unwrap().file_name().to_string_lossy().into_owned())
-            .filter(|n| n.ends_with(".java"))
-            .collect();
-        assert!(!names.contains(&"CASE.java".to_owned()), "{eol:?}: {names:?}");
-    }
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn a_local_task_in_a_repository_without_commits_lists_and_rolls_back_its_changes() {
-    for eol in EOLS {
-        let repo = Checkout::new(eol);
-        repo.write("mine.txt", "mine\n");
-        let (mgr, task) = repo.task().await;
-        repo.write("new.txt", "agent\n");
-        assert_eq!(changed(&mgr, &task.id).await, ["new.txt"], "{eol:?}");
-        assert_eq!(mgr.base_text(&task.id, repo.dir.join("new.txt")).await.unwrap(), None, "{eol:?}");
-
-        mgr.rollback_changes(&task.id, None).await.unwrap();
-        assert!(!repo.dir.join("new.txt").exists(), "{eol:?}");
-        assert_eq!(repo.read("mine.txt"), "mine\n", "{eol:?}");
-        assert!(changed(&mgr, &task.id).await.is_empty(), "{eol:?}");
-    }
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn security_policy_auto_approves_whitelist_and_rejects_blacklist() {
-    use ide_core::settings::AgentSecuritySettings;
-
-    // 1. Whitelist auto-approves "cargo test" without waiting for manual respond().
-    let tmp = tempfile::tempdir().unwrap();
-    let agent = Arc::new(FakeAgent::default());
-    let mgr = manager(tmp.path(), agent);
-    mgr.set_security_hook(Arc::new(|| AgentSecuritySettings {
-        allowed_commands: vec!["cargo test".into()],
-        blocked_commands: vec!["rm -rf *".into()],
-    }));
-    let task = mgr
-        .create(NewAgentTask {
-            project_root: None,
-            prompt: text("run tests"),
-            provider: "claude".into(),
-            config: vec![],
-            isolation: Isolation::Local,
-            base: None,
-        })
-        .await
-        .unwrap();
-    wait_for(&mgr, &task.id, AgentStatus::Ready).await;
-    let entries = mgr.entries(&task.id, None).unwrap();
-    assert!(
-        entries.iter().any(|e| matches!(e, AgentEntry::Agent { text } if text.contains("chose yes"))),
-        "{entries:?}"
-    );
-    assert!(
-        entries.iter().any(|e| matches!(
-            e,
-            AgentEntry::Permission { chosen: Some(c), .. } if c.contains("whitelisted")
-        )),
-        "{entries:?}"
-    );
-
-    // 2. Blacklist auto-rejects "cargo test" when matched by blocked_commands.
-    mgr.set_security_hook(Arc::new(|| AgentSecuritySettings {
-        allowed_commands: vec!["cargo test".into()],
-        blocked_commands: vec!["cargo test*".into()],
-    }));
-    let blocked_task = mgr
-        .create(NewAgentTask {
-            project_root: None,
-            prompt: text("run blocked"),
-            provider: "claude".into(),
-            config: vec![],
-            isolation: Isolation::Local,
-            base: None,
-        })
-        .await
-        .unwrap();
-    wait_for(&mgr, &blocked_task.id, AgentStatus::Ready).await;
-    let blocked_entries = mgr.entries(&blocked_task.id, None).unwrap();
-    assert!(
-        blocked_entries.iter().any(|e| matches!(e, AgentEntry::Agent { text } if text.contains("chose no"))),
-        "{blocked_entries:?}"
-    );
-    assert!(
-        blocked_entries.iter().any(|e| matches!(
-            e,
-            AgentEntry::Permission { chosen: Some(c), .. } if c.contains("Blocked by policy")
-        )),
-        "{blocked_entries:?}"
-    );
-}
@@ -14,18 +14,8 @@ pub(crate) struct Created {
    pub base_commit: String,
 }

-/// The repository of `path`, free to execute: the host runs every agent command that
-/// reaches a repository only in a trusted project.
-fn discover(path: &Path) -> IdeResult<Option<Repo>> {
-    let repo = Repo::discover(path)?;
-    if let Some(repo) = &repo {
-        repo.set_execution_allowed(true);
-    }
-    Ok(repo)
-}
-
 fn repo_at(path: &Path) -> IdeResult<Repo> {
-    discover(path)?.ok_or_else(|| IdeError::unavailable(format!("{} is not in a git repository", path.display())))
+    Repo::discover(path)?.ok_or_else(|| IdeError::unavailable(format!("{} is not in a git repository", path.display())))
 }

 /// The current branch (or commit when detached) and its commit.
@@ -101,11 +91,10 @@ fn retrying(attempts: u32, pause: Duration, mut op: impl FnMut() -> std::io::Res
 /// Files under `cwd` that differ from `base` (untracked files included), with line counts.
 /// Outside a repository there is nothing to compare against: no changes.
 pub(crate) fn changes(cwd: &Path, base: &str) -> IdeResult<Vec<AgentChange>> {
-    let Some(repo) = discover(cwd)? else { return Ok(Vec::new()) };
+    let Some(repo) = Repo::discover(cwd)? else { return Ok(Vec::new()) };
    let root = repo.root().to_path_buf();
-    let stats: std::collections::HashMap<String, (u32, u32)> =
-        repo.numstat_with_worktree(base)?.into_iter().map(|(p, a, r)| (p, (a, r))).collect();
-    let stat = |rel: &str| stats.get(rel).copied().unwrap_or((0, 0));
+    let stats = repo.numstat_with_worktree(base)?;
+    let stat = |rel: &str| stats.iter().find(|(p, ..)| p == rel).map_or((0, 0), |&(_, a, r)| (a, r));
    let mut out: Vec<AgentChange> = repo
        .diff_with_worktree(base)?
        .into_iter()
@@ -114,236 +103,16 @@ pub(crate) fn changes(cwd: &Path, base: &str) -> IdeResult<Vec<AgentChange>> {
            AgentChange { path: IpcPath(root.join(&f.path)), rel_path: f.path, kind: f.kind, added, removed }
        })
        .collect();
-    let tracked: std::collections::HashSet<String> = out.iter().map(|c| c.rel_path.clone()).collect();
    for s in repo.status()? {
-        if s.unstaged == Some(ChangeKind::Untracked) && !tracked.contains(&s.rel_path) {
-            out.push(added(s.path, s.rel_path));
+        if s.unstaged == Some(ChangeKind::Untracked) && !out.iter().any(|c| c.rel_path == s.rel_path) {
+            let added = std::fs::read_to_string(&*s.path).map_or(0, |t| t.lines().count() as u32);
+            out.push(AgentChange { path: s.path, rel_path: s.rel_path, kind: ChangeKind::Added, added, removed: 0 });
        }
    }
    out.sort_by(|a, b| a.rel_path.cmp(&b.rel_path));
    Ok(out)
 }

-/// Files renamed since `rev`, by their new repository-relative path: the old path, as a deletion
-/// to roll back along with the rename.
-pub(crate) fn rename_sources(cwd: &Path, rev: &str) -> IdeResult<BTreeMap<String, AgentChange>> {
-    let Some(repo) = discover(cwd)? else { return Ok(BTreeMap::new()) };
-    let root = repo.root().to_path_buf();
-    Ok(repo
-        .diff_with_worktree(rev)?
-        .into_iter()
-        .filter_map(|f| {
-            let old = f.old_path.filter(|old| *old != f.path)?;
-            let source = AgentChange {
-                path: IpcPath(root.join(&old)),
-                rel_path: old,
-                kind: ChangeKind::Deleted,
-                added: 0,
-                removed: 0,
-            };
-            Some((f.path, source))
-        })
-        .collect())
-}
-
-fn added(path: IpcPath, rel_path: String) -> AgentChange {
-    let added = std::fs::read_to_string(&*path).map_or(0, |t| t.lines().count() as u32);
-    AgentChange { path, rel_path, kind: ChangeKind::Added, added, removed: 0 }
-}
-
-/// Whether two paths name one file (a case-insensitive disk resolving both spellings).
-fn same_file(a: &Path, b: &Path) -> bool {
-    match (std::fs::canonicalize(a), std::fs::canonicalize(b)) {
-        (Ok(a), Ok(b)) => a == b,
-        _ => false,
-    }
-}
-
-fn crlf_to_lf(bytes: &[u8]) -> Vec<u8> {
-    let mut out = Vec::with_capacity(bytes.len());
-    for (i, &b) in bytes.iter().enumerate() {
-        if !(b == b'\r' && bytes.get(i + 1) == Some(&b'\n')) {
-            out.push(b);
-        }
-    }
-    out
-}
-
-/// Where a task works and what its changes are measured against.
-pub(crate) enum TaskBase {
-    /// A worktree of its own: everything since the commit it was created from, the agent's
-    /// own commits included.
-    Worktree { cwd: PathBuf, base: String },
-    /// The project's checkout, where the user works and commits too. `start` is the commit it
-    /// started from (`None` in a repository without commits, or an imported session).
-    Local { cwd: PathBuf, start: Option<String> },
-}
-
-impl TaskBase {
-    pub(crate) fn cwd(&self) -> &Path {
-        match self {
-            Self::Worktree { cwd, .. } | Self::Local { cwd, .. } => cwd,
-        }
-    }
-
-    /// The files the task changed, less those changed before it started and untouched since.
-    pub(crate) fn changes(&self, before: &BTreeMap<String, Stamp>) -> IdeResult<Vec<AgentChange>> {
-        let (cwd, start) = match self {
-            Self::Worktree { cwd, base } => return Ok(without_untouched(changes(cwd, base)?, before)),
-            Self::Local { cwd, start } => (cwd, start.as_deref()),
-        };
-        let Some(repo) = discover(cwd)? else { return Ok(Vec::new()) };
-        // What is uncommitted, as the Commit tool window lists it: commits made since the task
-        // started drop out.
-        let head = repo.branch_info()?.head_commit;
-        let listed = match &head {
-            Some(head) => changes(cwd, head)?,
-            None => {
-                let mut all: Vec<AgentChange> = repo
-                    .status()?
-                    .into_iter()
-                    .filter(|s| s.path.is_file())
-                    .map(|s| added(s.path, s.rel_path))
-                    .collect();
-                all.sort_by(|a, b| a.rel_path.cmp(&b.rel_path));
-                all
-            }
-        };
-        let listed = without_untouched(listed, before);
-        let Some(start) = start.filter(|s| head.as_deref() != Some(*s)) else { return Ok(listed) };
-        // HEAD moved (a reset, a checkout, a pull): a file that is as it was when the task
-        // started is the user's doing, not the task's. Git compares tracked files, with its
-        // line-ending and other filters: the bytes on disk and in the commit differ under
-        // `core.autocrlf`.
-        let since_start: std::collections::HashSet<String> = repo
-            .diff_with_worktree(start)?
-            .into_iter()
-            .flat_map(|f| [Some(f.path), f.old_path].into_iter().flatten())
-            .collect();
-        let untracked: std::collections::HashSet<String> = repo
-            .status()?
-            .into_iter()
-            .filter(|s| s.unstaged == Some(ChangeKind::Untracked))
-            .map(|s| s.rel_path)
-            .collect();
-        Ok(listed
-            .into_iter()
-            .filter(|c| {
-                if before.contains_key(&c.rel_path) {
-                    return true;
-                }
-                let Ok(Some(at_start)) = repo.file_bytes_at(&c.path.0, Some(start)) else { return true };
-                if !untracked.contains(&c.rel_path) {
-                    return since_start.contains(&c.rel_path);
-                }
-                // Untracked since (a mixed reset): git doesn't diff it, so compare the bytes,
-                // CRLF on disk matching LF committed.
-                !std::fs::read(&c.path.0).is_ok_and(|now| now == at_start || crlf_to_lf(&now) == at_start)
-            })
-            .collect())
-    }
-
-    /// The revision the task's changed files go back to on rollback, and are compared with:
-    /// the commit the task started from, or the current `HEAD` once the user committed on top
-    /// of it, so those commits stay. `None` while the repository has no commits.
-    pub(crate) fn rev(&self) -> IdeResult<Option<String>> {
-        let (cwd, start) = match self {
-            Self::Worktree { base, .. } => return Ok(Some(base.clone())),
-            Self::Local { cwd, start } => (cwd, start.as_deref()),
-        };
-        let Some(repo) = discover(cwd)? else { return Ok(None) };
-        let head = repo.branch_info()?.head_commit;
-        // A start commit git no longer knows (garbage-collected) can't be gone back to.
-        let start = start.filter(|s| repo.merge_base(s, s).ok().flatten().is_some());
-        Ok(match (start, head) {
-            (Some(start), Some(head)) if start != head && repo.merge_base(start, &head)?.as_deref() != Some(start) => {
-                Some(start.to_owned())
-            }
-            (start, head) => head.or_else(|| start.map(str::to_owned)),
-        })
-    }
-}
-
-/// Copies the task's `changes` (against `base`) from the worktree `cwd` into the
-/// local checkout `root`, uncommitted: the user reviews and commits them with the
-/// VCS tools. Files the checkout changed itself are left alone and reported, so
-/// accepting never destroys the user's own edits. Returns accepted and skipped paths.
-pub(crate) fn accept(
-    root: &Path,
-    cwd: &Path,
-    base: &str,
-    changes: &[AgentChange],
-) -> IdeResult<crate::AgentAcceptOutcome> {
-    let repo = repo_at(cwd)?;
-    // Change paths are repository-relative, and the task's project may be a folder inside it.
-    let local_root = discover(root)?.map_or_else(|| root.to_path_buf(), |r| r.root().to_path_buf());
-    let renamed_from: BTreeMap<String, String> =
-        repo.diff_with_worktree(base)?.into_iter().filter_map(|f| Some((f.path, f.old_path?))).collect();
-    // Brings one path of the checkout to the task's version, unless the checkout changed it itself.
-    let apply = |rel: &str| -> IdeResult<bool> {
-        let local = local_root.join(rel);
-        let in_task = repo.root().join(rel);
-        let base_bytes = repo.file_bytes_at(&in_task, Some(base))?;
-        let current = std::fs::read(&in_task).ok();
-        let local_bytes = std::fs::read(&local).ok();
-        if local_bytes == current {
-            return Ok(true);
-        }
-        // The checkout may hold the committed LF text with CRLF line ends (`core.autocrlf`).
-        let unchanged = match (&local_bytes, &base_bytes) {
-            (Some(now), Some(at_base)) => now == at_base || crlf_to_lf(now) == *at_base,
-            (now, at_base) => now == at_base,
-        };
-        if !unchanged {
-            return Ok(false);
-        }
-        match current {
-            Some(bytes) => {
-                if let Some(parent) = local.parent() {
-                    std::fs::create_dir_all(parent)?;
-                }
-                std::fs::write(&local, bytes)?;
-            }
-            None => match std::fs::remove_file(&local) {
-                Err(e) if e.kind() != std::io::ErrorKind::NotFound => return Err(e.into()),
-                _ => {}
-            },
-        }
-        Ok(true)
-    };
-    let mut accepted = Vec::with_capacity(changes.len());
-    let mut skipped = Vec::new();
-    let skip = |path: &str| crate::AgentAcceptSkipped {
-        path: path.to_owned(),
-        reason: "the checkout has changes of its own to it; accept it by hand".to_owned(),
-    };
-    for change in changes {
-        // A case-only rename on a case-insensitive disk: both names reach the same file, so
-        // rename it in place before bringing it to the task's version.
-        if let Some(old) = renamed_from.get(&change.rel_path)
-            && old != &change.rel_path
-            && old.to_lowercase() == change.rel_path.to_lowercase()
-            && local_root.join(old).exists()
-            && same_file(&local_root.join(old), &local_root.join(&change.rel_path))
-        {
-            std::fs::rename(local_root.join(old), local_root.join(&change.rel_path))?;
-        }
-        if !apply(&change.rel_path)? {
-            skipped.push(skip(&change.rel_path));
-            continue;
-        }
-        accepted.push(change.rel_path.clone());
-        // A rename also takes the file away from its old path (unless only its case changed).
-        if let Some(old) = renamed_from.get(&change.rel_path)
-            && old.to_lowercase() != change.rel_path.to_lowercase()
-            && !apply(old)?
-        {
-            skipped.push(skip(old));
-        }
-    }
-    Ok(crate::AgentAcceptOutcome { accepted, skipped })
-}
-
 /// Size and modification time of a file, `None` once it is gone.
 pub(crate) type Stamp = Option<(u64, u128)>;

@@ -355,10 +124,7 @@ pub(crate) fn stamp(path: &Path) -> Stamp {

 /// The files already changed in `cwd` against `HEAD`, stamped so later edits to them show.
 pub(crate) fn snapshot(cwd: &Path) -> IdeResult<BTreeMap<String, Stamp>> {
-    // Paths and stamps only: no diff and no line counts, which read every untracked file
-    // and held up starting a task in a checkout with many of them.
-    let Some(repo) = Repo::discover(cwd)? else { return Ok(BTreeMap::new()) };
-    Ok(repo.status()?.into_iter().map(|s| (s.rel_path, stamp(&s.path))).collect())
+    Ok(changes(cwd, "HEAD")?.into_iter().map(|c| (c.rel_path, stamp(&c.path))).collect())
 }

 /// Drops the changes that were there before the task and haven't been touched since.
@@ -395,11 +161,11 @@ pub(crate) fn save_before(cwd: &Path, before: &BTreeMap<String, Stamp>, dir: &Pa
 }

 /// Rolls `change` back: to the copy saved when the task started when the file had changes
-/// then (`before`, `saved` holding the copies), otherwise to `rev` (removed when `rev` lacks
-/// it, or when there is no `rev`: the repository had no commits).
+/// then (`before`, `saved` holding the copies), otherwise to `base` (removed when `base`
+/// lacks it).
 pub(crate) fn restore(
    cwd: &Path,
-    rev: Option<&str>,
+    base: &str,
    change: &AgentChange,
    before: &BTreeMap<String, Stamp>,
    saved: Option<&Path>,
@@ -417,13 +183,10 @@ pub(crate) fn restore(
                })?;
            Some(std::fs::read(copy)?)
        }
-        None => match rev {
-            Some(rev) => {
-                let repo = Repo::discover(cwd)?.ok_or_else(|| IdeError::invalid("not in a git repository"))?;
-                repo.file_bytes_at(path, Some(rev))?
-            }
-            None => None,
-        },
+        None => {
+            let repo = Repo::discover(cwd)?.ok_or_else(|| IdeError::invalid("not in a git repository"))?;
+            repo.file_bytes_at(path, Some(base))?
+        }
    };
    match content {
        Some(bytes) => {
@@ -441,7 +204,7 @@ pub(crate) fn restore(
 }

 pub(crate) fn file_at(cwd: &Path, path: &Path, rev: &str) -> IdeResult<Option<String>> {
-    let Some(repo) = discover(cwd)? else { return Ok(None) };
+    let Some(repo) = Repo::discover(cwd)? else { return Ok(None) };
    let encoding = match ide_vfs::load_text(path) {
        Ok(loaded) => encoding_rs::Encoding::for_label(loaded.encoding.as_bytes()).unwrap_or(encoding_rs::UTF_8),
        Err(_) => ide_vfs::detect_encoding(&repo.file_bytes_at(path, Some(rev))?.unwrap_or_default(), None),
@@ -628,145 +391,4 @@ mod tests {
        assert!(remove(&repo, &tmp.path().join("wt"), &elsewhere).is_err());
        assert!(elsewhere.join("keep.txt").exists());
    }
-
-    fn accept_repo() -> (tempfile::TempDir, PathBuf, Created) {
-        let tmp = tempfile::tempdir().unwrap();
-        let repo = tmp.path().join("repo");
-        std::fs::create_dir(&repo).unwrap();
-        git(&repo, &["init", "-q", "-b", "main"]);
-        std::fs::write(repo.join("a.txt"), "one\ntwo\n").unwrap();
-        std::fs::write(repo.join("gone.txt"), "bye\n").unwrap();
-        git(&repo, &["add", "."]);
-        git(&repo, &["commit", "-q", "-m", "init"]);
-        let created = create(&repo, &tmp.path().join("wt"), "Edit A", None).unwrap();
-        (tmp, repo, created)
-    }
-
-    fn listed(cwd: &Path, base: &str) -> Vec<AgentChange> {
-        without_untouched(changes(cwd, base).unwrap(), &BTreeMap::new())
-    }
-
-    #[test]
-    fn accept_moves_a_renamed_file_and_maps_paths_from_a_project_folder() {
-        let (_tmp, repo, created) = accept_repo();
-        std::fs::create_dir(created.path.join("app")).unwrap();
-        git(&created.path, &["mv", "a.txt", "app/moved.txt"]);
-        std::fs::write(created.path.join("app/new.txt"), "n\n").unwrap();
-        git(&created.path, &["add", "."]);
-        git(&created.path, &["-c", "user.name=t", "-c", "user.email=t@t", "commit", "-q", "-m", "move"]);
-
-        // The task's project is the repository's `app` folder.
-        let project = repo.join("app");
-        std::fs::create_dir(&project).unwrap();
-        let changes = listed(&created.path, &created.base_commit);
-        let outcome = accept(&project, &created.path, &created.base_commit, &changes).unwrap();
-        assert!(outcome.skipped.is_empty(), "{:?}", outcome.skipped);
-        assert_eq!(std::fs::read_to_string(repo.join("app/moved.txt")).unwrap(), "one\ntwo\n");
-        assert_eq!(std::fs::read_to_string(repo.join("app/new.txt")).unwrap(), "n\n");
-        assert!(!repo.join("a.txt").exists(), "the rename's old path is gone");
-        assert!(!repo.join("app/app").exists());
-    }
-
-    #[test]
-    fn accept_treats_a_crlf_checkout_of_the_base_as_unchanged() {
-        let (_tmp, repo, created) = accept_repo();
-        // The checkout holds the committed text with CRLF line ends, as core.autocrlf leaves it.
-        std::fs::write(repo.join("a.txt"), "one\r\ntwo\r\n").unwrap();
-        std::fs::write(created.path.join("a.txt"), "one\nTWO\n").unwrap();
-        git(&created.path, &["mv", "gone.txt", "kept.txt"]);
-        std::fs::write(repo.join("gone.txt"), "bye\r\n").unwrap();
-        let changes = listed(&created.path, &created.base_commit);
-        let outcome = accept(&repo, &created.path, &created.base_commit, &changes).unwrap();
-        assert!(outcome.skipped.is_empty(), "{:?}", outcome.skipped);
-        assert_eq!(std::fs::read_to_string(repo.join("a.txt")).unwrap(), "one\nTWO\n");
-        assert!(repo.join("kept.txt").exists() && !repo.join("gone.txt").exists());
-    }
-
-    #[test]
-    fn accept_applies_a_case_only_rename() {
-        let (_tmp, repo, created) = accept_repo();
-        git(&created.path, &["mv", "a.txt", "A.txt"]);
-        let changes = listed(&created.path, &created.base_commit);
-        let outcome = accept(&repo, &created.path, &created.base_commit, &changes).unwrap();
-        assert!(outcome.skipped.is_empty(), "{:?}", outcome.skipped);
-        let names: Vec<_> = std::fs::read_dir(&repo)
-            .unwrap()
-            .map(|e| e.unwrap().file_name().to_string_lossy().into_owned())
-            .filter(|n| n.eq_ignore_ascii_case("a.txt"))
-            .collect();
-        assert_eq!(names, ["A.txt"]);
-    }
-
-    #[test]
-    fn accept_copies_new_modified_and_deleted_files_into_the_checkout() {
-        let (_tmp, repo, created) = accept_repo();
-        std::fs::write(created.path.join("a.txt"), "one\nTWO\n").unwrap();
-        std::fs::write(created.path.join("new.txt"), "x\n").unwrap();
-        std::fs::remove_file(created.path.join("gone.txt")).unwrap();
-
-        let outcome =
-            accept(&repo, &created.path, &created.base_commit, &listed(&created.path, &created.base_commit)).unwrap();
-        assert!(outcome.skipped.is_empty());
-        assert_eq!(outcome.accepted, ["a.txt", "gone.txt", "new.txt"]);
-        assert_eq!(std::fs::read_to_string(repo.join("a.txt")).unwrap(), "one\nTWO\n");
-        assert_eq!(std::fs::read_to_string(repo.join("new.txt")).unwrap(), "x\n");
-        assert!(!repo.join("gone.txt").exists());
-
-        // Accepting again changes nothing: the checkout already matches.
-        let again =
-            accept(&repo, &created.path, &created.base_commit, &listed(&created.path, &created.base_commit)).unwrap();
-        assert!(again.skipped.is_empty());
-        assert_eq!(again.accepted, ["a.txt", "gone.txt", "new.txt"]);
-    }
-
-    #[test]
-    fn a_local_task_goes_back_to_its_start_unless_the_user_committed_on_top_of_it() {
-        let tmp = tempfile::tempdir().unwrap();
-        let repo = tmp.path().join("repo");
-        std::fs::create_dir(&repo).unwrap();
-        git(&repo, &["init", "-q", "-b", "main"]);
-        let local = |start: Option<&str>| TaskBase::Local { cwd: repo.clone(), start: start.map(str::to_owned) };
-        let head = || head_of(&repo).unwrap().1;
-        let commit = |name: &str| {
-            std::fs::write(repo.join(name), "x\n").unwrap();
-            git(&repo, &["add", "."]);
-            git(&repo, &["commit", "-q", "-m", name]);
-            head_of(&repo).unwrap().1
-        };
-
-        assert_eq!(local(None).rev().unwrap(), None, "no commits yet");
-        let first = commit("a.txt");
-        assert_eq!(local(None).rev().unwrap(), Some(first.clone()), "an imported session: HEAD");
-        let start = commit("b.txt");
-        assert_eq!(local(Some(&start)).rev().unwrap(), Some(start.clone()), "HEAD where it started");
-        let ahead = commit("c.txt");
-        assert_eq!(local(Some(&start)).rev().unwrap(), Some(ahead), "committed on top: HEAD");
-        git(&repo, &["reset", "-q", "--soft", &first]);
-        assert_eq!(local(Some(&start)).rev().unwrap(), Some(start.clone()), "moved back: the start");
-        git(&repo, &["checkout", "-q", "-b", "side"]);
-        commit("d.txt");
-        assert_eq!(local(Some(&start)).rev().unwrap(), Some(start.clone()), "another branch: the start");
-        let gone = "0123456789abcdef0123456789abcdef01234567";
-        assert_eq!(local(Some(gone)).rev().unwrap(), Some(head()), "an unknown start: HEAD");
-        let worktree = TaskBase::Worktree { cwd: repo.clone(), base: start.clone() };
-        assert_eq!(worktree.rev().unwrap(), Some(start));
-    }
-
-    #[test]
-    fn accept_leaves_files_the_checkout_changed_itself() {
-        let (_tmp, repo, created) = accept_repo();
-        std::fs::write(created.path.join("a.txt"), "one\nTWO\n").unwrap();
-        std::fs::write(created.path.join("gone.txt"), "bye\nbye\n").unwrap();
-        std::fs::write(repo.join("a.txt"), "one\nMINE\n").unwrap();
-
-        let outcome =
-            accept(&repo, &created.path, &created.base_commit, &listed(&created.path, &created.base_commit)).unwrap();
-        assert_eq!(outcome.accepted, ["gone.txt"]);
-        assert_eq!(outcome.skipped.len(), 1);
-        assert_eq!(outcome.skipped[0].path, "a.txt");
-        assert!(!outcome.skipped[0].reason.is_empty());
-        // The user's own edit survives; the other file comes over.
-        assert_eq!(std::fs::read_to_string(repo.join("a.txt")).unwrap(), "one\nMINE\n");
-        assert_eq!(std::fs::read_to_string(repo.join("gone.txt")).unwrap(), "bye\nbye\n");
-    }
 }
@@ -265,14 +265,6 @@ pub fn menu_fingerprint(
 }

 impl LaunchFingerprint {
-    /// Folders (relative to the project) of the Maven projects whose POM is an input.
-    pub(super) fn project_dirs(&self) -> impl Iterator<Item = &Path> {
-        self.files
-            .keys()
-            .filter(|p| p.is_relative() && p.file_name().is_some_and(|n| n == "pom.xml"))
-            .map(|pom| pom.parent().unwrap_or(Path::new("")))
-    }
-
    /// Relative paths whose content changed while `(length, mtime)` stayed the same
    /// compared to `previous` (timestamp-preserving external edits, coarse-granularity
    /// filesystems). Timestamp-incremental builders (Maven, the Kotlin plugin) would
@@ -1,253 +0,0 @@
-//! Resources a Gradle build changes while copying them (filters, `expand`, renames, extra
-//! sources). The Java language server copies them as they are into Buildship's
-//! `bin/<source set>` folders, which launches run from; IntelliJ IDEA runs Gradle's copy.
-//! Before a launch, Gradle processes them and its output replaces those plain copies, so
-//! each resource is on the classpath once, as the build produces it.
-use super::{BuildPlan, BuildStep, BuildSystem, Format, run, subdir};
-use crate::BuildModel;
-use crate::gradle::{self, GradleModel, ReportedProject};
-use ide_core::{CancellationToken, IdeError, IdeResult, Severity};
-use std::fs;
-use std::path::{Path, PathBuf};
-
-/// A source set whose resources Gradle processes, with the folder the launch reads them from.
-#[derive(Debug, PartialEq)]
-struct Target {
-    /// Task path from the root build (`:app:processResources`).
-    task: String,
-    /// Where the task writes the resources.
-    output: PathBuf,
-    /// The Java language server's output folder of the source set, on the launch classpath.
-    jdtls: PathBuf,
-}
-
-fn targets(reported: &[ReportedProject], class_paths: &[String]) -> Vec<Target> {
-    // buildSrc is built before the build, never addressable as `:buildSrc:<task>`.
-    let addressable = |p: &&ReportedProject| !p.build.as_deref().is_some_and(|b| b.ends_with(":buildSrc"));
-    let sets: Vec<_> = reported
-        .iter()
-        .filter(addressable)
-        .flat_map(|p| p.source_sets.iter().filter_map(move |s| Some((p, s, s.processed.as_ref()?))))
-        .collect();
-    if sets.is_empty() {
-        return Vec::new();
-    }
-    // Canonical, as Gradle reports its folders: jdtls may spell them differently.
-    let entries: Vec<PathBuf> = class_paths.iter().filter_map(|p| dunce::canonicalize(p).ok()).collect();
-    sets.into_iter()
-        .filter_map(|(p, set, resources)| {
-            // Buildship's output folder of the source set.
-            let jdtls = dunce::canonicalize(Path::new(&p.dir).join("bin").join(&set.name)).ok()?;
-            let project = if p.path == ":" { "" } else { p.path.as_str() };
-            entries.contains(&jdtls).then(|| Target {
-                task: format!("{project}:{}", resources.task),
-                output: PathBuf::from(&resources.dir),
-                jdtls,
-            })
-        })
-        .collect()
-}
-
-/// Before a JVM launch from the Java language server's output folders on `class_paths`:
-/// runs the Gradle tasks that process resources of those folders' source sets (see the
-/// module docs) and copies their output over the plain copies. `cache_dir` holds the
-/// linked builds' last syncs. Returns the tasks run, none for builds that copy their
-/// resources as they are.
-pub fn process_launch_resources(
-    root: &Path,
-    model: &BuildModel,
-    cache_dir: &Path,
-    class_paths: &[String],
-    cancel: &CancellationToken,
-) -> IdeResult<Vec<String>> {
-    // A composite also reports the builds it includes: the deepest build owning a folder runs its task.
-    let mut builds: Vec<&GradleModel> = model.gradle.iter().collect();
-    builds.sort_by_key(|g| std::cmp::Reverse(subdir(root, &g.dir).components().count()));
-    let mut done: Vec<PathBuf> = Vec::new();
-    let mut tasks = Vec::new();
-    for g in builds {
-        let reported = crate::sync::reported_gradle_projects(&gradle::cache_dir(cache_dir, &g.dir));
-        let targets: Vec<Target> =
-            targets(&reported, class_paths).into_iter().filter(|t| !done.contains(&t.jdtls)).collect();
-        if targets.is_empty() {
-            continue;
-        }
-        let mut step = BuildStep::new(&g.command, &["--console=plain"], &subdir(root, &g.dir), Format::Gradle);
-        step.args.extend(targets.iter().map(|t| t.task.clone()));
-        step.env = g.env.clone();
-        let plan = BuildPlan { system: BuildSystem::Gradle, title: "Process resources".into(), steps: vec![step] };
-        let result = run(root, &plan, cancel, &|_| {})?;
-        if !result.success {
-            let errors: Vec<&str> = result
-                .messages
-                .iter()
-                .filter(|m| m.severity == Severity::Error)
-                .take(5)
-                .map(|m| m.text.as_str())
-                .collect();
-            return Err(IdeError::internal(errors.join("\n")));
-        }
-        for t in targets {
-            if cancel.is_cancelled() {
-                return Err(IdeError::cancelled());
-            }
-            overlay(&t.output, &t.output, &t.jdtls)?;
-            done.push(t.jdtls);
-            tasks.push(t.task);
-        }
-    }
-    Ok(tasks)
-}
-
-/// Copies the files under `dir` to the same place under `to` (relative to `base`) where
-/// they differ, so unchanged resources are not rewritten on every launch.
-fn overlay(base: &Path, dir: &Path, to: &Path) -> IdeResult<()> {
-    let entries = match fs::read_dir(dir) {
-        // No resources: the task had nothing to copy.
-        Err(e) if e.kind() == std::io::ErrorKind::NotFound => return Ok(()),
-        entries => entries?,
-    };
-    for entry in entries {
-        let entry = entry?;
-        let path = entry.path();
-        let kind = entry.file_type()?;
-        if kind.is_dir() {
-            overlay(base, &path, to)?;
-        } else if kind.is_file() {
-            let dest = to.join(path.strip_prefix(base).map_err(|e| IdeError::internal(e.to_string()))?);
-            if !same_content(&path, &dest) {
-                if let Some(parent) = dest.parent() {
-                    fs::create_dir_all(parent)?;
-                }
-                fs::copy(&path, &dest)?;
-            }
-        }
-    }
-    Ok(())
-}
-
-fn same_content(a: &Path, b: &Path) -> bool {
-    match (fs::metadata(a), fs::metadata(b)) {
-        (Ok(m), Ok(n)) if m.len() == n.len() => matches!((fs::read(a), fs::read(b)), (Ok(x), Ok(y)) if x == y),
-        _ => false,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::gradle::{ProcessedResources, ReportedSourceSet};
-
-    fn write(path: &Path, text: &str) {
-        fs::create_dir_all(path.parent().unwrap()).unwrap();
-        fs::write(path, text).unwrap();
-    }
-
-    fn set(name: &str, processed: Option<&Path>) -> ReportedSourceSet {
-        ReportedSourceSet {
-            name: name.into(),
-            test: name == "test",
-            processed: processed.map(|dir| ProcessedResources {
-                task: if name == "main" { "processResources".into() } else { "processTestResources".into() },
-                dir: dir.to_string_lossy().into_owned(),
-            }),
-            ..Default::default()
-        }
-    }
-
-    fn project(path: &str, dir: &Path, sets: Vec<ReportedSourceSet>) -> ReportedProject {
-        ReportedProject {
-            path: path.into(),
-            dir: dir.to_string_lossy().into_owned(),
-            source_sets: sets,
-            ..Default::default()
-        }
-    }
-
-    /// Only processed source sets whose jdtls output is on the classpath: the launched
-    /// module, upstream modules of the build, tests only for a test classpath; never buildSrc.
-    #[test]
-    fn targets_are_processed_sets_on_the_classpath() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = dunce::canonicalize(tmp.path()).unwrap();
-        let (app, lib, plain, src) = (root.join("app"), root.join("lib"), root.join("plain"), root.join("buildSrc"));
-        for dir in [&root, &app, &lib, &plain, &src] {
-            for set in ["main", "test"] {
-                fs::create_dir_all(dir.join("bin").join(set)).unwrap();
-            }
-        }
-        let out = |dir: &Path, set: &str| dir.join("build/resources").join(set);
-        let mut build_src = project(":buildSrc", &src, vec![set("main", Some(&out(&src, "main")))]);
-        build_src.build = Some(":buildSrc".into());
-        let reported = [
-            project(":", &root, vec![set("main", Some(&out(&root, "main")))]),
-            project(":app", &app, vec![set("main", Some(&out(&app, "main"))), set("test", Some(&out(&app, "test")))]),
-            project(":lib", &lib, vec![set("main", Some(&out(&lib, "main")))]),
-            project(":plain", &plain, vec![set("main", None)]),
-            build_src,
-        ];
-        let entry = |dir: &Path, set: &str| dir.join("bin").join(set).to_string_lossy().into_owned();
-        let runtime = [
-            entry(&app, "main"),
-            // Spelled differently from Gradle's canonical folders.
-            format!("{}/", entry(&lib, "main")),
-            entry(&plain, "main"),
-            entry(&src, "main"),
-            "/m2/spring-core.jar".into(),
-        ];
-        let tasks = |cp: &[String]| targets(&reported, cp).into_iter().map(|t| t.task).collect::<Vec<_>>();
-        assert_eq!(tasks(&runtime), [":app:processResources", ":lib:processResources"]);
-        let mut test = runtime.to_vec();
-        test.insert(0, entry(&app, "test"));
-        assert_eq!(tasks(&test), [":app:processResources", ":app:processTestResources", ":lib:processResources"]);
-        assert_eq!(tasks(&[entry(&root, "main")]), [":processResources"], "the root project");
-        let app_targets = targets(&reported, &runtime);
-        let t = &app_targets[0];
-        assert_eq!(
-            (t.output.as_path(), t.jdtls.as_path()),
-            (out(&app, "main").as_path(), app.join("bin/main").as_path())
-        );
-
-        let unprocessed = [project(":app", &app, vec![set("main", None)])];
-        assert!(targets(&unprocessed, &runtime).is_empty());
-    }
-
-    /// The processed copy replaces jdtls's plain one (the reported `@version@` case), new
-    /// files are added, identical ones are left alone and files Gradle doesn't produce stay.
-    #[test]
-    fn overlay_replaces_plain_copies_with_gradle_output() {
-        let tmp = tempfile::tempdir().unwrap();
-        let (output, jdtls) = (tmp.path().join("build/resources/main"), tmp.path().join("bin/main"));
-        write(&output.join("application.yaml"), "spring:\n  application:\n    version: 0.0.1\n");
-        write(&output.join("static/extra.txt"), "from an extra source");
-        write(&output.join("migrations/V1__init.sql"), "create table t (id int);");
-        write(&jdtls.join("application.yaml"), "spring:\n  application:\n    version: @version@\n");
-        write(&jdtls.join("migrations/V1__init.sql"), "create table t (id int);");
-        write(&jdtls.join("com/example/App.class"), "bytecode");
-        let unchanged = fs::metadata(jdtls.join("migrations/V1__init.sql")).unwrap().modified().unwrap();
-        std::thread::sleep(std::time::Duration::from_millis(20));
-
-        overlay(&output, &output, &jdtls).unwrap();
-        let read = |rel: &str| fs::read_to_string(jdtls.join(rel)).unwrap();
-        assert_eq!(read("application.yaml"), "spring:\n  application:\n    version: 0.0.1\n");
-        assert_eq!(read("static/extra.txt"), "from an extra source");
-        assert_eq!(read("com/example/App.class"), "bytecode");
-        let modified = fs::metadata(jdtls.join("migrations/V1__init.sql")).unwrap().modified().unwrap();
-        assert_eq!(modified, unchanged, "identical files are not rewritten");
-
-        overlay(&tmp.path().join("missing"), &tmp.path().join("missing"), &jdtls).unwrap();
-    }
-
-    #[test]
-    fn builds_without_processed_resources_run_nothing() {
-        let tmp = tempfile::tempdir().unwrap();
-        // Running this command would fail the call.
-        let missing = tmp.path().join("missing-gradle").to_string_lossy().into_owned();
-        let model =
-            BuildModel { gradle: vec![GradleModel { command: missing, ..Default::default() }], ..Default::default() };
-        let class_paths = [tmp.path().join("bin/main").to_string_lossy().into_owned()];
-        let tasks =
-            process_launch_resources(tmp.path(), &model, tmp.path(), &class_paths, &CancellationToken::new()).unwrap();
-        assert!(tasks.is_empty());
-    }
-}
@@ -4,13 +4,11 @@
 //! for the Build tool window, the Problems view and the editor.

 mod fingerprint;
-mod launch_resources;
 mod parse;
 mod single;
 mod up_to_date;

 pub use fingerprint::{LaunchFingerprint, launch_fingerprint, menu_fingerprint};
-pub use launch_resources::process_launch_resources;
 pub use single::{
    SingleFileTarget, compile_file_plan, find_javac, javac_step, single_file_classpath, single_file_target,
 };
@@ -266,11 +264,6 @@ pub(super) fn maven_steps(
        BuildKind::Rebuild => &["clean", "test-compile"],
        BuildKind::Artifacts => &["package", "-DskipTests"],
    };
-    // The IDE's compile builds are not coverage runs. JaCoCo's offline `instrument`
-    // rewrites target/classes in `process-classes`; `jacoco.skip` prevents that in this
-    // build. It does not restore classes instrumented by an earlier build: Rebuild's
-    // `clean` removes those, while an incremental Build can still reuse them.
-    let skip_jacoco = matches!(kind, BuildKind::Build | BuildKind::Rebuild);
    let tops: Vec<&maven::MavenProject> = m.projects.iter().filter(|p| !p.aggregated).collect();
    if tops.is_empty() {
        return Err(IdeError::not_found("no Maven project found"));
@@ -283,9 +276,6 @@ pub(super) fn maven_steps(
            Format::Maven,
        );
        s.args.extend(p.options.iter().cloned());
-        if skip_jacoco {
-            s.args.push("-Djacoco.skip=true".into());
-        }
        s.args.extend(extra.iter().cloned());
        s.args.extend(goals.iter().map(|g| (*g).to_owned()));
        s.env = p.env.clone();
@@ -1049,22 +1039,6 @@ mod tests {
        std::fs::write(p, text).unwrap();
    }

-    #[test]
-    fn maven_compile_steps_skip_jacoco_but_artifacts_do_not() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path().join("demo");
-        write(&root, "pom.xml", "<project><artifactId>demo</artifactId></project>");
-        let model = crate::load(&root, &tmp.path().join("cache"), None);
-        for (kind, expected) in [(BuildKind::Build, true), (BuildKind::Rebuild, true), (BuildKind::Artifacts, false)] {
-            let plan = plan(&root, &model, kind, None, None).unwrap();
-            assert_eq!(
-                plan.steps[0].args.iter().any(|arg| arg == "-Djacoco.skip=true"),
-                expected,
-                "{kind:?}: {plan:?}"
-            );
-        }
-    }
-
    #[test]
    fn plans_per_build_system() {
        let tmp = tempfile::tempdir().unwrap();
@@ -1081,10 +1055,7 @@ mod tests {
        assert_eq!(p.system, BuildSystem::Maven);
        assert_eq!(p.title, "demo");
        assert_eq!(p.steps.len(), 1);
-        assert_eq!(
-            p.steps[0].args,
-            ["-B", "-Dstyle.color=never", maven::LOCAL_REPO_TRACKING_ARG, "-Djacoco.skip=true", "test-compile"]
-        );
+        assert_eq!(p.steps[0].args, ["-B", "-Dstyle.color=never", maven::LOCAL_REPO_TRACKING_ARG, "test-compile"]);
        let p = plan(&root, &model, BuildKind::Rebuild, Some(&root.join("core/src/main/java/A.java")), None).unwrap();
        assert_eq!(
            p.steps[0].args,
@@ -1092,7 +1063,6 @@ mod tests {
                "-B",
                "-Dstyle.color=never",
                maven::LOCAL_REPO_TRACKING_ARG,
-                "-Djacoco.skip=true",
                "-pl",
                "core",
                "-am",
@@ -1381,7 +1351,6 @@ mod tests {
                    maven::LOCAL_REPO_TRACKING_ARG,
                    "-s",
                    "settings.xml",
-                    "-Djacoco.skip=true",
                    "-pl",
                    "app",
                    "-am",
@@ -1398,7 +1367,6 @@ mod tests {
                    maven::LOCAL_REPO_TRACKING_ARG,
                    "-s",
                    "settings.xml",
-                    "-Djacoco.skip=true",
                    "-pl",
                    "app",
                    "-am",
@@ -79,14 +79,6 @@ pub fn find_javac(env: &BTreeMap<String, String>) -> String {
 /// so `-am` stays cheap). Entries are platform-separated (`;` on Windows).
 pub fn single_file_classpath(root: &Path, model: &BuildModel, target: &SingleFileTarget) -> IdeResult<String> {
    let mut entries: Vec<String> = Vec::new();
-    // The module's own classes first: the file almost always uses classes next to it.
-    let own: &[&str] = if target.test { &["target/test-classes", "target/classes"] } else { &["target/classes"] };
-    for out in own {
-        let path = target.module.join(out);
-        if path.is_dir() {
-            entries.push(path.to_string_lossy().into_owned());
-        }
-    }
    if let Some(m) = &model.maven {
        // Upstream reactor modules first: their freshly built classes shadow
        // installed snapshots of the same artifacts.
@@ -147,16 +139,6 @@ pub fn javac_step(target: &SingleFileTarget, file: &Path, classpath: &str, javac
    step.args.push(target.out_dir.to_string_lossy().into_owned());
    step.args.push("-cp".into());
    step.args.push(classpath.to_owned());
-    // Classes of the module that were never built (or are older than their source) are read
-    // from its sources; only `file` is written, so a test compile never puts main classes
-    // into test-classes.
-    let sources = source_roots(target);
-    if !sources.is_empty() {
-        let separator = if cfg!(windows) { ";" } else { ":" };
-        step.args.push("-sourcepath".into());
-        step.args.push(sources.iter().map(|p| p.to_string_lossy()).collect::<Vec<_>>().join(separator));
-        step.args.push("-implicit:none".into());
-    }
    if let Some(version) = target.java_version {
        step.args.push("--release".into());
        step.args.push(version.to_string());
@@ -166,27 +148,6 @@ pub fn javac_step(target: &SingleFileTarget, file: &Path, classpath: &str, javac
    Ok(step)
 }

-/// The module's Java source folders that exist, generated ones included; test sources see
-/// the main ones too.
-fn source_roots(target: &SingleFileTarget) -> Vec<PathBuf> {
-    let scopes: &[(&str, &str)] = if target.test {
-        &[("src/test/java", "target/generated-test-sources"), ("src/main/java", "target/generated-sources")]
-    } else {
-        &[("src/main/java", "target/generated-sources")]
-    };
-    let mut roots = Vec::new();
-    for (src, generated) in scopes {
-        roots.push(target.module.join(src));
-        let generated = target.module.join(generated);
-        let mut dirs: Vec<PathBuf> =
-            fs::read_dir(&generated).into_iter().flatten().flatten().map(|d| d.path()).filter(|p| p.is_dir()).collect();
-        dirs.sort();
-        roots.extend(dirs);
-    }
-    roots.retain(|p| p.is_dir());
-    roots
-}
-
 /// Resolves the classpath and plans the `javac` invocation for one Java source.
 pub fn compile_file_plan(root: &Path, model: &BuildModel, file: &Path) -> IdeResult<BuildPlan> {
    let target = single_file_target(root, model, file)?;
@@ -282,11 +243,6 @@ mod tests {
        assert!(args.contains("-d ") && args.contains("test-classes"), "{args}");
        assert!(args.contains("-cp /repo/a.jar"), "{args}");
        assert!(args.contains("MainTest.java"), "{args}");
-        // Test sources resolve their own and the main sources, without writing them.
-        let sourcepath = step.args.iter().position(|a| a == "-sourcepath").map(|i| step.args[i + 1].clone());
-        let roots = sourcepath.expect("a -sourcepath");
-        assert!(roots.contains("src/test/java") && roots.contains("src/main/java"), "{roots}");
-        assert!(step.args.iter().any(|a| a == "-implicit:none"), "{args}");
        // No `JAVA_HOME`: plain `javac` from `PATH`.
        assert_eq!(find_javac(&BTreeMap::new()), exe);
    }
@@ -319,11 +275,6 @@ mod tests {
        // Reactor class directories first, so fresh outputs shadow installed snapshots.
        let lib = root.join("lib/target/classes").to_string_lossy().into_owned();
        assert!(cp.starts_with(&lib), "{cp}");
-        // The module's own classes come first once they exist.
-        fs::create_dir_all(root.join("app/target/classes")).unwrap();
-        let cp = single_file_classpath(root, &model, &target).unwrap();
-        let own = root.join("app/target/classes").to_string_lossy().into_owned();
-        assert!(cp.starts_with(&format!("{own}:{lib}")), "{cp}");
        assert!(cp.contains("/repo/a.jar"), "{cp}");
        assert!(cp.contains("/repo/b.jar"), "{cp}");
        assert!(cp.split(separator).count() >= 3, "{cp}");
@@ -14,20 +14,6 @@ use std::fs;
 #[derive(serde::Serialize, serde::Deserialize)]
 struct Record {
    fingerprint: LaunchFingerprint,
-    /// Output folders of the built projects that existed after the build, relative to the
-    /// project. Deleting one outside the IDE (`mvn clean` in a terminal) leaves every input
-    /// unchanged, so a build is skipped only while they are all still there.
-    #[serde(default)]
-    outputs: Vec<PathBuf>,
-}
-
-/// The build's output folders that exist now, relative to `root`.
-fn existing_outputs(root: &Path, fingerprint: &LaunchFingerprint) -> Vec<PathBuf> {
-    fingerprint
-        .project_dirs()
-        .flat_map(|dir| ["target/classes", "target/test-classes"].map(|out| dir.join(out)))
-        .filter(|rel| root.join(rel).is_dir())
-        .collect()
 }

 fn record_path(cache: &Path, root: &Path, file: Option<&Path>) -> PathBuf {
@@ -83,7 +69,7 @@ pub fn menu_up_to_date(
        restamp(root, &record.fingerprint.mtime_preserved_edits(&current));
        return false;
    }
-    record.outputs.iter().all(|out| root.join(out).is_dir())
+    true
 }

 /// Records a successful menu build as the baseline for future up-to-date
@@ -105,8 +91,7 @@ pub fn record_menu_build(
    if path.parent().is_some_and(|p| fs::create_dir_all(p).is_err()) {
        return;
    }
-    let outputs = existing_outputs(root, &current);
-    let bytes = match serde_json::to_vec(&Record { fingerprint: current, outputs }) {
+    let bytes = match serde_json::to_vec(&Record { fingerprint: current }) {
        Ok(bytes) => bytes,
        _ => return,
    };
@@ -166,25 +151,6 @@ mod tests {
        assert!(menu_up_to_date(&cache, root, &model, None, &cancel));
    }

-    #[test]
-    fn deleted_outputs_invalidate_the_record() {
-        let dir = tempfile::tempdir().unwrap();
-        let root = dir.path();
-        let model = fixture(root);
-        let cache = root.join("cache");
-        let cancel = CancellationToken::new();
-        for out in ["app/target/classes/t", "lib/target/classes/t", "app/target/test-classes"] {
-            fs::create_dir_all(root.join(out)).unwrap();
-        }
-        record_menu_build(&cache, root, &model, None, &cancel);
-        assert!(menu_up_to_date(&cache, root, &model, None, &cancel));
-        // `mvn clean` outside the IDE: no input changed, but the classes are gone.
-        fs::remove_dir_all(root.join("lib/target")).unwrap();
-        assert!(!menu_up_to_date(&cache, root, &model, None, &cancel));
-        fs::create_dir_all(root.join("lib/target/classes")).unwrap();
-        assert!(menu_up_to_date(&cache, root, &model, None, &cancel));
-    }
-
    #[test]
    fn edit_invalidates_and_rerecord_restores_skip() {
        let dir = tempfile::tempdir().unwrap();
@@ -8,24 +8,6 @@ def canon = { File f -> f.canonicalPath }
 // the identity path (`:lib:core`, `:buildSrc`) tells them apart and addresses their tasks
 // from the root build. Internal API, hence the fallback.
 def identity = { Project p -> try { p.identityPath.toString() } catch (ignored) { p.path } }
-// The task copying a source set's resources and its output folder, when it changes them on the
-// way (filters, `expand`, renames, includes / excludes, extra sources): jdtls copies resources as
-// they are, so launches take them from Gradle. Internal API, hence the fallback.
-def processedResources = { Project p, s ->
-    try {
-        def task = p.tasks.findByName(s.processResourcesTaskName)
-        if (task == null) return null
-        def specs = 0
-        def changes = task.mainSpec.sourcePaths.size() > 1
-        task.rootSpec.buildRootResolver().walk { r ->
-            specs++
-            changes |= !r.allCopyActions.isEmpty() || !r.allIncludes.isEmpty() || !r.allExcludes.isEmpty() ||
-                !r.allIncludeSpecs.isEmpty() || !r.allExcludeSpecs.isEmpty() || r.destPath.segments.length > 0
-        }
-        // The root and main specs exist for every task; more come from `from(…) { … }`.
-        (changes || specs > 2) ? [task: task.name, dir: canon(task.destinationDir)] : null
-    } catch (ignored) { null }
-}

 def describe = { Project p ->
    def m = [path: identity(p), dir: canon(p.projectDir), buildDir: canon(p.layout.buildDirectory.get().asFile)]
@@ -44,10 +26,7 @@ def describe = { Project p ->
            def test = s.name == 'test' || s.name == 'testFixtures' || suites.contains(s.name) ||
                s.name.endsWith('Test') || s.name.endsWith('Tests') ||
                (!src.isEmpty() && src.every { ideaTests.contains(it) })
-            def set = [name: s.name, test: test, src: src, res: res]
-            def processed = processedResources(p, s)
-            if (processed != null) set.processed = processed
-            set
+            [name: s.name, test: test, src: src, res: res]
        }
    }
    try {
@@ -335,19 +335,6 @@ pub struct ReportedSourceSet {
    /// Absolute resource folders.
    #[serde(default)]
    pub res: Vec<String>,
-    /// Set when Gradle changes the resources while copying them (filters, `expand`, renames,
-    /// includes / excludes, extra sources), which the Java language server's copy does not.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub processed: Option<ProcessedResources>,
-}
-
-/// The task that copies a source set's resources, and where it writes them.
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub struct ProcessedResources {
-    /// Task name in its project (`processResources`).
-    pub task: String,
-    /// Absolute output folder.
-    pub dir: String,
 }

 const MODEL_LINE: &str = "@openidea-model\t";
@@ -536,7 +536,6 @@ mod tests {
                        crate::maven::LOCAL_REPO_TRACKING_ARG,
                        "-o",
                        "-Peditor",
-                        "-Djacoco.skip=true",
                        "test-compile"
                    ]
                );
@@ -73,9 +73,6 @@ struct GradleCache {
    /// The projects as Gradle evaluated them; empty in caches from before they were read.
    #[serde(default)]
    projects: Vec<ReportedProject>,
-    /// The projects report how their resources are processed; older caches are stale.
-    #[serde(default)]
-    resources: bool,
 }

 /// Init script printing every project, its source sets and Java version once configured.
@@ -247,12 +244,11 @@ pub fn apply_gradle_cache(root: &Path, cache_dir: &Path, model: &mut GradleModel
            }
        }
    }
-    // A successful sync from before projects were cached has not seen computed includes,
-    // nor, before resources were read, which launches need Gradle to process them.
-    let outdated = cache.error.is_none() && (cache.projects.is_empty() || !cache.resources);
+    // A successful sync from before projects were cached has not seen computed includes.
+    let without_projects = cache.error.is_none() && cache.projects.is_empty();
    model.synced_at = Some(cache.at_ms);
    model.sync_error = cache.error;
-    model.stale = outdated || cache.hash != hash_gradle_files(&gradle::build_files(root, model));
+    model.stale = without_projects || cache.hash != hash_gradle_files(&gradle::build_files(root, model));
 }

 // ---------------------------------------------------------------- processes
@@ -466,7 +462,6 @@ pub fn sync_gradle_model(
        error: (!out.success).then(|| error_summary(&out.text)),
        tasks: if out.success { gradle::parse_tasks(&out.text) } else { Vec::new() },
        projects,
-        resources: true,
    };
    write_cache(&cache_dir, GRADLE_CACHE, &cache)
 }
@@ -718,7 +713,6 @@ mod tests {
            test,
            src: src.iter().map(|p| core_src(p)).collect(),
            res: res.iter().map(|p| core_src(p)).collect(),
-            processed: None,
        };
        // A settings script's own println comes first; task listing lines follow.
        let out = format!(
@@ -743,15 +737,6 @@ mod tests {
        );
        let projects = parse_reported_projects(&out);
        assert_eq!(projects.len(), 3, "the malformed line is skipped");
-        // As the init script prints a set whose resources Gradle filters or renames.
-        let processed = parse_reported_projects(&format!(
-            "@openidea-model\t{}",
-            r#"{"path":":","dir":"/p","sourceSets":[{"name":"main","test":false,"src":[],"res":[],"processed":{"task":"processResources","dir":"/p/build/resources/main"}}]}"#
-        ));
-        assert_eq!(
-            processed[0].source_sets[0].processed,
-            Some(gradle::ProcessedResources { task: "processResources".into(), dir: "/p/build/resources/main".into() })
-        );
        let src = |p: &str| PathBuf::from(core_src(p));
        assert_eq!(
            gradle::reported_source_roots(&projects),
@@ -817,18 +802,12 @@ mod tests {
                    ..Default::default()
                })
                .collect(),
-            resources: true,
        };
        write_cache(&cache_dir, GRADLE_CACHE, &cache).unwrap();
        apply_gradle_cache(&root, &cache_dir, &mut model);
        assert_eq!(model.projects[1].tasks.len(), 1);
        assert!(model.projects[0].tasks.iter().any(|t| t.name == "wrapper"), "root keeps its defaults");
        assert!(!model.stale);
-        write_cache(&cache_dir, GRADLE_CACHE, &GradleCache { resources: false, ..cache.clone() }).unwrap();
-        let mut m = gradle::load(&root).unwrap();
-        apply_gradle_cache(&root, &cache_dir, &mut m);
-        assert!(m.stale, "synced before resource processing was read");
-        write_cache(&cache_dir, GRADLE_CACHE, &cache).unwrap();

        let stale_after = |script: &str| {
            std::fs::write(root.join("app/build.gradle"), script).unwrap();
@@ -862,7 +841,6 @@ mod tests {
                dir: root.to_string_lossy().into_owned(),
                ..Default::default()
            }],
-            resources: true,
            ..Default::default()
        };
        write_cache(&cache_dir, GRADLE_CACHE, &cache).unwrap();
@@ -78,10 +78,6 @@ pub struct EditorAppearanceSettings {
    /// Right margin and visual guides from Code Style.
    pub hard_wrap_guides: bool,
    pub intention_bulb: bool,
-    /// Draw doc comments (Javadoc, KDoc, JSDoc, rustdoc) as rendered documentation
-    /// instead of their source, as IDEA's option of the same name. View › Active
-    /// Editor › Render Documentation Comments overrides this for one editor.
-    pub render_doc_comments: bool,
    /// Distraction Free Mode: width of the centred text column, in characters.
    pub distraction_free_width: u32,
 }
@@ -104,7 +100,6 @@ impl Default for EditorAppearanceSettings {
            rainbow_indent_guides: false,
            hard_wrap_guides: true,
            intention_bulb: true,
-            render_doc_comments: false,
            distraction_free_width: 80,
        }
    }
@@ -338,23 +333,6 @@ pub struct InlayHintsSettings {
    pub code_vision_usages: bool,
    /// Code vision: last author of a declaration (VCS blame) beside its usages.
    pub code_vision_author: bool,
-    /// Code vision: "no usages" on declarations nothing uses (IDEA shows it; clicking searches everywhere).
-    pub code_vision_no_usages: bool,
-    /// Code vision: where the usages go, above the declaration or at the end of its line.
-    pub code_vision_usages_position: CodeVisionPosition,
-    /// Code vision: where the author goes, above the declaration or at the end of its line.
-    pub code_vision_author_position: CodeVisionPosition,
-}
-
-/// Editor › Inlay Hints › Code Vision position (IDEA's "Default position for metrics").
-#[derive(Clone, Copy, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub enum CodeVisionPosition {
-    /// A row of its own above the declaration.
-    #[default]
-    Top,
-    /// After the end of the declaration's first line.
-    Right,
 }

 impl Default for InlayHintsSettings {
@@ -366,9 +344,6 @@ impl Default for InlayHintsSettings {
            disabled_languages: Vec::new(),
            code_vision_usages: true,
            code_vision_author: true,
-            code_vision_no_usages: true,
-            code_vision_usages_position: CodeVisionPosition::Top,
-            code_vision_author_position: CodeVisionPosition::Top,
        }
    }
 }
@@ -275,11 +275,6 @@ pub enum DebugEvent {
    },
    /// The session's capabilities changed after it started: fetch them again.
    Capabilities,
-    /// The adapter's `invalidated` event: what it shows for `areas` (`all`, `stacks`, `threads`,
-    /// `variables`; empty means all) is stale and has to be fetched again.
-    Invalidated {
-        areas: Vec<String>,
-    },
    JvmBackend {
        state: JvmBackendState,
    },
@@ -335,12 +330,4 @@ mod tests {
        );
        assert_eq!(serde_json::to_value(DebugEvent::Capabilities).unwrap(), json!({"kind": "capabilities"}));
    }
-
-    #[test]
-    fn invalidated_event_json_shape() {
-        assert_eq!(
-            serde_json::to_value(DebugEvent::Invalidated { areas: vec!["variables".into()] }).unwrap(),
-            json!({"kind": "invalidated", "areas": ["variables"]})
-        );
-    }
 }
@@ -12,16 +12,11 @@ use std::path::{Path, PathBuf};

 use serde::{Deserialize, Deserializer, Serialize, Serializer};

-/// `p` as the UI sees it: `C:\a\b`, `c:\a\b` and `\\?\C:\a\b` become `C:/a/b`.
+/// `p` as the UI sees it: `C:\a\b` and `\\?\C:\a\b` become `C:/a/b`.
 pub fn to_ipc(p: &Path) -> String {
    #[cfg(windows)]
    {
-        let mut s = dunce::simplified(p).to_string_lossy().replace('\\', "/");
-        // The UI compares path strings; a drive letter is case-insensitive.
-        if s.as_bytes().get(1) == Some(&b':') {
-            s[..1].make_ascii_uppercase();
-        }
-        s
+        dunce::simplified(p).to_string_lossy().replace('\\', "/")
    }
    #[cfg(not(windows))]
    {
@@ -149,8 +144,5 @@ mod tests {
        assert_eq!(to_ipc(Path::new(r"\\?\C:\a\b")), "C:/a/b");
        assert_eq!(to_ipc(&Path::new("C:/a").join("b")), "C:/a/b");
        assert_eq!(serde_json::to_string(&IpcPath::from(r"C:\a\b")).unwrap(), r#""C:/a/b""#);
-        assert_eq!(to_ipc(Path::new(r"c:\a\b")), "C:/a/b");
-        assert_eq!(to_ipc(Path::new(r"\\?\d:\a")), "D:/a");
-        assert_eq!(to_ipc(Path::new(r"\\server\share\a")), "//server/share/a");
    }
 }
@@ -108,32 +108,9 @@ impl Default for DeploymentSettings {
 pub enum DeploymentType {
    #[default]
    Sftp,
-    Ftp,
-    /// FTP secured with `AUTH TLS` (explicit FTPS).
-    Ftps,
    Local,
 }

-/// Host and login of an FTP / FTPS deployment server. The password is kept with
-/// the saved passwords, under the server's id.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(default, rename_all = "camelCase")]
-pub struct FtpConnection {
-    pub host: String,
-    /// `None`: 21.
-    pub port: Option<u16>,
-    /// Empty: anonymous login.
-    pub user: String,
-    /// Passive mode (the client opens data connections); off: active mode.
-    pub passive: bool,
-}
-
-impl Default for FtpConnection {
-    fn default() -> Self {
-        Self { host: String::new(), port: None, user: String::new(), passive: true }
-    }
-}
-
 /// A deployment filesystem and how project folders map onto it.
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
@@ -143,8 +120,6 @@ pub struct DeploymentServer {
    pub name: String,
    /// [`SshConfiguration::id`].
    pub ssh_config: String,
-    /// FTP / FTPS servers.
-    pub ftp: FtpConnection,
    /// Absolute remote folder the mappings are relative to; empty = the login directory.
    pub root_path: String,
    /// Web server URL of the root (Open in Browser on the deployed file).
@@ -250,11 +225,8 @@ mod deployment_tests {
            serde_json::from_str(r#"{"id":"existing","sshConfig":"ssh","rootPath":"/srv"}"#).unwrap();
        assert_eq!(legacy.kind, DeploymentType::Sftp);
        assert_eq!(legacy.ssh_config, "ssh");
-        assert!(legacy.ftp.passive);
-        let ftp =
-            FtpConnection { host: "ftp.example.com".into(), port: Some(2121), user: "web".into(), passive: false };
-        for kind in [DeploymentType::Sftp, DeploymentType::Ftp, DeploymentType::Ftps, DeploymentType::Local] {
-            let server = DeploymentServer { kind, ftp: ftp.clone(), ..legacy.clone() };
+        for kind in [DeploymentType::Sftp, DeploymentType::Local] {
+            let server = DeploymentServer { kind, ..legacy.clone() };
            assert_eq!(
                serde_json::from_str::<DeploymentServer>(&serde_json::to_string(&server).unwrap()).unwrap(),
                server
@@ -63,8 +63,6 @@ pub struct Settings {
    pub agents: AgentSettings,
    /// Agents › MCP Server (global only).
    pub mcp_server: McpServerSettings,
-    /// Tools › Agents: Command Execution Policy.
-    pub agent_security: AgentSecuritySettings,
    /// Plugin settings (`[contributes.settings]`): plugin id → its values by key.
    #[specta(type = BTreeMap<String, BTreeMap<String, specta_typescript::Unknown>>)]
    pub plugins: BTreeMap<String, serde_json::Map<String, serde_json::Value>>,
@@ -263,9 +261,6 @@ pub enum WhileRunning {
 pub struct McpServerSettings {
    /// Serve the tools on 127.0.0.1 while the IDE runs.
    pub enabled: bool,
-    /// Run the tools that change the project or start processes without asking first
-    /// (IDEA's brave mode). Read from the IDE's own settings only, never a project's.
-    pub run_without_confirmation: bool,
 }

 /// Absent profiles retain automatic discovery for existing projects.
@@ -413,7 +408,6 @@ impl Default for Settings {
            cmake: CMakeSettings::default(),
            agents: AgentSettings::default(),
            mcp_server: McpServerSettings::default(),
-            agent_security: AgentSecuritySettings::default(),
            plugins: BTreeMap::new(),
        }
    }
@@ -586,10 +580,12 @@ pub struct AppearanceSettings {
    pub project_colors_in_toolbar: bool,
    pub dnd_with_alt_only: bool,
    pub menu_icons: bool,
-    /// `hamburger` | `merged` | `toolbar` (a separate row): main menu presentation in the frameless title bar.
+    /// `hamburger` | `merged`: main menu presentation in the frameless title bar.
    pub main_menu_style: String,
    /// A lone Alt press focuses or opens the main menu (IDEA `ide.windows.main.menu.focus.on.alt`).
    pub main_menu_alt: bool,
+    /// Always show the main menu titles instead of the hamburger button (#1521).
+    pub always_show_main_menu: bool,
    /// `subpixel` | `greyscale` | `none`
    pub ide_antialiasing: String,
    pub editor_antialiasing: String,
@@ -667,6 +663,7 @@ impl Default for AppearanceSettings {
            menu_icons: true,
            main_menu_style: "hamburger".into(),
            main_menu_alt: true,
+            always_show_main_menu: false,
            ide_antialiasing: "greyscale".into(),
            editor_antialiasing: "greyscale".into(),
            show_tool_window_bars: true,
@@ -805,9 +802,6 @@ pub struct FileSettings {
    pub file_types: BTreeMap<String, FileTypeAssociation>,
    /// Override File Type: file (project-relative and `/`-separated, or absolute) → language id.
    pub file_type_overrides: BTreeMap<String, String>,
-    /// File Types › Files opened in associated applications: file-name patterns
-    /// (`*.xlsx`) opened with the system application instead of an editor.
-    pub associated_applications: Vec<String>,
    /// Compose detection choices, keyed by project-relative file path.
    pub compose_file_overrides: BTreeMap<String, ComposeFileOverride>,
 }
@@ -844,15 +838,6 @@ impl Default for FileSettings {
            local_history_max_mb: 512,
            file_types: BTreeMap::new(),
            file_type_overrides: BTreeMap::new(),
-            associated_applications: vec![
-                "*.xlsx".into(),
-                "*.xls".into(),
-                "*.docx".into(),
-                "*.doc".into(),
-                "*.pptx".into(),
-                "*.ppt".into(),
-                "*.pdf".into(),
-            ],
            compose_file_overrides: BTreeMap::new(),
        }
    }
@@ -1203,8 +1188,6 @@ pub struct MavenSettings {
    pub threads: String,
    /// Active Maven profiles (`-P`), comma-separated; empty leaves profiles to the POM/settings.
    pub active_profiles: String,
-    /// Delegate IDE build/run actions to Maven: launches build with Maven (`javac`) instead of jdtls (ECJ).
-    pub delegate_build: bool,
 }

 impl MavenSettings {
@@ -1596,6 +1579,11 @@ mod tests {
        let off: Settings = serde_json::from_str(r#"{"appearance":{"mainMenuAlt":false}}"#).unwrap();
        assert!(!off.appearance.main_menu_alt);
        assert_eq!(serde_json::to_value(off).unwrap()["appearance"]["mainMenuAlt"], false);
+        let old: Settings = serde_json::from_str(r#"{"appearance":{"compactMode":true}}"#).unwrap();
+        assert!(!old.appearance.always_show_main_menu);
+        let shown: Settings = serde_json::from_str(r#"{"appearance":{"alwaysShowMainMenu":true}}"#).unwrap();
+        assert!(shown.appearance.always_show_main_menu);
+        assert_eq!(serde_json::to_value(shown).unwrap()["appearance"]["alwaysShowMainMenu"], true);
    }

    #[test]
@@ -1709,12 +1697,10 @@ mod maven_linkage_tests {
    fn maven_runner_jre_defaults_and_round_trips() {
        let old: MavenSettings = serde_json::from_str(r#"{"home":"/opt/maven"}"#).unwrap();
        assert!(old.runner_jre.is_empty());
-        assert!(!old.delegate_build);
        assert!(MavenSettings::default().runner_jre.is_empty());
-        let settings = MavenSettings { runner_jre: "/opt/jdk-21".into(), delegate_build: true, ..old };
+        let settings = MavenSettings { runner_jre: "/opt/jdk-21".into(), ..old };
        let encoded = serde_json::to_string(&settings).unwrap();
        assert!(encoded.contains(r#""runnerJre":"/opt/jdk-21""#));
-        assert!(encoded.contains(r#""delegateBuild":true"#));
        assert_eq!(serde_json::from_str::<MavenSettings>(&encoded).unwrap(), settings);
    }

@@ -138,11 +138,8 @@ impl WorkspaceEdit {
                        continue;
                    }
                    *expected = expected.or(version);
-                    // Repeats within one entry are intended (LSP inserts at one position
-                    // apply in order); only an alias entry repeats what is already merged.
-                    let merged = own.len();
                    for edit in edits {
-                        if !own[..merged].contains(&edit) {
+                        if !own.contains(&edit) {
                            own.push(edit);
                        }
                    }
@@ -280,40 +277,10 @@ pub struct OutlineItem {
 /// Fuzzy-match highlight: indices (in chars of the displayed string) that matched.
 pub type MatchIndices = Vec<u32>;

-#[cfg(test)]
+#[cfg(all(test, unix))]
 mod workspace_edit_tests {
    use super::*;

-    #[test]
-    fn repeated_edits_within_one_entry_survive_but_repeats_across_entries_do_not() {
-        let path = PathBuf::from("missing-dir/main.ts");
-        let at = |line, text: &str| TextEdit {
-            range: Range::new(Pos::new(line, 0), Pos::new(line, 0)),
-            new_text: text.into(),
-        };
-        let entry = |edits: Vec<TextEdit>| FileEdit::Edit { path: path.clone().into(), edits, version: None };
-        let (nl, brace, other) = (at(0, "\n"), at(1, "}"), at(2, "x"));
-        for (entries, expected) in [
-            (vec![vec![nl.clone(), nl.clone()]], vec![nl.clone(), nl.clone()]),
-            (vec![vec![brace.clone(), nl.clone(), brace.clone()]], vec![brace.clone(), nl.clone(), brace.clone()]),
-            (vec![vec![nl.clone(), nl.clone()], vec![nl.clone(), nl.clone()]], vec![nl.clone(), nl.clone()]),
-            (vec![vec![nl.clone()], vec![nl.clone(), other.clone()]], vec![nl.clone(), other.clone()]),
-            (
-                vec![vec![nl.clone()], vec![other.clone(), other.clone()]],
-                vec![nl.clone(), other.clone(), other.clone()],
-            ),
-        ] {
-            let mut workspace =
-                WorkspaceEdit { files: entries.clone().into_iter().map(entry).collect(), ..Default::default() };
-            workspace.deduplicate();
-            assert_eq!(workspace.files, [entry(expected.clone())], "{entries:?}");
-            let once = workspace.clone();
-            workspace.deduplicate();
-            assert_eq!(workspace, once, "{entries:?}");
-        }
-    }
-
-    #[cfg(unix)]
    #[test]
    fn aliases_are_one_edit_but_resource_operations_preserve_order() {
        let dir = tempfile::tempdir().unwrap();
@@ -192,33 +192,6 @@ pub struct IssueLink {
    pub link: String,
 }

-/// Per-level colours for console log lines: a line whose level is detected
-/// (`ERROR`, `WARN`, …) takes the level's colour; ANSI colours the program
-/// prints itself win over it. Values are CSS colours, usually scheme tokens.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
-#[serde(default, rename_all = "camelCase")]
-pub struct LogLevelColors {
-    pub enabled: bool,
-    pub error: String,
-    pub warn: String,
-    pub info: String,
-    pub debug: String,
-    pub trace: String,
-}
-
-impl Default for LogLevelColors {
-    fn default() -> Self {
-        Self {
-            enabled: false,
-            error: "var(--ansi-red)".into(),
-            warn: "var(--ansi-yellow)".into(),
-            info: "var(--ansi-green)".into(),
-            debug: "var(--ansi-cyan)".into(),
-            trace: "var(--ansi-magenta)".into(),
-        }
-    }
-}
-
 /// Build, Execution, Deployment › Console.
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
@@ -230,8 +203,6 @@ pub struct ConsoleSettings {
    pub encoding: String,
    /// Consecutive lines containing any of these are folded.
    pub fold_patterns: Vec<String>,
-    /// Log lines take the colour of their level (Run/Debug consoles).
-    pub log_colors: LogLevelColors,
 }

 impl Default for ConsoleSettings {
@@ -248,7 +219,6 @@ impl Default for ConsoleSettings {
                "at node:internal/".into(),
                "<frozen importlib._bootstrap".into(),
            ],
-            log_colors: LogLevelColors::default(),
        }
    }
 }
@@ -442,30 +412,3 @@ impl Default for ExternalTool {
        }
    }
 }
-
-/// Tools › Agents: Command Execution Policy (whitelist and blacklist patterns).
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(default, rename_all = "camelCase")]
-pub struct AgentSecuritySettings {
-    /// Commands or patterns (`git status*`, `pwd`) automatically approved without prompting.
-    pub allowed_commands: Vec<String>,
-    /// Commands or patterns (`rm -rf *`, `mkfs*`) automatically rejected.
-    pub blocked_commands: Vec<String>,
-}
-
-impl Default for AgentSecuritySettings {
-    fn default() -> Self {
-        Self {
-            allowed_commands: Vec::new(),
-            blocked_commands: vec![
-                "rm -rf *".into(),
-                "rm -rf /".into(),
-                "mkfs*".into(),
-                "dd *".into(),
-                ":(){ :|:& };:".into(),
-                "shutdown*".into(),
-                "reboot*".into(),
-            ],
-        }
-    }
-}
@@ -14,7 +14,6 @@ ide-jsonrpc.workspace = true
 ide-jvm-attach.workspace = true
 ide-jvm-inspect.workspace = true
 ide-jdwp.workspace = true
-ide-heap.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 specta.workspace = true
@@ -72,13 +72,6 @@ fn builtin(adapter: &str) -> Option<DebuggerConfig> {
            "stdio",
            "Install Kotlin Debug Adapter in Settings › Languages & Frameworks › Language Servers",
        ),
-        // Inside the language server: reached through `debugServer`, never started.
-        "kotlin-lsp" => cfg(
-            "kotlin-lsp",
-            &[],
-            "tcp",
-            "Install JetBrains Kotlin LSP in Settings › Languages & Frameworks › Language Servers",
-        ),
        // Windows installs `python.exe`; `python3.exe` there is at most a Store alias.
        "debugpy" => cfg(
            if cfg!(windows) { "python" } else { "python3" },
@@ -105,12 +98,9 @@ fn builtin(adapter: &str) -> Option<DebuggerConfig> {
            "stdio",
            "Install netcoredbg (.NET debugger) in Settings › Languages & Frameworks › Language Servers",
        ),
-        "lldb-dap" => cfg(
-            "lldb-dap",
-            &[],
-            "stdio",
-            "Install LLVM's lldb-dap (brew install llvm), or on macOS use the one found by xcrun -f lldb-dap",
-        ),
+        "lldb-dap" => {
+            cfg("lldb-dap", &[], "stdio", "Install LLVM's lldb-dap (brew install llvm; on macOS `xcrun -f lldb-dap`)")
+        }
        // GDB's own DAP interpreter, stdio transport. The DAP support it needs shipped in GDB 14
        // (`prepare_gdb` refuses older ones with the required version in the message).
        "gdb" => cfg(
@@ -127,12 +117,6 @@ fn builtin(adapter: &str) -> Option<DebuggerConfig> {
            "tcp",
            "Install Microsoft java-debug (Settings › Languages & Frameworks › Language Servers)",
        ),
-        "bun-dap" => cfg(
-            "bun-dap",
-            &["${port}", "127.0.0.1"],
-            "tcp",
-            "To install bun-dap: git clone https://github.com/morf-bls/bun-dap, run bun install && bun run build, then place dist/bun-dap in your PATH",
-        ),
        _ => return None,
    })
 }
@@ -342,16 +342,4 @@ mod tests {
        assert_eq!(error_message(&msg), "cannot find a.py");
        assert_eq!(error_message(&json!({"message": "nope"})), "nope");
    }
-
-    #[test]
-    fn a_failed_launch_response_keeps_delves_too_old_error_verbatim() {
-        // The UI's repair offer keys off this exact wording (`missingAdapter`), so the
-        // conversion to the IPC error must not fold it into a generic message.
-        let message = "Failed to launch /p/api: Version of Delve is too old for Go version go1.27.0 \
-                       (maximum supported version 1.26, suppress this error with --check-go-version=false)";
-        let e = ide_core::IdeError::from(DapError::Failed { command: "launch".into(), message: message.into() });
-        assert_eq!(e.kind, ide_core::error::ErrorKind::InvalidInput);
-        assert_eq!(e.message, format!("launch failed: {message}"));
-        assert!(e.message.contains("Version of Delve is too old for Go version go1.27.0"));
-    }
 }
@@ -1,293 +0,0 @@
-//! A heap dump of a debugged JVM, written over its attach listener into a snapshot directory.
-
-use super::snapshot::{AttachProbe, JdkProbe, attach_failure, gone, pick_jvm_pid};
-use super::{
-    JvmMemoryState, JvmMemoryUnavailable, JvmTarget, histogram_pid, keep_found, lookup, resolve_jvm,
-    safe_while_suspended, session_target,
-};
-use crate::session::Session;
-use ide_core::{CancellationToken, IdeError, IdeResult};
-use ide_jvm_attach::{AttachError, HeapDumpReply};
-use serde::{Deserialize, Serialize};
-use specta::Type;
-use std::future::Future;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-const DUMP_FILE: &str = "dump.hprof";
-/// For a refusal whose reply holds no reason: empty, or only the line announcing the dump.
-const NO_REASON: &str = "the JVM wrote no heap dump and gave no reason";
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
-#[serde(tag = "kind", rename_all = "camelCase", rename_all_fields = "camelCase")]
-pub enum JvmHeapUnavailable {
-    /// The reason a class table could not be read applies to the dump too.
-    Memory {
-        reason: JvmMemoryUnavailable,
-    },
-    /// Bytes.
-    NotEnoughDiskSpace {
-        needed: u64,
-        available: u64,
-    },
-    DumpFailed {
-        message: String,
-    },
-    DumpTimedOut {
-        seconds: u32,
-    },
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct JvmHeapDump {
-    pub path: PathBuf,
-    /// The class histogram taken just before the dump.
-    pub histogram: Vec<ide_heap::HistogramEntry>,
-    /// Raw `VM.flags`; empty when the JVM did not answer.
-    pub vm_flags: String,
-    /// 0 when unknown.
-    pub java_major: u32,
-    /// Empty when unknown.
-    pub java_version: String,
-    pub pid: u32,
-    pub taken_while_suspended: bool,
-    pub dump_ms: u32,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum JvmHeapOutcome {
-    Ready(JvmHeapDump),
-    /// The snapshot directory has been deleted.
-    Unavailable(JvmHeapUnavailable),
-    /// The snapshot directory has been deleted.
-    Cancelled,
-}
-
-pub(crate) async fn session_heap_dump(
-    session: Arc<Session>,
-    dir: PathBuf,
-    cancel: CancellationToken,
-) -> IdeResult<JvmHeapOutcome> {
-    let launched = histogram_pid(&session);
-    let capture = {
-        let (dir, cancel) = (dir.clone(), cancel.clone());
-        async move {
-            let target = session_target(&session, launched);
-            let probe = |suspended| -> Arc<dyn AttachProbe> { Arc::new(JdkProbe { suspended }) };
-            let stopped = session.clone();
-            let suspended = move || capture_suspended(&stopped);
-            heap_dump_with(&session.jvm_memory, suspended, probe, target, dir, cancel).await
-        }
-    };
-    detached(capture, dir, cancel).await
-}
-
-/// The JVM can be suspended before the adapter reports the stop, so a session with a JDWP link
-/// also counts the link's view.
-pub(super) fn capture_suspended(session: &Session) -> bool {
-    session.suspended.get()
-        || session
-            .jdwp_link
-            .lock()
-            .as_ref()
-            .is_some_and(|link| matches!(link.state(), ide_jdwp::LinkState::Suspended { .. }))
-}
-
-/// Runs `capture` in a task of its own, so a caller that stops waiting cannot release the
-/// session's lock while the JVM is still writing the dump and let a class-table request run
-/// next to it. On `cancel` returns at once and deletes `dir`.
-pub(super) async fn detached(
-    capture: impl Future<Output = IdeResult<JvmHeapOutcome>> + Send + 'static,
-    dir: PathBuf,
-    cancel: CancellationToken,
-) -> IdeResult<JvmHeapOutcome> {
-    let task = tokio::spawn(capture);
-    tokio::select! {
-        joined = task => joined.map_err(|e| IdeError::internal(format!("JVM heap dump failed: {e}")))?,
-        () = cancel.cancelled() => {
-            discard_later(dir).await;
-            Ok(JvmHeapOutcome::Cancelled)
-        }
-    }
-}
-
-/// Holds `state`'s lock throughout, as a class-table request does; `suspended` and then `probe`
-/// are read once it is held, and `suspended` again by [`take_heap_dump`]. Anything but `Ready`
-/// deletes `dir`.
-pub(super) async fn heap_dump_with(
-    state: &tokio::sync::Mutex<JvmMemoryState>,
-    suspended: impl Fn() -> bool + Send + Sync + 'static,
-    probe: impl FnOnce(bool) -> Arc<dyn AttachProbe>,
-    target: JvmTarget<'_>,
-    dir: PathBuf,
-    cancel: CancellationToken,
-) -> IdeResult<JvmHeapOutcome> {
-    // The capture's histogram never becomes the Memory view's baseline, so the state is unused.
-    let _turn = state.lock().await;
-    let outcome = capture(suspended, probe, target, dir.clone(), cancel).await;
-    if !matches!(outcome, Ok(JvmHeapOutcome::Ready(_))) {
-        discard_later(dir).await;
-    }
-    outcome
-}
-
-async fn capture(
-    suspended_now: impl Fn() -> bool + Send + Sync + 'static,
-    probe: impl FnOnce(bool) -> Arc<dyn AttachProbe>,
-    target: JvmTarget<'_>,
-    dir: PathBuf,
-    cancel: CancellationToken,
-) -> IdeResult<JvmHeapOutcome> {
-    if cancel.is_cancelled() {
-        return Ok(JvmHeapOutcome::Cancelled);
-    }
-    let suspended = suspended_now();
-    let lookup = match lookup(target) {
-        Ok(lookup) => lookup,
-        Err(reason) => return Ok(memory(reason)),
-    };
-    let probe = probe(suspended);
-    let (found, outcome) = tokio::task::spawn_blocking(move || match resolve_jvm(lookup, &*probe, suspended) {
-        Ok((tree, found)) => (found, take_heap_dump(&*probe, &tree, suspended, &suspended_now, &dir, &cancel)),
-        Err(reason) => (None, Ok(memory(reason))),
-    })
-    .await
-    .map_err(|e| IdeError::internal(format!("JVM heap dump failed: {e}")))?;
-    keep_found(target, found);
-    outcome
-}
-
-/// `tree` starts with the session's reported pid, followed by its descendants. `suspended` is
-/// the stop read when the capture began; `suspended_now` reads it again. Anything but `Ready`
-/// deletes `dir`.
-pub(crate) fn take_heap_dump(
-    probe: &dyn AttachProbe,
-    tree: &[i32],
-    suspended: bool,
-    suspended_now: &dyn Fn() -> bool,
-    dir: &Path,
-    cancel: &CancellationToken,
-) -> IdeResult<JvmHeapOutcome> {
-    let outcome = dump(probe, tree, suspended, suspended_now, dir, cancel);
-    if !matches!(outcome, Ok(JvmHeapOutcome::Ready(_))) {
-        discard(dir);
-    }
-    outcome
-}
-
-fn dump(
-    probe: &dyn AttachProbe,
-    tree: &[i32],
-    suspended: bool,
-    suspended_now: &dyn Fn() -> bool,
-    dir: &Path,
-    cancel: &CancellationToken,
-) -> IdeResult<JvmHeapOutcome> {
-    use JvmHeapUnavailable as H;
-    use JvmMemoryUnavailable as U;
-    let Some(root) = tree.first().and_then(|&p| u32::try_from(p).ok()) else {
-        return Ok(memory(U::NoJvmProcess));
-    };
-    let Some(jvm) = pick_jvm_pid(tree, |p| probe.has_listener(p)) else {
-        return Ok(memory(gone(probe, root)));
-    };
-
-    let version = probe.version(jvm);
-    let java_major = version.as_ref().map_or(0, |v| v.major);
-    let safe = safe_while_suspended(version.as_ref());
-    let unsafe_stop = || Ok(memory(U::UnsafeWhileSuspended { java_major }));
-    if suspended && !safe {
-        return unsafe_stop();
-    }
-    // The program may stop during the histogram, and a stopped JDK below 17 hangs on the next
-    // request until it resumes.
-    let stopped_since = || !safe && suspended_now();
-
-    let text = match probe.histogram(jvm) {
-        Ok(text) => text,
-        Err(e) => return attach_failure(probe, jvm, e, "class histogram").map(memory),
-    };
-    let histogram: Vec<ide_heap::HistogramEntry> = ide_jvm_attach::parse_class_histogram(&text)
-        .rows
-        .into_iter()
-        .map(|r| ide_heap::HistogramEntry { name: r.name, instances: r.instances, bytes: r.bytes })
-        .collect();
-    let (instances, bytes) =
-        histogram.iter().fold((0u64, 0u64), |(i, b), e| (i.saturating_add(e.instances), b.saturating_add(e.bytes)));
-    let needed = ide_heap::capture_need(bytes, instances);
-    if let Some(available) = probe.free_bytes(dir)
-        && available < needed
-    {
-        return Ok(JvmHeapOutcome::Unavailable(H::NotEnoughDiskSpace { needed, available }));
-    }
-
-    if stopped_since() {
-        return unsafe_stop();
-    }
-    // Without flags the index assumes the default object layout.
-    let vm_flags = probe.vm_flags(jvm).unwrap_or_else(|e| {
-        tracing::debug!("VM.flags of JVM {jvm}: {e}");
-        String::new()
-    });
-    if cancel.is_cancelled() {
-        return Ok(JvmHeapOutcome::Cancelled);
-    }
-    if stopped_since() {
-        return unsafe_stop();
-    }
-
-    let path = dir.join(DUMP_FILE);
-    let timeout = ide_jvm_attach::dump_timeout(bytes);
-    let started = std::time::Instant::now();
-    let reply = probe.heap_dump(jvm, &path, timeout);
-    let dump_ms = u32::try_from(started.elapsed().as_millis()).unwrap_or(u32::MAX);
-    if cancel.is_cancelled() {
-        return Ok(JvmHeapOutcome::Cancelled);
-    }
-    let failed = |message: String| Ok(JvmHeapOutcome::Unavailable(H::DumpFailed { message }));
-    match reply {
-        Ok(HeapDumpReply::Created { .. }) => {
-            if !std::fs::metadata(&path).is_ok_and(|m| m.is_file() && m.len() > 0) {
-                return failed(format!("the JVM reported a heap dump, but {} is missing or empty", path.display()));
-            }
-            Ok(JvmHeapOutcome::Ready(JvmHeapDump {
-                path,
-                histogram,
-                vm_flags,
-                java_major,
-                java_version: version.map(|v| v.text).unwrap_or_default(),
-                pid: jvm,
-                taken_while_suspended: suspended,
-                dump_ms,
-            }))
-        }
-        Ok(HeapDumpReply::Refused { message }) if message.is_empty() || message.starts_with("Dumping heap to") => {
-            failed(NO_REASON.into())
-        }
-        Ok(HeapDumpReply::Refused { message }) => failed(message),
-        Err(AttachError::Timeout) => {
-            let seconds = u32::try_from(timeout.as_secs()).unwrap_or(u32::MAX);
-            Ok(JvmHeapOutcome::Unavailable(H::DumpTimedOut { seconds }))
-        }
-        // A running JDK rejects an argument with a non-zero result code.
-        Err(AttachError::Command { message, .. }) => failed(message),
-        Err(e) => attach_failure(probe, jvm, e, "heap dump").map(memory),
-    }
-}
-
-fn memory(reason: JvmMemoryUnavailable) -> JvmHeapOutcome {
-    JvmHeapOutcome::Unavailable(JvmHeapUnavailable::Memory { reason })
-}
-
-fn discard(dir: &Path) {
-    if let Err(e) = std::fs::remove_dir_all(dir)
-        && e.kind() != std::io::ErrorKind::NotFound
-    {
-        tracing::warn!("could not delete heap snapshot directory {}: {e}", dir.display());
-    }
-}
-
-/// A dump may be large, so it is deleted off the async threads.
-async fn discard_later(dir: PathBuf) {
-    let _ = tokio::task::spawn_blocking(move || discard(&dir)).await;
-}
@@ -2,7 +2,6 @@
 //! that is unavailable, counted by the debugger; and the JVM's objects through the debugger.

 mod fallback;
-mod heap;
 mod inspect;
 mod scan;
 mod snapshot;
@@ -21,7 +20,6 @@ use std::sync::Arc;
 use std::sync::atomic::{AtomicI64, Ordering};
 use std::time::Duration;

-pub use heap::*;
 pub use inspect::{JvmFieldsResult, JvmInspectUnavailable, JvmInstancesResult, JvmObjectRef, JvmReferrersResult};
 pub(crate) use inspect::{fields, instances, referrers, set_inspector, watch_link};
 #[cfg(all(test, unix))]
@@ -29,7 +27,7 @@ pub(crate) use scan::watch_for_attached_jvm;
 pub(crate) use scan::{JvmFinder, attach_target, find_attached_jvm, find_local_jvm, local_jdwp_port};
 use snapshot::{AttachProbe, JdkProbe, take_snapshot};

-pub const JVM_MEMORY_ADAPTERS: &[&str] = &["java-debug", crate::kotlin::ADAPTER, crate::kotlin_lsp::ADAPTER];
+pub const JVM_MEMORY_ADAPTERS: &[&str] = &["java-debug", crate::kotlin::ADAPTER];
 pub const HISTOGRAM_TIMEOUT: Duration = Duration::from_secs(10);

 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
@@ -6,16 +6,14 @@ use super::{
    safe_while_suspended,
 };
 use ide_core::IdeResult;
-use ide_jvm_attach::{AttachError, HeapDumpReply, HistogramRow, JavaVersion};
+use ide_jvm_attach::{AttachError, HistogramRow, JavaVersion};
 use std::collections::HashMap;
-use std::path::Path;
 use std::time::Duration;

 /// Version probe for a JVM whose `release` file could not be read.
 const VERSION_TIMEOUT: Duration = Duration::from_secs(2);
-const FLAGS_TIMEOUT: Duration = Duration::from_secs(2);

-/// The attach calls a snapshot or a heap dump makes, so tests can stand in for a JVM.
+/// The attach calls a snapshot makes, so tests can stand in for a JVM.
 pub(crate) trait AttachProbe: Send + Sync {
    fn has_listener(&self, pid: u32) -> bool;
    /// Asks only the JVMs whose pid `may_query` accepts.
@@ -23,10 +21,6 @@ pub(crate) trait AttachProbe: Send + Sync {
    fn version(&self, pid: u32) -> Option<JavaVersion>;
    fn histogram(&self, pid: u32) -> Result<String, AttachError>;
    fn alive(&self, pid: u32) -> bool;
-    fn vm_flags(&self, pid: u32) -> Result<String, AttachError>;
-    fn heap_dump(&self, pid: u32, path: &Path, timeout: Duration) -> Result<HeapDumpReply, AttachError>;
-    /// `None` where the free space is not known.
-    fn free_bytes(&self, dir: &Path) -> Option<u64>;
 }

 pub(super) struct JdkProbe {
@@ -61,18 +55,6 @@ impl AttachProbe for JdkProbe {
    fn alive(&self, pid: u32) -> bool {
        alive(pid)
    }
-
-    fn vm_flags(&self, pid: u32) -> Result<String, AttachError> {
-        ide_jvm_attach::vm_flags(pid, FLAGS_TIMEOUT)
-    }
-
-    fn heap_dump(&self, pid: u32, path: &Path, timeout: Duration) -> Result<HeapDumpReply, AttachError> {
-        ide_jvm_attach::heap_dump(pid, path, timeout)
-    }
-
-    fn free_bytes(&self, dir: &Path) -> Option<u64> {
-        ide_heap::free_bytes(dir)
-    }
 }

 fn alive(pid: u32) -> bool {
@@ -1,13 +1,10 @@
 use super::fallback::{debugger_snapshot, falls_back};
-use super::heap::*;
 use super::scan::*;
 use super::snapshot::*;
 use super::test_support::{BareSession, FakeInspector, bare_session, bare_session_of};
 use super::*;
-use ide_core::CancellationToken;
-use ide_jvm_attach::{AttachError, HeapDumpReply, HistogramRow, JavaVersion};
+use ide_jvm_attach::{AttachError, HistogramRow, JavaVersion};
 use std::collections::VecDeque;
-use std::path::{Path, PathBuf};
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};

 fn row(name: &str, instances: u64, bytes: u64) -> HistogramRow {
@@ -28,52 +25,8 @@ struct FakeProbe {
    asked: parking_lot::Mutex<Vec<u32>>,
    /// Pids the scan sent a request to.
    queried: parking_lot::Mutex<Vec<u32>>,
-    /// Attach commands sent, in order: `histogram`, `vm_flags`, `heap_dump`.
+    /// Attach commands sent, in order.
    commands: parking_lot::Mutex<Vec<&'static str>>,
-    dumps: parking_lot::Mutex<VecDeque<Result<HeapDumpReply, AttachError>>>,
-    dump_paths: parking_lot::Mutex<Vec<PathBuf>>,
-    /// Each heap dump waits for this gate to open.
-    dump_gate: Option<Arc<Gate>>,
-    /// A `Created` reply writes this many bytes to the dump path first.
-    dump_bytes: usize,
-    free: Option<u64>,
-    /// Answering this command stops the program: runs the hook.
-    stops_on: Option<(&'static str, StopHook)>,
-}
-
-type StopHook = Box<dyn Fn() + Send + Sync>;
-
-/// Holds a blocking call until the test opens it.
-#[derive(Default)]
-struct Gate {
-    entered: tokio::sync::Notify,
-    open: parking_lot::Mutex<bool>,
-    opened: parking_lot::Condvar,
-}
-
-impl Gate {
-    fn pass(&self) {
-        self.entered.notify_one();
-        let mut open = self.open.lock();
-        while !*open {
-            self.opened.wait(&mut open);
-        }
-    }
-
-    fn release(&self) {
-        *self.open.lock() = true;
-        self.opened.notify_all();
-    }
-}
-
-/// Opens the gate when dropped: a failed assertion must not leave a blocking thread waiting,
-/// since the runtime's shutdown waits for it.
-struct OpenOnDrop(Arc<Gate>);
-
-impl Drop for OpenOnDrop {
-    fn drop(&mut self) {
-        self.0.release();
-    }
 }

 impl FakeProbe {
@@ -91,26 +44,11 @@ impl FakeProbe {
            asked: parking_lot::Mutex::new(Vec::new()),
            queried: parking_lot::Mutex::new(Vec::new()),
            commands: parking_lot::Mutex::new(Vec::new()),
-            dumps: parking_lot::Mutex::new(VecDeque::new()),
-            dump_paths: parking_lot::Mutex::new(Vec::new()),
-            dump_gate: None,
-            dump_bytes: 64,
-            free: None,
-            stops_on: None,
-        }
-    }
-
-    fn record(&self, command: &'static str) {
-        self.commands.lock().push(command);
-        if let Some((on, stop)) = &self.stops_on
-            && *on == command
-        {
-            stop();
        }
    }

    fn enter(&self, command: &'static str) {
-        self.record(command);
+        self.commands.lock().push(command);
        let now = self.in_flight.fetch_add(1, Ordering::SeqCst) + 1;
        self.max_in_flight.fetch_max(now, Ordering::SeqCst);
    }
@@ -146,31 +84,8 @@ impl AttachProbe for FakeProbe {
    fn alive(&self, _pid: u32) -> bool {
        self.alive
    }
-    fn vm_flags(&self, _pid: u32) -> Result<String, AttachError> {
-        self.record("vm_flags");
-        Ok(FLAGS.into())
-    }
-    fn heap_dump(&self, _pid: u32, path: &Path, _timeout: Duration) -> Result<HeapDumpReply, AttachError> {
-        self.enter("heap_dump");
-        self.dump_paths.lock().push(path.to_owned());
-        if let Some(gate) = &self.dump_gate {
-            gate.pass();
-        }
-        let reply = self.dumps.lock().pop_front().expect("unexpected heap dump request");
-        if matches!(reply, Ok(HeapDumpReply::Created { .. })) && self.dump_bytes > 0 {
-            // Fails like the JVM's write once the directory is gone.
-            let _ = std::fs::write(path, vec![0; self.dump_bytes]);
-        }
-        self.leave();
-        reply
-    }
-    fn free_bytes(&self, _dir: &Path) -> Option<u64> {
-        self.free
-    }
 }

-const FLAGS: &str = "-XX:+UseCompressedOops -XX:+StartAttachListener";
-
 const HISTOGRAM: &str = " num     #instances         #bytes  class name (module)\n-------------------------------------------------------\n   1:             5             80  A\n   2:             1             16  B\nTotal             6             96\n";

 fn unavailable(r: IdeResult<Result<(JvmMemorySnapshot, ClassCounts), JvmMemoryUnavailable>>) -> JvmMemoryUnavailable {
@@ -776,416 +691,12 @@ fn debugger_rows_are_ordered_by_instances() {
    assert_eq!(names, ["A", "C", "B"]);
 }

-/// A snapshot directory inside a temporary one, so the capture may delete it.
-fn snapshot_dir(name: &str) -> (tempfile::TempDir, PathBuf) {
-    let root = tempfile::tempdir().unwrap();
-    let dir = root.path().join(name);
-    std::fs::create_dir(&dir).unwrap();
-    (root, dir)
-}
-
-/// JVM 12 at Java `major`, answering [`HISTOGRAM`] once and `dumps` in turn.
-fn dumping(major: u32, dumps: Vec<Result<HeapDumpReply, AttachError>>) -> FakeProbe {
-    let mut probe = FakeProbe::new(12, vec![Ok(HISTOGRAM.into())]);
-    probe.version = Some(JavaVersion { major, text: format!("{major}.0.1") });
-    probe.dumps = parking_lot::Mutex::new(dumps.into());
-    probe
-}
-
-fn created() -> Result<HeapDumpReply, AttachError> {
-    Ok(HeapDumpReply::Created { bytes: Some(64) })
-}
-
-fn memory(reason: JvmMemoryUnavailable) -> JvmHeapOutcome {
-    JvmHeapOutcome::Unavailable(JvmHeapUnavailable::Memory { reason })
-}
-
-fn dump_failed(message: &str) -> JvmHeapOutcome {
-    JvmHeapOutcome::Unavailable(JvmHeapUnavailable::DumpFailed { message: message.into() })
-}
-
-fn ready(outcome: IdeResult<JvmHeapOutcome>) -> JvmHeapDump {
-    match outcome.unwrap() {
-        JvmHeapOutcome::Ready(dump) => dump,
-        other => panic!("{other:?}"),
-    }
-}
-
-fn entry(name: &str, instances: u64, bytes: u64) -> ide_heap::HistogramEntry {
-    ide_heap::HistogramEntry { name: name.into(), instances, bytes }
-}
-
-#[test]
-fn suspended_jdk11_refuses_without_sending() {
-    let (_root, dir) = snapshot_dir("snap");
-    let probe = dumping(11, vec![created()]);
-    let outcome = take_heap_dump(&probe, &[12], true, &|| true, &dir, &CancellationToken::new()).unwrap();
-    assert_eq!(outcome, memory(JvmMemoryUnavailable::UnsafeWhileSuspended { java_major: 11 }));
-    assert!(probe.commands.lock().is_empty());
-    assert!(!dir.exists());
-}
-
-#[test]
-fn suspended_jdk17_dumps() {
-    let (_root, dir) = snapshot_dir("snap");
-    let probe = dumping(17, vec![created()]);
-    let dump = ready(take_heap_dump(&probe, &[10, 12], true, &|| true, &dir, &CancellationToken::new()));
-    assert_eq!(*probe.commands.lock(), ["histogram", "vm_flags", "heap_dump"]);
-    assert_eq!(*probe.dump_paths.lock(), [dir.join("dump.hprof")]);
-    let expected = JvmHeapDump {
-        path: dir.join("dump.hprof"),
-        histogram: vec![entry("A", 5, 80), entry("B", 1, 16)],
-        vm_flags: FLAGS.into(),
-        java_major: 17,
-        java_version: "17.0.1".into(),
-        pid: 12,
-        taken_while_suspended: true,
-        dump_ms: dump.dump_ms,
-    };
-    assert_eq!(dump, expected);
-    assert!(dump.path.is_file());
-}
-
-#[test]
-fn running_jdk8_dumps() {
-    let (_root, dir) = snapshot_dir("snap");
-    let probe = dumping(8, vec![created()]);
-    let dump = ready(take_heap_dump(&probe, &[12], false, &|| false, &dir, &CancellationToken::new()));
-    assert_eq!((dump.java_major, dump.taken_while_suspended), (8, false));
-    assert_eq!(*probe.commands.lock(), ["histogram", "vm_flags", "heap_dump"]);
-}
-
-#[test]
-fn not_enough_disk_space_refuses_before_dump() {
-    let (_root, dir) = snapshot_dir("snap");
-    let mut probe = dumping(21, vec![created()]);
-    let gib = 1u64 << 30;
-    let histogram = format!("   1:      10000000     {gib}  [B\nTotal      10000000     {gib}\n");
-    probe.histograms = parking_lot::Mutex::new(vec![Ok(histogram)].into());
-    probe.free = Some(512 << 20);
-    let outcome = take_heap_dump(&probe, &[12], false, &|| false, &dir, &CancellationToken::new()).unwrap();
-    let needed = gib + 1_060_000_000 + gib;
-    assert_eq!(
-        outcome,
-        JvmHeapOutcome::Unavailable(JvmHeapUnavailable::NotEnoughDiskSpace { needed, available: 512 << 20 })
-    );
-    assert_eq!(*probe.commands.lock(), ["histogram"]);
-    assert!(!dir.exists());
-}
-
-#[test]
-fn refused_dump_reports_message() {
-    let (_root, dir) = snapshot_dir("snap");
-    let message = "Unable to create /tmp/snap/dump.hprof: File exists";
-    let probe = dumping(21, vec![Ok(HeapDumpReply::Refused { message: message.into() })]);
-    let outcome = take_heap_dump(&probe, &[12], false, &|| false, &dir, &CancellationToken::new()).unwrap();
-    assert_eq!(outcome, dump_failed(message));
-    assert!(!dir.exists());
-}
-
-#[test]
-fn refused_dump_without_a_reason_says_so() {
-    for body in ["", "Dumping heap to /tmp/snap/dump.hprof ..."] {
-        let (_root, dir) = snapshot_dir("snap");
-        let probe = dumping(21, vec![Ok(HeapDumpReply::Refused { message: body.into() })]);
-        let outcome = take_heap_dump(&probe, &[12], false, &|| false, &dir, &CancellationToken::new()).unwrap();
-        let JvmHeapOutcome::Unavailable(JvmHeapUnavailable::DumpFailed { message }) = outcome else {
-            panic!("{body:?}: {outcome:?}")
-        };
-        assert!(!message.is_empty() && !message.starts_with("Dumping heap to"), "{body:?}: {message:?}");
-        assert!(!dir.exists());
-    }
-}
-
-#[test]
-fn timed_out_dump_removes_snapshot_dir() {
-    let (_root, dir) = snapshot_dir("snap");
-    let probe = dumping(21, vec![Err(AttachError::Timeout)]);
-    let outcome = take_heap_dump(&probe, &[12], false, &|| false, &dir, &CancellationToken::new()).unwrap();
-    assert_eq!(outcome, JvmHeapOutcome::Unavailable(JvmHeapUnavailable::DumpTimedOut { seconds: 30 }));
-    assert!(!dir.exists());
-}
-
-#[test]
-fn capture_dir_with_space_is_quoted() {
-    let (_root, dir) = snapshot_dir("a b");
-    let probe = dumping(21, vec![created()]);
-    ready(take_heap_dump(&probe, &[12], false, &|| false, &dir, &CancellationToken::new()));
-    let path = probe.dump_paths.lock()[0].clone();
-    assert!(path.to_str().unwrap().contains("a b"), "{path:?}");
-    let command = ide_jvm_attach::heap_dump_command(&path).unwrap();
-    assert_eq!(command, format!("GC.heap_dump -all \"{}\"", path.display()));
-}
-
-#[test]
-fn created_without_a_file_fails() {
-    let (_root, dir) = snapshot_dir("snap");
-    let mut probe = dumping(21, vec![created()]);
-    probe.dump_bytes = 0;
-    let outcome = take_heap_dump(&probe, &[12], false, &|| false, &dir, &CancellationToken::new()).unwrap();
-    assert!(matches!(outcome, JvmHeapOutcome::Unavailable(JvmHeapUnavailable::DumpFailed { .. })), "{outcome:?}");
-    assert!(!dir.exists());
-}
-
-#[test]
-fn dump_errors_map_like_the_class_table() {
-    let message = "java.lang.IllegalArgumentException: Unknown argument";
-    let cases = [
-        (Err(AttachError::Refused), false, memory(JvmMemoryUnavailable::ProgramExited)),
-        (Err(AttachError::NoListener), true, memory(JvmMemoryUnavailable::ListenerNotRunning)),
-        (Err(AttachError::Command { code: -1, message: message.into() }), true, dump_failed(message)),
-    ];
-    for (reply, alive, expected) in cases {
-        let (_root, dir) = snapshot_dir("snap");
-        let mut probe = dumping(21, vec![reply]);
-        probe.alive = alive;
-        assert_eq!(take_heap_dump(&probe, &[12], false, &|| false, &dir, &CancellationToken::new()).unwrap(), expected);
-        assert!(!dir.exists());
-    }
-
-    let (_root, dir) = snapshot_dir("snap");
-    let probe = dumping(21, vec![Err(AttachError::Protocol("bad".into()))]);
-    assert!(take_heap_dump(&probe, &[12], false, &|| false, &dir, &CancellationToken::new()).is_err());
-    assert!(!dir.exists());
-}
-
-/// JDK `major`, running when the capture starts, stopped by the time it answers `command`.
-fn stopping_after(major: u32, command: &'static str) -> (FakeProbe, Arc<AtomicBool>) {
-    let stopped = Arc::new(AtomicBool::new(false));
-    let mut probe = dumping(major, vec![created()]);
-    let flag = stopped.clone();
-    probe.stops_on = Some((command, Box::new(move || flag.store(true, Ordering::SeqCst))));
-    (probe, stopped)
-}
-
-#[test]
-fn jdk11_stopped_during_the_histogram_gets_no_further_request() {
-    for (command, sent) in [("histogram", &["histogram"][..]), ("vm_flags", &["histogram", "vm_flags"][..])] {
-        let (_root, dir) = snapshot_dir("snap");
-        let (probe, stopped) = stopping_after(11, command);
-        let suspended_now = || stopped.load(Ordering::SeqCst);
-        let outcome = take_heap_dump(&probe, &[12], false, &suspended_now, &dir, &CancellationToken::new()).unwrap();
-        assert_eq!(outcome, memory(JvmMemoryUnavailable::UnsafeWhileSuspended { java_major: 11 }), "{command}");
-        assert_eq!(*probe.commands.lock(), sent, "{command}");
-        assert!(!dir.exists(), "{command}");
-    }
-}
-
-#[tokio::test]
-async fn session_stopped_during_the_histogram_is_read_again_before_the_dump() {
-    let bare = bare_session("attach");
-    let mut probe = dumping(11, vec![created()]);
-    let stopping = bare.session.clone();
-    probe.stops_on = Some(("histogram", Box::new(move || stopping.suspended.stopped(Some(1), true))));
-    let fake = Arc::new(probe);
-    let probe: Arc<dyn AttachProbe> = fake.clone();
-    let pid = AtomicI64::new(12);
-    let target = JvmTarget::Attached { pid: &pid, jdwp_port: None };
-    let (_root, dir) = snapshot_dir("snap");
-    let session = bare.session.clone();
-    let suspended = move || capture_suspended(&session);
-    let s = &bare.session;
-    let outcome = heap_dump_with(&s.jvm_memory, suspended, |_| probe, target, dir.clone(), CancellationToken::new())
-        .await
-        .unwrap();
-    assert_eq!(outcome, memory(JvmMemoryUnavailable::UnsafeWhileSuspended { java_major: 11 }));
-    assert_eq!(*fake.commands.lock(), ["histogram"]);
-    assert!(!dir.exists());
-    assert!(s.jvm_memory.try_lock().is_ok(), "the lock is released");
-}
-
-#[test]
-fn jdk17_stopped_during_the_histogram_still_dumps() {
-    let (_root, dir) = snapshot_dir("snap");
-    let (probe, stopped) = stopping_after(17, "histogram");
-    let suspended_now = || stopped.load(Ordering::SeqCst);
-    let dump = ready(take_heap_dump(&probe, &[12], false, &suspended_now, &dir, &CancellationToken::new()));
-    assert!(!dump.taken_while_suspended, "the stop read when the capture began");
-    assert_eq!(*probe.commands.lock(), ["histogram", "vm_flags", "heap_dump"]);
-}
-
-#[test]
-fn cancelled_capture_sends_no_dump() {
-    let (_root, dir) = snapshot_dir("snap");
-    let probe = dumping(21, vec![created()]);
-    let cancel = CancellationToken::new();
-    cancel.cancel();
-    assert_eq!(take_heap_dump(&probe, &[12], false, &|| false, &dir, &cancel).unwrap(), JvmHeapOutcome::Cancelled);
-    assert!(!probe.commands.lock().contains(&"heap_dump"));
-    assert!(!dir.exists());
-}
-
-#[tokio::test]
-async fn cancelled_capture_releases_lock() {
-    let state = Arc::new(tokio::sync::Mutex::new(JvmMemoryState::default()));
-    let gate = Arc::new(Gate::default());
-    let opener = OpenOnDrop(gate.clone());
-    let mut fake = dumping(21, vec![created()]);
-    fake.histograms.lock().push_back(Ok(HISTOGRAM.into()));
-    fake.dump_gate = Some(gate.clone());
-    let fake = Arc::new(fake);
-    let jvm_pid = Arc::new(AtomicI64::new(12));
-    let (_root, dir) = snapshot_dir("snap");
-    let cancel = CancellationToken::new();
-    let capture = {
-        let (state, fake, jvm_pid, dir, cancel) =
-            (state.clone(), fake.clone(), jvm_pid.clone(), dir.clone(), cancel.clone());
-        async move {
-            let target = JvmTarget::Attached { pid: &jvm_pid, jdwp_port: None };
-            heap_dump_with(&state, || false, |_| -> Arc<dyn AttachProbe> { fake }, target, dir, cancel).await
-        }
-    };
-    let caller = tokio::spawn(detached(capture, dir.clone(), cancel.clone()));
-    gate.entered.notified().await;
-    cancel.cancel();
-    assert_eq!(caller.await.unwrap().unwrap(), JvmHeapOutcome::Cancelled);
-    assert_eq!(fake.in_flight.load(Ordering::SeqCst), 1, "the JVM is still writing the dump");
-    assert!(!dir.exists());
-
-    let mut table = tokio::spawn({
-        let (state, fake, jvm_pid) = (state.clone(), fake.clone(), jvm_pid.clone());
-        async move {
-            let target = JvmTarget::Attached { pid: &jvm_pid, jdwp_port: None };
-            let probe: Arc<dyn AttachProbe> = fake;
-            snapshot(&state, &Suspension::default(), |_| probe, target, None).await
-        }
-    });
-    // While the gate is shut the dump holds the session's turn, so the class table cannot finish.
-    let early = tokio::time::timeout(Duration::from_millis(100), &mut table).await;
-    assert!(early.is_err(), "the class table ran beside the dump: {early:?}");
-    drop(opener);
-    let table = table.await.unwrap().unwrap();
-    assert!(matches!(table, JvmMemoryResult::Ready { .. }), "{table:?}");
-    assert_eq!(fake.max_in_flight.load(Ordering::SeqCst), 1);
-    assert_eq!(*fake.commands.lock(), ["histogram", "vm_flags", "heap_dump", "histogram"]);
-    assert!(!dir.exists(), "the dump that finished after the cancel is deleted");
-}
-
-#[tokio::test]
-async fn capture_keeps_the_memory_baseline() {
-    let state = tokio::sync::Mutex::new(JvmMemoryState::default());
-    let running = Suspension::default();
-    let pid = AtomicI64::new(12);
-    let target = || JvmTarget::Attached { pid: &pid, jdwp_port: None };
-    let table = |fake: FakeProbe| {
-        let probe: Arc<dyn AttachProbe> = Arc::new(fake);
-        snapshot(&state, &running, |_| probe, target(), None)
-    };
-    table(FakeProbe::new(12, vec![Ok(HISTOGRAM.into())])).await.unwrap();
-
-    let mut capture = dumping(21, vec![created()]);
-    let grown = "   1:            50            800  A\nTotal            50            800\n";
-    capture.histograms = parking_lot::Mutex::new(vec![Ok(grown.into())].into());
-    let probe: Arc<dyn AttachProbe> = Arc::new(capture);
-    let (_root, dir) = snapshot_dir("snap");
-    ready(heap_dump_with(&state, || false, |_| probe, target(), dir, CancellationToken::new()).await);
-
-    let JvmMemoryResult::Ready { snapshot } = table(FakeProbe::new(12, vec![Ok(HISTOGRAM.into())])).await.unwrap()
-    else {
-        panic!("no class table")
-    };
-    let a = snapshot.rows.iter().find(|r| r.name == "A").unwrap();
-    assert_eq!((a.delta_instances, a.delta_bytes), (Some(0), Some(0)));
-}
-
-#[tokio::test]
-async fn attached_session_dumps_the_scanned_jvm() {
-    let mut fake = dumping(21, vec![created()]);
-    fake.listener = 4242;
-    fake.jdwp = Some((5005, 4242));
-    let fake = Arc::new(fake);
-    let probe: Arc<dyn AttachProbe> = fake.clone();
-    let state = tokio::sync::Mutex::new(JvmMemoryState::default());
-    let pid = AtomicI64::new(0);
-    let target = JvmTarget::Attached { pid: &pid, jdwp_port: Some(5005) };
-    let (_root, dir) = snapshot_dir("snap");
-    let dump = ready(heap_dump_with(&state, || false, |_| probe, target, dir, CancellationToken::new()).await);
-    assert_eq!(dump.pid, 4242);
-    assert_eq!(pid.load(Ordering::SeqCst), 4242);
-    assert_eq!(fake.scans.load(Ordering::SeqCst), 1);
-}
-
-/// A JDWP link whose fake JVM sent a suspending event, which the adapter would report next:
-/// (link, adapter end, JVM end).
-async fn suspended_link() -> (ide_jdwp::JdwpLink, tokio::net::TcpStream, tokio::net::TcpStream) {
-    use tokio::io::{AsyncReadExt, AsyncWriteExt};
-    const HANDSHAKE: &[u8; 14] = b"JDWP-Handshake";
-    let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-    let port = listener.local_addr().unwrap().port();
-    let options = ide_jdwp::LinkOptions { hold_resumes: false };
-    let (link, link_port) = ide_jdwp::JdwpLink::start("127.0.0.1".into(), port, options).await.unwrap();
-    let mut adapter = tokio::net::TcpStream::connect(("127.0.0.1", link_port)).await.unwrap();
-    adapter.write_all(HANDSHAKE).await.unwrap();
-    let (mut jvm, _) = tokio::time::timeout(Duration::from_secs(2), listener.accept()).await.unwrap().unwrap();
-    let mut buf = [0; 14];
-    jvm.read_exact(&mut buf).await.unwrap();
-    jvm.write_all(HANDSHAKE).await.unwrap();
-    adapter.read_exact(&mut buf).await.unwrap();
-    // Event.Composite (64/100): SUSPEND_ALL, one VM_START event, request 0, thread 1.
-    let body = [2, 0, 0, 0, 1, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1];
-    let mut packet = u32::try_from(11 + body.len()).unwrap().to_be_bytes().to_vec();
-    packet.extend(1u32.to_be_bytes());
-    packet.extend([0, 64, 100]);
-    packet.extend(body);
-    jvm.write_all(&packet).await.unwrap();
-    let mut states = link.subscribe();
-    let suspended = states.wait_for(|s| matches!(s, ide_jdwp::LinkState::Suspended { .. }));
-    tokio::time::timeout(Duration::from_secs(2), suspended).await.unwrap().unwrap();
-    (link, adapter, jvm)
-}
-
-#[tokio::test]
-async fn jdk11_is_refused_while_the_link_is_suspended_before_dap_stops() {
-    let bare = bare_session_of(crate::kotlin::ADAPTER, "attach");
-    let s = &bare.session;
-    let (link, _adapter, _jvm) = suspended_link().await;
-    *s.jdwp_link.lock() = Some(link);
-    assert!(!s.suspended.get());
-
-    let fake = Arc::new(jdk11(12));
-    let probe: Arc<dyn AttachProbe> = fake.clone();
-    let probe = |suspended: bool| {
-        assert!(suspended, "the probe must not ask a suspended JVM's version over attach");
-        probe
-    };
-    let pid = AtomicI64::new(12);
-    let target = JvmTarget::Attached { pid: &pid, jdwp_port: None };
-    let (_root, dir) = snapshot_dir("snap");
-    let session = bare.session.clone();
-    let suspended = move || capture_suspended(&session);
-    let outcome =
-        heap_dump_with(&s.jvm_memory, suspended, probe, target, dir.clone(), CancellationToken::new()).await.unwrap();
-    assert_eq!(outcome, memory(JvmMemoryUnavailable::UnsafeWhileSuspended { java_major: 11 }));
-    assert!(fake.commands.lock().is_empty());
-    assert!(!dir.exists());
-}
-
 #[tokio::test]
 async fn capability_matches_memory() {
    for adapter in JVM_MEMORY_ADAPTERS.iter().copied().chain(["debugpy"]) {
        let bare = bare_session_of(adapter, "launch");
        let caps = crate::session_capabilities(&bare.session);
        let jvm = adapter != "debugpy";
-        assert_eq!((caps.jvm_heap, caps.jvm_memory), (jvm, jvm), "{adapter}");
+        assert_eq!(caps.jvm_memory, jvm, "{adapter}");
    }
 }
-
-#[cfg(unix)]
-#[tokio::test]
-async fn session_without_a_jvm_reports_no_process() {
-    let bare = bare_session("launch");
-    let (_root, dir) = snapshot_dir("snap");
-    let outcome = session_heap_dump(bare.session.clone(), dir.clone(), CancellationToken::new()).await.unwrap();
-    assert_eq!(outcome, memory(JvmMemoryUnavailable::NoJvmProcess));
-    assert!(!dir.exists());
-}
-
-#[cfg(not(unix))]
-#[tokio::test]
-async fn capture_is_unsupported_off_unix() {
-    let bare = bare_session("launch");
-    let (_root, dir) = snapshot_dir("snap");
-    let outcome = session_heap_dump(bare.session.clone(), dir.clone(), CancellationToken::new()).await.unwrap();
-    assert_eq!(outcome, memory(JvmMemoryUnavailable::UnsupportedPlatform));
-    assert!(!dir.exists());
-}
@@ -9,15 +9,11 @@ use std::{

 pub const ADAPTER: &str = "kotlin-debug-adapter";

-/// fwcd's adapter or kotlin-lsp's: both debug a JVM the IDE starts, through the JDWP link.
-pub fn is_kotlin(adapter: &str) -> bool {
-    adapter == ADAPTER || adapter == crate::kotlin_lsp::ADAPTER
-}
-
-/// fwcd's adapter resumes the VM while constructing its debuggee, before its breakpoint hooks
-/// exist, so only its link holds resumes back until the attach is done.
-pub(crate) fn link_options(adapter: &str) -> ide_jdwp::LinkOptions {
-    ide_jdwp::LinkOptions { hold_resumes: adapter == ADAPTER }
+/// The adapter attaches to a JVM the IDE starts, through the JDWP link. It resumes the VM while
+/// constructing its debuggee, before its breakpoint hooks exist, so the link holds resumes back
+/// until the attach is done.
+pub(crate) fn link_options() -> ide_jdwp::LinkOptions {
+    ide_jdwp::LinkOptions { hold_resumes: true }
 }

 pub struct SourceMirror {
@@ -1,147 +0,0 @@
-//! JetBrains kotlin-lsp's debugger: a DAP server inside the language server, reached through
-//! the `debugServer` port it opens once the project is imported.
-//!
-//! Known limits, with no guard here: an evaluate that calls a function with a breakpoint, right
-//! after a step over a suspension point, loses every later stop at that breakpoint; while
-//! stepping, breakpoints hit by other coroutines are skipped.
-
-use ide_core::{IdeError, IdeResult};
-use parking_lot::Mutex;
-use std::collections::HashSet;
-use std::path::PathBuf;
-use std::sync::atomic::{AtomicBool, Ordering};
-
-pub const ADAPTER: &str = "kotlin-lsp";
-/// The `adapterID` its debug server expects in `initialize`.
-pub const DAP_ADAPTER_ID: &str = "intellij_jvm";
-
-/// The path of a `file:` URI, as kotlin-lsp reports some sources (percent-encoded); `None` for
-/// anything else, including a URI naming another host.
-pub(crate) fn source_path(path: &str) -> Option<PathBuf> {
-    let rest = path.strip_prefix("file:")?;
-    let path = match rest.strip_prefix("//") {
-        Some(authority) => {
-            let slash = authority.find('/')?;
-            if !matches!(&authority[..slash], "" | "localhost") {
-                return None;
-            }
-            &authority[slash..]
-        }
-        None => rest,
-    };
-    let decoded = percent_encoding::percent_decode_str(path).decode_utf8().ok()?;
-    // `/C:/p/App.kt` on Windows.
-    let decoded = match decoded.strip_prefix('/') {
-        Some(drive) if cfg!(windows) && drive.as_bytes().get(1) == Some(&b':') => drive,
-        _ => &decoded,
-    };
-    Some(PathBuf::from(decoded))
-}
-
-pub(crate) fn frame_name(name: &str) -> &str {
-    name.strip_prefix("at ").unwrap_or(name)
-}
-
-/// What kotlin-lsp's DAP server does unlike other adapters.
-///
-/// It never answers a request that carries a thread id from an earlier stop (K1 G4), so such a
-/// request would wait out `REQUEST_TIMEOUT`: [`Self::check_thread`] refuses it first. Only thread
-/// ids were measured; a stale `frameId` or `variablesReference` may wait the same way. A step
-/// ends with `reason: "breakpoint"`; a real breakpoint hit during a step is then reported as a
-/// step too, since the stop carries neither `hitBreakpointIds` nor a description.
-#[derive(Default)]
-pub(crate) struct Quirks {
-    step_pending: AtomicBool,
-    /// The stop (a `Suspension` ticket) and the thread ids seen in it.
-    threads: Mutex<(u64, HashSet<i64>)>,
-}
-
-impl Quirks {
-    /// Before `next`, `stepIn`, `stepOut` or a forced step.
-    pub fn step_sent(&self) {
-        self.step_pending.store(true, Ordering::Release);
-    }
-
-    /// Before `continue` or run to cursor, or after a step request failed.
-    pub fn resume_sent(&self) {
-        self.step_pending.store(false, Ordering::Release);
-    }
-
-    /// The reason to report for a `stopped` event.
-    pub fn stop_reason(&self, reason: String) -> String {
-        let stepped = self.step_pending.swap(false, Ordering::AcqRel);
-        if stepped && reason == "breakpoint" { "step".into() } else { reason }
-    }
-
-    /// Thread ids seen in stop `stop`: a `stopped` event's, or a `threads` reply to a request sent
-    /// during that stop. A reply from an older stop changes nothing.
-    pub fn saw_threads(&self, stop: u64, ids: impl IntoIterator<Item = i64>) {
-        let mut threads = self.threads.lock();
-        if stop > threads.0 {
-            *threads = (stop, ids.into_iter().collect());
-        } else if stop == threads.0 {
-            threads.1.extend(ids);
-        }
-    }
-
-    /// Refuses a thread id that is not one of current stop `stop`'s, once some are known.
-    pub fn check_thread(&self, stop: u64, suspended: bool, id: i64) -> IdeResult<()> {
-        let threads = self.threads.lock();
-        if suspended && threads.0 == stop && !threads.1.is_empty() && !threads.1.contains(&id) {
-            return Err(IdeError::invalid(format!("thread {id} belongs to an earlier stop")));
-        }
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::path::Path;
-
-    #[test]
-    fn file_uris_become_paths() {
-        assert_eq!(source_path("file:///p/a%20b/App.kt").as_deref(), Some(Path::new("/p/a b/App.kt")));
-        assert_eq!(source_path("file://localhost/p/x.kt").as_deref(), Some(Path::new("/p/x.kt")));
-        assert_eq!(source_path("/p/x.kt"), None);
-    }
-
-    #[test]
-    fn frame_names_lose_the_at_prefix() {
-        assert_eq!(frame_name("at com.x.AppKt.main(App.kt:13)"), "com.x.AppKt.main(App.kt:13)");
-        assert_eq!(frame_name("main"), "main");
-    }
-
-    #[test]
-    fn only_a_pending_step_turns_a_breakpoint_into_a_step() {
-        let quirks = Quirks::default();
-        quirks.step_sent();
-        assert_eq!(quirks.stop_reason("breakpoint".into()), "step");
-        assert_eq!(quirks.stop_reason("breakpoint".into()), "breakpoint");
-        quirks.step_sent();
-        quirks.resume_sent();
-        assert_eq!(quirks.stop_reason("breakpoint".into()), "breakpoint");
-    }
-
-    #[test]
-    fn threads_are_checked_against_the_current_stop() {
-        let quirks = Quirks::default();
-        quirks.saw_threads(3, [18]);
-        assert!(quirks.check_thread(3, true, 18).is_ok());
-        assert!(quirks.check_thread(3, true, 6).is_err());
-        assert!(quirks.check_thread(4, true, 6).is_ok(), "nothing known about stop 4 yet");
-        assert!(quirks.check_thread(3, false, 6).is_ok());
-    }
-
-    #[test]
-    fn an_older_threads_reply_does_not_change_a_newer_stop() {
-        let quirks = Quirks::default();
-        quirks.saw_threads(4, [2]);
-        quirks.saw_threads(3, [1]);
-        assert!(quirks.check_thread(4, true, 1).is_err());
-        quirks.saw_threads(4, [7]);
-        assert!(quirks.check_thread(4, true, 2).is_ok() && quirks.check_thread(4, true, 7).is_ok());
-        quirks.saw_threads(5, [9]);
-        assert!(quirks.check_thread(5, true, 2).is_err());
-    }
-}
@@ -15,7 +15,6 @@ pub mod connection;
 pub mod jdwp;
 mod jvm_memory;
 pub mod kotlin;
-pub mod kotlin_lsp;
 mod session;

 use adapter::{AdapterLauncher, AdapterSpec, ProcessLauncher};
@@ -134,8 +133,6 @@ pub struct DebugCapabilities {
    /// The session has a JVM inspector: instances, fields and referrers while suspended. Can
    /// change during the session ([`ide_core::event::DebugEvent::Capabilities`]).
    pub jvm_instances: bool,
-    /// The session can be asked for a heap dump ([`DebugManager::jvm_heap_dump`]).
-    pub jvm_heap: bool,
 }

 /// Result of [`DebugManager::redefine_classes`].
@@ -579,7 +576,6 @@ pub(crate) fn capabilities_from(caps: &Value) -> DebugCapabilities {
        hot_code_replace: false,
        jvm_memory: false,
        jvm_instances: false,
-        jvm_heap: false,
    }
 }

@@ -588,7 +584,6 @@ pub(crate) fn session_capabilities(session: &Session) -> DebugCapabilities {
    caps.hot_code_replace = HOT_CODE_REPLACE_ADAPTERS.contains(&session.adapter.as_str());
    caps.jvm_memory = JVM_MEMORY_ADAPTERS.contains(&session.adapter.as_str());
    caps.jvm_instances = session.jvm_inspector.lock().is_some();
-    caps.jvm_heap = JVM_MEMORY_ADAPTERS.contains(&session.adapter.as_str());
    caps
 }

@@ -611,19 +606,9 @@ fn unverified(enabled: impl Iterator<Item = bool>) -> Vec<BreakpointState> {
        .collect()
 }

-/// A step request's outcome; a failed one leaves no step pending, so the next stop keeps its reason.
-fn step_settled(session: &Session, sent: Result<Value, DapError>) -> Result<Value, DapError> {
-    if sent.is_err()
-        && let Some(quirks) = session.kotlin_lsp_quirks()
-    {
-        quirks.resume_sent();
-    }
-    sent
-}
-
-/// Delve compiles the debuggee to `__debug_bin` in the session's cwd (in DAP mode a
-/// temp-file name, `__debug_bin<digits>`; on Windows with `.exe` before the digits) and
-/// removes it on a graceful exit — a shutdown it doesn't always reach, so the files pile up. Sweep
+/// Delve compiles the debuggee to `__debug_bin` in the session's cwd (on Windows
+/// `__debug_bin.exe` plus `__debug_bin.exe<digits>` in DAP mode) and removes it on a
+/// graceful exit — a shutdown it doesn't always reach, so the files pile up. Sweep
 /// the leftovers once the session is down. Runs after `session_closed`, so Delve
 /// has already exited or been killed and holds no file locks; a leftover of a
 /// still-building run is removed on that run's own shutdown.
@@ -632,10 +617,14 @@ fn remove_delve_binaries(cwd: &Path) {
    for entry in entries.flatten() {
        let name = entry.file_name();
        let Some(name) = name.to_str() else { continue };
-        // `__debug_bin`, then `.exe` on Windows, then DAP mode's temp-file digits.
-        // Suffixes like `.go` are user files.
-        let suffix = name.strip_prefix("__debug_bin").map(|s| s.strip_prefix(".exe").unwrap_or(s));
-        let leftover = suffix.is_some_and(|s| s.chars().all(|c| c.is_ascii_digit()));
+        // Windows writes `__debug_bin.exe` (and `.exe<digits>` in DAP mode); other
+        // platforms keep the bare name. Suffixes like `.go` are user files.
+        let suffix = name.strip_prefix("__debug_bin");
+        let leftover = suffix.is_some_and(|s| {
+            s.is_empty()
+                || s == ".exe"
+                || (s.starts_with(".exe") && s[".exe".len()..].chars().all(|c| c.is_ascii_digit()))
+        });
        if !leftover || entry.file_type().is_ok_and(|t| !t.is_file()) {
            continue;
        }
@@ -988,7 +977,6 @@ impl DebugManager {
            arguments["projectRoot"] = json!(mirror.root());
            *s.kotlin_mirror.lock() = Some(mirror);
        }
-        let is_kotlin_lsp = s.adapter == kotlin_lsp::ADAPTER;
        let caps = s
            .conn
            .request_timeout(
@@ -996,7 +984,7 @@ impl DebugManager {
                json!({
                    "clientID": "openidea",
                    "clientName": "OpenIDEA",
-                    "adapterID": if is_kotlin_lsp { kotlin_lsp::DAP_ADAPTER_ID } else { s.adapter.as_str() },
+                    "adapterID": s.adapter,
                    "locale": "en",
                    "linesStartAt1": true,
                    "columnsStartAt1": true,
@@ -1006,8 +994,7 @@ impl DebugManager {
                    "supportsRunInTerminalRequest": true,
                    "supportsStartDebuggingRequest": true,
                    "supportsProgressReporting": true,
-                    // kotlin-lsp sends `invalidated` either way.
-                    "supportsInvalidatedEvent": is_kotlin_lsp,
+                    "supportsInvalidatedEvent": false,
                    "supportsMemoryReferences": false,
                    "supportsArgsCanBeInterpretedByShell": false,
                }),
@@ -1017,7 +1004,7 @@ impl DebugManager {
        *s.caps.lock() = if caps.is_object() { caps } else { json!({}) };

        // The Kotlin adapters ignore the resolved classpath and project runtime on launch.
-        let request = if kotlin::is_kotlin(&s.adapter) && s.request == "launch" {
+        let request = if s.adapter == kotlin::ADAPTER && s.request == "launch" {
            session::start_kotlin_debuggee(s, &mut arguments).await?;
            "attach"
        } else {
@@ -1041,7 +1028,7 @@ impl DebugManager {
                jvm_memory::find_attached_jvm(s, port, finder).await;
            }
        }
-        if kotlin::is_kotlin(&s.adapter) {
+        if s.adapter == kotlin::ADAPTER {
            let host = arguments
                .get("hostName")
                .and_then(Value::as_str)
@@ -1053,7 +1040,7 @@ impl DebugManager {
                .and_then(|p| u16::try_from(p).ok())
                .filter(|p| *p != 0)
                .ok_or_else(|| IdeError::invalid("Invalid Kotlin JDWP port"))?;
-            let (link, port) = ide_jdwp::JdwpLink::start(host, port, kotlin::link_options(&s.adapter)).await?;
+            let (link, port) = ide_jdwp::JdwpLink::start(host, port, kotlin::link_options()).await?;
            *s.jvm_inspector.lock() = Some(Arc::new(ide_jdwp::LinkInspector::new(link.clone())));
            jvm_memory::watch_link(s, &link);
            *s.jdwp_link.lock() = Some(link);
@@ -1390,8 +1377,6 @@ impl DebugManager {

    pub async fn threads(&self, s: DebugSessionId) -> IdeResult<Vec<ThreadInfo>> {
        let session = self.session(s)?;
-        // Before sending: a stop that overtakes the reply must not take the reply's ids as its own.
-        let stop = session.suspended.ticket();
        let body = session.conn.request_timeout("threads", Value::Null, REQUEST_TIMEOUT).await?;
        let threads: Vec<ThreadInfo> = body
            .get("threads")
@@ -1405,15 +1390,11 @@ impl DebugManager {
                    .collect()
            })
            .unwrap_or_default();
-        if let Some(quirks) = session.kotlin_lsp_quirks() {
-            quirks.saw_threads(stop, threads.iter().map(|t| t.id));
-        }
        Ok(threads)
    }

    pub async fn stack_trace(&self, s: DebugSessionId, thread_id: i64) -> IdeResult<Vec<StackFrame>> {
        let session = self.session(s)?;
-        session.check_thread(thread_id)?;
        let body = session
            .conn
            .request_timeout(
@@ -1422,15 +1403,11 @@ impl DebugManager {
                REQUEST_TIMEOUT,
            )
            .await?;
-        let kotlin_lsp = session.kotlin_lsp_quirks().is_some();
        let frame = |f: &Value| {
            let mut frame = frame_from(f);
            if let Some(client) = frame.path.as_deref().and_then(|p| session.client_path(&p.to_string_lossy())) {
                frame.path = Some(client.into());
            }
-            if kotlin_lsp {
-                frame.name = kotlin_lsp::frame_name(&frame.name).to_owned();
-            }
            frame
        };
        Ok(body.get("stackFrames").and_then(Value::as_array).map(|f| f.iter().map(frame).collect()).unwrap_or_default())
@@ -1542,10 +1519,6 @@ impl DebugManager {

    pub async fn resume(&self, s: DebugSessionId, thread_id: i64) -> IdeResult<()> {
        let session = self.session(s)?;
-        session.check_thread(thread_id)?;
-        if let Some(quirks) = session.kotlin_lsp_quirks() {
-            quirks.resume_sent();
-        }
        let ticket = session.suspended.ticket();
        let body = session.conn.request_timeout("continue", json!({ "threadId": thread_id }), REQUEST_TIMEOUT).await?;
        // DAP: a response without the flag continued every thread.
@@ -1590,13 +1563,8 @@ impl DebugManager {
            StepKind::Out => "stepOut",
        };
        let session = self.session(s)?;
-        session.check_thread(thread_id)?;
-        if let Some(quirks) = session.kotlin_lsp_quirks() {
-            quirks.step_sent();
-        }
        let ticket = session.suspended.ticket();
-        let sent = session.conn.request_timeout(command, json!({ "threadId": thread_id }), REQUEST_TIMEOUT).await;
-        step_settled(&session, sent)?;
+        session.conn.request_timeout(command, json!({ "threadId": thread_id }), REQUEST_TIMEOUT).await?;
        // A step runs its thread; other threads stopped by their own events stay stopped.
        session.suspended.resumed(ticket, thread_id, false);
        session.emit(ide_core::event::DebugEvent::Continued { thread_id, all_threads_continued: true });
@@ -1615,8 +1583,6 @@ impl DebugManager {
        force: bool,
    ) -> IdeResult<()> {
        let session = self.session(s)?;
-        // Before touching breakpoints: a refused `continue` would leave them replaced.
-        session.check_thread(thread_id)?;
        if force {
            self.suspend_breakpoints(&session, Some(&path)).await?;
        }
@@ -1691,7 +1657,6 @@ impl DebugManager {
    /// Force Step Over: `next` with every breakpoint suspended until the step ends.
    pub async fn force_step_over(&self, s: DebugSessionId, thread_id: i64) -> IdeResult<()> {
        let session = self.session(s)?;
-        session.check_thread(thread_id)?;
        self.suspend_breakpoints(&session, None).await?;
        self.step(s, thread_id, StepKind::Over).await
    }
@@ -1699,16 +1664,11 @@ impl DebugManager {
    /// Step into a specific call of the current line (Smart Step Into).
    pub async fn step_in_target(&self, s: DebugSessionId, thread_id: i64, target_id: i64) -> IdeResult<()> {
        let session = self.session(s)?;
-        session.check_thread(thread_id)?;
-        if let Some(quirks) = session.kotlin_lsp_quirks() {
-            quirks.step_sent();
-        }
        let ticket = session.suspended.ticket();
-        let sent = session
+        session
            .conn
            .request_timeout("stepIn", json!({ "threadId": thread_id, "targetId": target_id }), REQUEST_TIMEOUT)
-            .await;
-        step_settled(&session, sent)?;
+            .await?;
        session.suspended.resumed(ticket, thread_id, false);
        session.emit(ide_core::event::DebugEvent::Continued { thread_id, all_threads_continued: true });
        Ok(())
@@ -1754,20 +1714,6 @@ impl DebugManager {
        jvm_memory::session_classes(session).await
    }

-    /// Writes a heap dump of the session's JVM to `dir/dump.hprof`, one class-table or dump
-    /// request per session at a time. Anything but `Ready` deletes `dir`, unless `s` is not a
-    /// session. On `cancel` the result is `Cancelled` at once, while a dump the JVM is writing
-    /// still holds the session's turn until the JVM answers.
-    pub async fn jvm_heap_dump(
-        &self,
-        s: DebugSessionId,
-        dir: PathBuf,
-        cancel: ide_core::CancellationToken,
-    ) -> IdeResult<JvmHeapOutcome> {
-        let session = self.session(s)?;
-        jvm_memory::session_heap_dump(session, dir, cancel).await
-    }
-
    /// Gives the session the backend for [`Self::jvm_memory_instances`] and the debugger's class
    /// counts; the UI is told to reload the session's capabilities.
    pub fn set_jvm_inspector(
@@ -3,7 +3,6 @@

 use crate::adapter::AdapterSpec;
 use crate::connection::{Connection, DapError, Incoming};
-use crate::kotlin_lsp;
 use crate::{Breakpoint, BreakpointState, DataBreakpoint, DebugManager, FunctionBreakpoint, SessionOwner};
 use ide_core::event::DebugEvent;
 #[cfg(unix)]
@@ -104,8 +103,6 @@ pub(crate) struct Session {
    pub jvm_located: watch::Sender<bool>,
    pub kotlin_mirror: Mutex<Option<crate::kotlin::SourceMirror>>,
    pub jvm_memory: tokio::sync::Mutex<crate::JvmMemoryState>,
-    /// Used only by a kotlin-lsp session: see [`Session::kotlin_lsp_quirks`].
-    pub(crate) quirks: kotlin_lsp::Quirks,
 }

 /// Which threads of the program are suspended: each from its `stopped` event until a
@@ -255,19 +252,6 @@ impl Session {
            jvm_located: watch::channel(false).0,
            kotlin_mirror: Mutex::new(None),
            jvm_memory: tokio::sync::Mutex::default(),
-            quirks: kotlin_lsp::Quirks::default(),
-        }
-    }
-
-    pub fn kotlin_lsp_quirks(&self) -> Option<&kotlin_lsp::Quirks> {
-        (self.adapter == kotlin_lsp::ADAPTER).then_some(&self.quirks)
-    }
-
-    /// Call before sending a request for thread `id`.
-    pub fn check_thread(&self, id: i64) -> ide_core::IdeResult<()> {
-        match self.kotlin_lsp_quirks() {
-            Some(quirks) => quirks.check_thread(self.suspended.ticket(), self.suspended.get(), id),
-            None => Ok(()),
        }
    }

@@ -299,11 +283,6 @@ impl Session {

    /// A path from the adapter as the IDE knows it (undoes [`Session::adapter_path`]).
    pub fn client_path(&self, path: &str) -> Option<PathBuf> {
-        if self.adapter == kotlin_lsp::ADAPTER
-            && let Some(path) = kotlin_lsp::source_path(path)
-        {
-            return Some(path);
-        }
        if let Some(real) = self.kotlin_mirror.lock().as_ref().and_then(|m| m.client_path(Path::new(path))) {
            return Some(real);
        }
@@ -718,11 +697,7 @@ async fn on_event(mgr: &Arc<DebugManager>, s: &Arc<Session>, event: &str, mut bo
        "stopped" => {
            let all = body.get("allThreadsStopped").and_then(Value::as_bool).unwrap_or(false);
            s.suspended.stopped(int("threadId"), all);
-            let mut reason = str_("reason").unwrap_or_else(|| "pause".into());
-            if let Some(quirks) = s.kotlin_lsp_quirks() {
-                quirks.saw_threads(s.suspended.ticket(), int("threadId"));
-                reason = quirks.stop_reason(reason);
-            }
+            let reason = str_("reason").unwrap_or_else(|| "pause".into());
            mgr.restore_breakpoints(s).await;
            s.emit(DebugEvent::Stopped {
                thread_id: int("threadId").unwrap_or(0),
@@ -824,14 +799,6 @@ async fn on_event(mgr: &Arc<DebugManager>, s: &Arc<Session>, event: &str, mut bo
            change_type: crate::hot_code_replace_type(body.get("changeType")),
            message: str_("message").unwrap_or_default(),
        }),
-        // Sent only by adapters told `supportsInvalidatedEvent` (kotlin-lsp).
-        "invalidated" => s.emit(DebugEvent::Invalidated {
-            areas: body
-                .get("areas")
-                .and_then(Value::as_array)
-                .map(|a| a.iter().filter_map(Value::as_str).map(str::to_owned).collect())
-                .unwrap_or_default(),
-        }),
        _ => tracing::trace!("dap: ignored event {event}"),
    }
 }
@@ -126,22 +126,8 @@ struct Script {
    continued_after_stop: bool,
    /// Close the connection when a `pause` request arrives (the adapter dies).
    hang_up_on_pause: bool,
-    /// Close the connection at the first request after the first `stopped` event.
-    hang_up_after_stop: bool,
    /// Answer `continue` with this body and keep the program running, instead of letting it exit.
    continue_reply: Option<Value>,
-    /// Answer `continue` and stop at a breakpoint again, instead of letting the program exit.
-    stop_after_continue: bool,
-    /// The `reason` of the stop a `next` ends with (`step` when unset; kotlin-lsp says `breakpoint`).
-    step_reason: Option<&'static str>,
-    /// Refuse `next`, then stop at a breakpoint (one the program hit meanwhile).
-    refuse_next: bool,
-    /// Send `invalidated { areas: ["variables"] }` right after the first `stopped` event.
-    invalidated_after_stop: bool,
-    /// On `threads`: stop again on thread 2 first, then answer with thread 1 of the earlier stop.
-    stop_during_threads: bool,
-    /// Name of the first stack frame (`main` when unset).
-    frame_name: Option<&'static str>,
    /// Answer `initialize` only after this long (a slow adapter keeps the session connecting).
    delay_initialize: Option<Duration>,
    initialized_delay: Duration,
@@ -170,14 +156,7 @@ impl Default for Script {
            hold_set_breakpoints: 0,
            continued_after_stop: false,
            hang_up_on_pause: false,
-            hang_up_after_stop: false,
            continue_reply: None,
-            stop_after_continue: false,
-            step_reason: None,
-            refuse_next: false,
-            invalidated_after_stop: false,
-            stop_during_threads: false,
-            frame_name: None,
            delay_initialize: None,
            initialized_delay: Duration::ZERO,
            launch_delay: Duration::ZERO,
@@ -223,7 +202,6 @@ async fn fake_adapter<S: AsyncRead + AsyncWrite + Unpin + Send + 'static>(stream
    let mut seq = 1000;
    let mut pending_launch: Option<i64> = None;
    let mut held: Vec<Value> = Vec::new();
-    let mut stopped = false;
    let mut running = false;
    macro_rules! send {
        ($v:expr) => {{
@@ -244,9 +222,6 @@ async fn fake_adapter<S: AsyncRead + AsyncWrite + Unpin + Send + 'static>(stream
        if msg["type"] == "response" {
            continue;
        }
-        if script.hang_up_after_stop && stopped {
-            break;
-        }
        match msg["command"].as_str().unwrap_or_default() {
            "initialize" => {
                if let Some(delay) = script.delay_initialize {
@@ -345,18 +320,9 @@ async fn fake_adapter<S: AsyncRead + AsyncWrite + Unpin + Send + 'static>(stream
                ok!(msg, Value::Null);
                send!(json!({"type": "event", "event": "stopped", "body": {"reason": "restart", "threadId": 1}}));
            }
-            "next" if script.refuse_next => {
-                send!(
-                    json!({"type": "response", "request_seq": msg["seq"], "command": "next", "success": false, "message": "refused"})
-                );
-                // Lets the client handle the refusal before the stop.
-                tokio::time::sleep(Duration::from_millis(50)).await;
-                send!(json!({"type": "event", "event": "stopped", "body": {"reason": "breakpoint", "threadId": 1}}));
-            }
            "next" => {
                ok!(msg, Value::Null);
-                let reason = script.step_reason.unwrap_or("step");
-                send!(json!({"type": "event", "event": "stopped", "body": {"reason": reason, "threadId": 1}}));
+                send!(json!({"type": "event", "event": "stopped", "body": {"reason": "step", "threadId": 1}}));
            }
            "setVariable" => {
                ok!(msg, json!({"value": format!("{}!", msg["arguments"]["value"].as_str().unwrap()), "type": "int"}))
@@ -392,12 +358,6 @@ async fn fake_adapter<S: AsyncRead + AsyncWrite + Unpin + Send + 'static>(stream
                send!(
                    json!({"type": "event", "event": "stopped", "body": {"reason": "breakpoint", "threadId": 1, "allThreadsStopped": true}})
                );
-                stopped = true;
-                if script.invalidated_after_stop {
-                    send!(
-                        json!({"type": "event", "event": "invalidated", "body": {"areas": ["variables"], "threadId": 1}})
-                    );
-                }
                if script.continued_after_stop {
                    send!(json!({"type": "event", "event": "continued", "body": {"threadId": 1}}));
                }
@@ -405,19 +365,11 @@ async fn fake_adapter<S: AsyncRead + AsyncWrite + Unpin + Send + 'static>(stream
                    json!({"type": "event", "event": "breakpoint", "body": {"reason": "changed", "breakpoint": {"id": 1, "verified": false, "message": "moved", "line": 9, "source": {"path": script.source_path}}}})
                );
            }
-            "threads" if script.stop_during_threads => {
-                send!(
-                    json!({"type": "event", "event": "stopped", "body": {"reason": "breakpoint", "threadId": 2, "allThreadsStopped": true}})
-                );
-                // Lets the client handle the stop before it reads the reply.
-                tokio::time::sleep(Duration::from_millis(50)).await;
-                ok!(msg, json!({"threads": [{"id": 1, "name": "\"main\"@1"}]}));
-            }
            "threads" => ok!(msg, json!({"threads": [{"id": 1, "name": "MainThread"}]})),
            "stackTrace" => ok!(
                msg,
                json!({"stackFrames": [
-                    {"id": 10, "name": script.frame_name.unwrap_or("main"), "line": 5, "column": 3, "source": {"path": script.source_path.as_deref().unwrap_or("/p/a.py")}},
+                    {"id": 10, "name": "main", "line": 5, "column": 3, "source": {"path": script.source_path.as_deref().unwrap_or("/p/a.py")}},
                    {"id": 11, "name": "lib", "line": 1, "column": 1, "source": {"path": "/usr/lib/x.py", "presentationHint": "deemphasize"}},
                ]})
            ),
@@ -441,12 +393,6 @@ async fn fake_adapter<S: AsyncRead + AsyncWrite + Unpin + Send + 'static>(stream
                ]})
            ),
            "continue" if script.continue_reply.is_some() => ok!(msg, script.continue_reply.clone().unwrap()),
-            "continue" if script.stop_after_continue => {
-                ok!(msg, json!({"allThreadsContinued": true}));
-                send!(
-                    json!({"type": "event", "event": "stopped", "body": {"reason": "breakpoint", "threadId": 1, "allThreadsStopped": true}})
-                );
-            }
            "continue" => {
                ok!(msg, json!({"allThreadsContinued": true}));
                send!(json!({"type": "event", "event": "exited", "body": {"exitCode": 3}}));
@@ -1472,7 +1418,6 @@ fn godot_registry(port: u16, command: &str, args: &[&str]) -> Arc<LanguageRegist
        indent: None,
        ui_mode: None,
        framework_ui_modes: Vec::new(),
-        framework_files: Vec::new(),
        formatter: None,
        scratch_template: None,
        tree_sitter: None,
@@ -2096,20 +2041,20 @@ async fn stop_kills_the_program_started_by_the_reported_launcher() {
 fn delve_leftovers_are_removed_without_touching_other_files() {
    let dir = std::env::temp_dir().join(format!("openidea-delve-bin-{}", std::process::id()));
    std::fs::create_dir_all(&dir).unwrap();
-    for name in ["__debug_bin", "__debug_bin833767175", "__debug_bin.exe", "__debug_bin.exe3323301925"] {
+    for name in ["__debug_bin", "__debug_bin.exe", "__debug_bin.exe3323301925"] {
        std::fs::write(dir.join(name), b"bin").unwrap();
    }
    // Lookalikes that are not Delve's own binaries stay: sources, a future
    // in-progress build, and a directory that happens to share the name.
-    for name in ["__debug_bin.go", "__debug_bin.go.exe", "__debug_bin12.go", "main.go"] {
+    for name in ["__debug_bin.go", "__debug_bin.go.exe", "main.go"] {
        std::fs::write(dir.join(name), b"keep").unwrap();
    }
    std::fs::create_dir(dir.join("__debug_bin.dir")).unwrap();
    remove_delve_binaries(&dir);
-    for name in ["__debug_bin", "__debug_bin833767175", "__debug_bin.exe", "__debug_bin.exe3323301925"] {
+    for name in ["__debug_bin", "__debug_bin.exe", "__debug_bin.exe3323301925"] {
        assert!(!dir.join(name).exists(), "{name} should be gone");
    }
-    for name in ["__debug_bin.go", "__debug_bin.go.exe", "__debug_bin12.go", "main.go", "__debug_bin.dir"] {
+    for name in ["__debug_bin.go", "__debug_bin.go.exe", "main.go", "__debug_bin.dir"] {
        assert!(dir.join(name).exists(), "{name} should stay");
    }
    std::fs::remove_dir_all(&dir).unwrap();
@@ -2210,13 +2155,11 @@ async fn attach_session_reports_capability() {
        let id = h.start(remote_attach(adapter, project.path())).await.unwrap();
        let caps = h.manager.capabilities(id).unwrap();
        assert!(caps.jvm_memory, "{adapter}");
-        assert_eq!(caps.jvm_heap, caps.jvm_memory, "{adapter}");
    }

    let id = h.start(config()).await.unwrap();
    let caps = h.manager.capabilities(id).unwrap();
    assert!(!caps.jvm_memory);
-    assert_eq!(caps.jvm_heap, caps.jvm_memory);
    assert_eq!(
        h.manager.jvm_memory_classes(id).await.unwrap(),
        JvmMemoryResult::Unavailable { reason: JvmMemoryUnavailable::NoJvmProcess, can_count_when_paused: false }
@@ -2456,13 +2399,6 @@ fn kotlin_attach(project: &std::path::Path, host: &str, port: u16) -> LaunchConf
    }
 }

-#[test]
-fn link_options_hold_only_for_fwcd() {
-    assert!(kotlin::link_options(kotlin::ADAPTER).hold_resumes);
-    assert!(!kotlin::link_options(kotlin_lsp::ADAPTER).hold_resumes);
-    assert!(!kotlin::link_options("x").hold_resumes);
-}
-
 #[tokio::test]
 async fn kotlin_session_installs_link_inspector() {
    let h = harness(Script::default());
@@ -2534,229 +2470,6 @@ async fn closing_the_session_drops_the_link() {
    assert!(session.jvm_inspector.lock().is_none());
 }

-/// kotlin-lsp's debugger, reached through the language server's `debugServer` port (the fake ignores it).
-fn kotlin_lsp_attach(project: &std::path::Path) -> LaunchConfig {
-    LaunchConfig {
-        adapter: kotlin_lsp::ADAPTER.into(),
-        request: "attach".into(),
-        cwd: Some(project.to_owned().into()),
-        extra_json: Some(
-            json!({"debugServer": 4711, "hostName": "127.0.0.1", "port": 5005, "projectRoot": project}).to_string(),
-        ),
-        ..config()
-    }
-}
-
-#[tokio::test]
-async fn kotlin_lsp_initializes_as_intellij_jvm() {
-    let project = tempfile::tempdir().unwrap();
-    for (config, adapter_id, invalidated) in [
-        (kotlin_lsp_attach(project.path()), "intellij_jvm", true),
-        (kotlin_attach(project.path(), "127.0.0.1", 5005), "kotlin-debug-adapter", false),
-    ] {
-        let h = harness(Script::default());
-        let id = h.start(config).await.unwrap();
-        let init = &h.request("initialize")["arguments"];
-        assert_eq!(init["adapterID"], adapter_id);
-        assert_eq!(init["supportsInvalidatedEvent"], invalidated, "{adapter_id}");
-        h.manager.stop(id).await.unwrap();
-    }
-}
-
-#[tokio::test]
-async fn kotlin_lsp_gets_real_paths_and_its_link_holds_nothing() {
-    let h = harness(Script::default());
-    let project = tempfile::tempdir().unwrap();
-    let path = project.path().join("Main.kt");
-    std::fs::write(&path, "package org.example\nfun main() {}\n").unwrap();
-    h.manager.set_breakpoints(path.clone(), vec![bp(1)]).await.unwrap();
-    let id = h.start(kotlin_lsp_attach(project.path())).await.unwrap();
-    assert_eq!(h.request("setBreakpoints")["arguments"]["source"]["path"], json!(path));
-    let sent = &h.request("attach")["arguments"];
-    assert_eq!(sent["projectRoot"], json!(project.path()));
-    assert!(sent.get("debugServer").is_none());
-    assert_eq!(sent["hostName"], "127.0.0.1");
-    let link_port = sent["port"].as_u64().unwrap();
-    assert!(link_port != 0 && link_port != 5005);
-    let session = h.manager.session(id).unwrap();
-    assert!(session.kotlin_mirror.lock().is_none());
-    assert!(session.jdwp_link.lock().is_some() && session.jvm_inspector.lock().is_some());
-    assert_eq!(session.attach_target.get(), Some(&("127.0.0.1".to_owned(), 5005)));
-    assert!(!kotlin::link_options(&session.adapter).hold_resumes);
-    h.manager.stop(id).await.unwrap();
-}
-
-#[tokio::test]
-async fn kotlin_lsp_waits_for_the_configuration_done_reply() {
-    let project = tempfile::tempdir().unwrap();
-    // fwcd never answers it (`kotlin_configures_without_configuration_done_response`).
-    let h = harness(Script { ignore_configuration_done: true, ..Default::default() });
-    let fwcd = h.start(kotlin_attach(project.path(), "127.0.0.1", 5005));
-    let id = tokio::time::timeout(Duration::from_secs(2), fwcd).await.unwrap().unwrap();
-    h.manager.stop(id).await.unwrap();
-
-    tokio::time::pause();
-    let h = harness(Script { ignore_configuration_done: true, ..Default::default() });
-    let started = tokio::time::Instant::now();
-    let err = h.start(kotlin_lsp_attach(project.path())).await.unwrap_err();
-    assert!(started.elapsed() >= REQUEST_TIMEOUT, "{:?}", started.elapsed());
-    assert!(err.message.contains("configurationDone"), "{err:?}");
-    assert!(h.manager.sessions(None).is_empty());
-}
-
-#[tokio::test]
-async fn kotlin_lsp_sessions_have_the_memory_tab() {
-    let h = harness(Script::default());
-    let project = tempfile::tempdir().unwrap();
-    let id = h.start(kotlin_lsp_attach(project.path())).await.unwrap();
-    assert!(h.manager.capabilities(id).unwrap().jvm_memory);
-    h.manager.stop(id).await.unwrap();
-}
-
-#[tokio::test]
-async fn losing_the_kotlin_lsp_connection_ends_the_session() {
-    let h = harness(Script { hang_up_after_stop: true, ..Script::default() });
-    let project = tempfile::tempdir().unwrap();
-    let id = h.start(kotlin_lsp_attach(project.path())).await.unwrap();
-    h.wait_event(|e| matches!(e, DebugEvent::Stopped { .. })).await;
-    let session = h.manager.session(id).unwrap();
-    assert!(session.jdwp_link.lock().is_some());
-    let _ = session.conn.request_timeout("threads", Value::Null, Duration::from_secs(2)).await;
-    h.wait_event(|e| matches!(e, DebugEvent::Terminated)).await;
-    assert!(h.manager.sessions(None).is_empty());
-    assert!(session.jdwp_link.lock().is_none());
-    assert!(session.jvm_inspector.lock().is_none());
-}
-
-/// The reasons of the first `count` stops, once that many arrived.
-async fn stop_reasons(h: &Harness, count: usize) -> Vec<String> {
-    for _ in 0..200 {
-        let reasons: Vec<String> = h
-            .events
-            .lock()
-            .iter()
-            .filter_map(|e| match e {
-                IdeEvent::Debug { event: DebugEvent::Stopped { reason, .. }, .. } => Some(reason.clone()),
-                _ => None,
-            })
-            .collect();
-        if reasons.len() >= count {
-            return reasons;
-        }
-        tokio::time::sleep(Duration::from_millis(10)).await;
-    }
-    panic!("{count} stops not received; got {:?}", h.events.lock());
-}
-
-#[tokio::test]
-async fn a_step_stop_is_reported_as_a_step() {
-    let project = tempfile::tempdir().unwrap();
-    for (config, reason) in [(kotlin_lsp_attach(project.path()), "step"), (config(), "breakpoint")] {
-        let h = harness(Script { step_reason: Some("breakpoint"), ..Script::default() });
-        let id = h.start(config).await.unwrap();
-        h.wait_event(|e| matches!(e, DebugEvent::Stopped { .. })).await;
-        h.manager.step(id, 1, StepKind::Over).await.unwrap();
-        assert_eq!(stop_reasons(&h, 2).await, ["breakpoint", reason]);
-        h.manager.stop(id).await.unwrap();
-    }
-}
-
-#[tokio::test]
-async fn a_breakpoint_after_continue_stays_a_breakpoint() {
-    let h = harness(Script { step_reason: Some("breakpoint"), stop_after_continue: true, ..Script::default() });
-    let project = tempfile::tempdir().unwrap();
-    let id = h.start(kotlin_lsp_attach(project.path())).await.unwrap();
-    h.wait_event(|e| matches!(e, DebugEvent::Stopped { .. })).await;
-    h.manager.step(id, 1, StepKind::Over).await.unwrap();
-    stop_reasons(&h, 2).await;
-    // The fake ends `stepIn` with no stop: the `continue` after it decides the next one.
-    h.manager.step(id, 1, StepKind::Into).await.unwrap();
-    h.manager.resume(id, 1).await.unwrap();
-    assert_eq!(stop_reasons(&h, 3).await, ["breakpoint", "step", "breakpoint"]);
-    h.manager.stop(id).await.unwrap();
-}
-
-#[tokio::test]
-async fn a_breakpoint_after_a_refused_step_stays_a_breakpoint() {
-    let h = harness(Script { refuse_next: true, ..Script::default() });
-    let project = tempfile::tempdir().unwrap();
-    let id = h.start(kotlin_lsp_attach(project.path())).await.unwrap();
-    h.wait_event(|e| matches!(e, DebugEvent::Stopped { .. })).await;
-    assert!(h.manager.step(id, 1, StepKind::Over).await.is_err());
-    assert_eq!(stop_reasons(&h, 2).await, ["breakpoint", "breakpoint"]);
-    h.manager.stop(id).await.unwrap();
-}
-
-#[tokio::test]
-async fn a_thread_from_an_earlier_stop_is_refused() {
-    let project = tempfile::tempdir().unwrap();
-    for (config, kotlin_lsp) in [(kotlin_lsp_attach(project.path()), true), (config(), false)] {
-        let h = harness(Script::default());
-        let id = h.start(config).await.unwrap();
-        h.wait_event(|e| matches!(e, DebugEvent::Stopped { .. })).await;
-        assert_eq!(h.manager.threads(id).await.unwrap().len(), 1);
-        let started = tokio::time::Instant::now();
-        let stale = h.manager.stack_trace(id, 99).await;
-        let asked =
-            |command: &str| h.log.lock().iter().any(|m| m["command"] == command && m["arguments"]["threadId"] == 99);
-        if kotlin_lsp {
-            assert!(stale.is_err() && started.elapsed() < Duration::from_millis(100), "{stale:?}");
-            assert!(h.manager.step(id, 99, StepKind::Over).await.is_err());
-            assert!(h.manager.resume(id, 99).await.is_err());
-            assert!(!asked("stackTrace") && !asked("next") && !asked("continue"));
-        } else {
-            assert!(stale.is_ok() && asked("stackTrace"), "{stale:?}");
-        }
-        assert!(h.manager.stack_trace(id, 1).await.is_ok());
-        h.manager.stop(id).await.unwrap();
-    }
-}
-
-#[tokio::test]
-async fn a_threads_reply_from_before_a_stop_does_not_vouch_for_its_ids() {
-    let h = harness(Script { stop_during_threads: true, ..Script::default() });
-    let project = tempfile::tempdir().unwrap();
-    let id = h.start(kotlin_lsp_attach(project.path())).await.unwrap();
-    h.wait_event(|e| matches!(e, DebugEvent::Stopped { .. })).await;
-    let threads = h.manager.threads(id).await.unwrap();
-    // M3 maps kotlin-lsp's threads by these names.
-    assert_eq!((threads[0].id, threads[0].name.as_str()), (1, "\"main\"@1"));
-    stop_reasons(&h, 2).await;
-    assert!(h.manager.stack_trace(id, 1).await.is_err());
-    assert!(h.manager.stack_trace(id, 2).await.is_ok());
-    h.manager.stop(id).await.unwrap();
-}
-
-#[tokio::test]
-async fn kotlin_lsp_frames_get_real_paths() {
-    let project = tempfile::tempdir().unwrap();
-    let at = "at com.x.AppKt.main(App.kt:13)";
-    for (config, path, name) in [
-        (kotlin_lsp_attach(project.path()), "/p/App.kt", "com.x.AppKt.main(App.kt:13)"),
-        (java_config("launch"), "file:///p/App.kt", at),
-    ] {
-        let script = Script { source_path: Some("file:///p/App.kt".into()), frame_name: Some(at), ..Script::default() };
-        let h = harness(script);
-        let id = h.start(config).await.unwrap();
-        h.wait_event(|e| matches!(e, DebugEvent::Stopped { .. })).await;
-        let frames = h.manager.stack_trace(id, 1).await.unwrap();
-        assert_eq!(frames[0].path.as_ref().map(|p| p.0.clone()), Some(PathBuf::from(path)));
-        assert_eq!(frames[0].name, name);
-        h.manager.stop(id).await.unwrap();
-    }
-}
-
-#[tokio::test]
-async fn invalidated_events_reach_the_client() {
-    let h = harness(Script { invalidated_after_stop: true, ..Script::default() });
-    let project = tempfile::tempdir().unwrap();
-    let id = h.start(kotlin_lsp_attach(project.path())).await.unwrap();
-    match h.wait_event(|e| matches!(e, DebugEvent::Invalidated { .. })).await {
-        DebugEvent::Invalidated { areas } => assert_eq!(areas, ["variables"]),
-        other => panic!("{other:?}"),
-    }
-    h.manager.stop(id).await.unwrap();
-}
 #[cfg(unix)]
 #[tokio::test]
 async fn rdbg_drains_test_output_after_dap_closes_before_killing_the_process() {
@@ -17,7 +17,6 @@ blake3.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 parking_lot.workspace = true
-notify.workspace = true
 futures.workspace = true
 sqlx.workspace = true
 tiberius.workspace = true
@@ -12,8 +12,6 @@ pub mod secrets;
 pub mod source;
 pub mod split;
 pub mod sql;
-mod watch;
-pub use watch::SourcesWatch;

 pub use conn::{Held, Pool, QueryResult, ResultColumn};
 pub use history::HistoryEntry;
@@ -237,9 +235,6 @@ pub struct DbManager {
    /// Manual-commit data sources, each with the connection of its open
    /// transaction (taken by the first statement after a commit / rollback).
    sessions: Mutex<HashMap<String, Session>>,
-    /// The data sources as last read from disk, for [`DbManager::reconcile_sources`]
-    /// (`None` until [`DbManager::watch_sources`]).
-    on_disk: Mutex<Option<Vec<DataSource>>>,
 }

 type Session = Arc<tokio::sync::Mutex<Option<Held>>>;
@@ -367,7 +362,6 @@ impl DbManager {
            tunnel_open: tokio::sync::Mutex::new(()),
            ssh,
            session_passwords: Mutex::default(),
-            on_disk: Mutex::default(),
            sessions: Mutex::default(),
        }
    }
@@ -480,45 +474,9 @@ impl DbManager {
                }
            }
        }
-        // Our own write is not reported as an edit on disk.
-        if let Some(known) = self.on_disk.lock().as_mut() {
-            *known = self.sources().unwrap_or(sources);
-        }
        Ok(())
    }

-    /// Watches the data source files (the project's and the global one) for edits made
-    /// outside the IDE; `on_change` runs on a background thread once they settle, and
-    /// should call [`DbManager::reconcile_sources`]. Stops when the result is dropped.
-    pub fn watch_sources(&self, on_change: Box<dyn Fn() + Send>) -> IdeResult<SourcesWatch> {
-        *self.on_disk.lock() = Some(self.sources().unwrap_or_default());
-        SourcesWatch::start(&self.root, self.global.as_ref().map(|(dir, _)| dir.as_path()), on_change)
-    }
-
-    /// Re-reads the data sources after their files changed on disk: connections of
-    /// removed or changed sources close, as on [`DbManager::save_sources`] (saved
-    /// passwords stay, the source may come back). Returns whether the list the tree
-    /// shows changed, or the files no longer parse (the tree reports the error).
-    pub async fn reconcile_sources(&self) -> bool {
-        let now = match self.sources() {
-            Ok(now) => now,
-            Err(e) => {
-                tracing::warn!("data sources: {}", e.message);
-                return true;
-            }
-        };
-        let before = self.on_disk.lock().replace(now.clone()).unwrap_or_default();
-        if before == now {
-            return false;
-        }
-        for o in &before {
-            if now.iter().find(|s| s.id == o.id) != Some(o) {
-                self.disconnect_source(&o.id).await;
-            }
-        }
-        true
-    }
-
    /// Remembers `password` for the session, and in the saved passwords when
    /// the data source saves passwords (`None` forgets it).
    pub async fn set_password(&self, id: &str, password: Option<String>, save: bool) -> IdeResult<()> {
@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 use specta::Type;
 use std::path::Path;

-pub(crate) const FILE: &str = "data-sources.toml";
+const FILE: &str = "data-sources.toml";

 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
@@ -1,151 +0,0 @@
-//! Data source files edited outside the Database tool window (by hand, by a coding
-//! agent, by `git checkout`) are picked up while the project is open, as IDEA does
-//! for `dataSources.xml`. The project file tree's watcher is no help here: it never
-//! reports a modification inside a gitignored `.openidea/`.
-
-use crate::source::FILE;
-use ide_core::{IdeError, IdeResult, project_dir};
-use notify::{RecommendedWatcher, RecursiveMode, Watcher};
-use parking_lot::Mutex;
-use std::path::{Path, PathBuf};
-use std::sync::{Arc, Weak, mpsc};
-use std::time::Duration;
-
-/// How long a burst of writes (an editor's save, an agent's rewrite) settles before
-/// the files are read.
-const SETTLE: Duration = Duration::from_millis(200);
-
-/// Watches `<root>/.openidea/data-sources.toml` and `<global>/data-sources.toml`;
-/// stops when dropped.
-pub struct SourcesWatch {
-    _watcher: Arc<Mutex<RecommendedWatcher>>,
-}
-
-impl SourcesWatch {
-    /// Calls `on_change` once a burst of changes to either file settled, on a
-    /// background thread.
-    pub fn start(root: &Path, global: Option<&Path>, on_change: Box<dyn Fn() + Send>) -> IdeResult<Self> {
-        let config: PathBuf = root.join(project_dir::DIR);
-        let (tx, rx) = mpsc::channel::<()>();
-        let relevant = {
-            let config = config.clone();
-            move |p: &Path| p.file_name().is_some_and(|n| n == FILE) || p == config
-        };
-        let watcher = notify::recommended_watcher(move |res: notify::Result<notify::Event>| {
-            if let Ok(e) = res
-                && e.paths.iter().any(|p| relevant(p))
-            {
-                let _ = tx.send(());
-            }
-        })
-        .map_err(|e| IdeError::internal(format!("data sources watcher: {e}")))?;
-        let watcher = Arc::new(Mutex::new(watcher));
-        {
-            let mut w = watcher.lock();
-            // The root (not recursively) sees `.openidea/` itself appear or go.
-            w.watch(root, RecursiveMode::NonRecursive)
-                .map_err(|e| IdeError::internal(format!("data sources watcher: {e}")))?;
-            if let Some(dir) = global.filter(|d| d.is_dir())
-                && let Err(e) = w.watch(dir, RecursiveMode::NonRecursive)
-            {
-                tracing::warn!("global data sources watcher: {e}");
-            }
-        }
-        let mut watching = watch_config(&watcher, &config, false);
-        let weak: Weak<Mutex<RecommendedWatcher>> = Arc::downgrade(&watcher);
-        std::thread::Builder::new().name("openidea-db-sources-watch".into()).spawn(move || {
-            while rx.recv().is_ok() {
-                // Wait until the writes stop.
-                loop {
-                    match rx.recv_timeout(SETTLE) {
-                        Ok(()) => {}
-                        Err(mpsc::RecvTimeoutError::Timeout) => break,
-                        Err(mpsc::RecvTimeoutError::Disconnected) => return,
-                    }
-                }
-                let Some(watcher) = weak.upgrade() else { return };
-                watching = watch_config(&watcher, &config, watching);
-                drop(watcher);
-                on_change();
-            }
-        })?;
-        Ok(Self { _watcher: watcher })
-    }
-}
-
-/// Watches `.openidea/` once it exists (again: a removed folder loses its watch);
-/// returns whether it is watched.
-fn watch_config(watcher: &Mutex<RecommendedWatcher>, config: &Path, watching: bool) -> bool {
-    if !config.is_dir() {
-        return false;
-    }
-    if watching {
-        return true;
-    }
-    match watcher.lock().watch(config, RecursiveMode::NonRecursive) {
-        Ok(()) => true,
-        Err(e) => {
-            tracing::warn!("data sources watcher {}: {e}", config.display());
-            false
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::sync::atomic::{AtomicUsize, Ordering};
-    use std::time::Instant;
-
-    fn wait_for(count: &AtomicUsize, at_least: usize) -> bool {
-        let deadline = Instant::now() + Duration::from_secs(10);
-        while Instant::now() < deadline {
-            if count.load(Ordering::SeqCst) >= at_least {
-                return true;
-            }
-            std::thread::sleep(Duration::from_millis(20));
-        }
-        false
-    }
-
-    fn counting() -> (Arc<AtomicUsize>, Box<dyn Fn() + Send>) {
-        let count = Arc::new(AtomicUsize::new(0));
-        let c = count.clone();
-        (count, Box::new(move || _ = c.fetch_add(1, Ordering::SeqCst)))
-    }
-
-    #[test]
-    fn reports_project_and_global_files_and_a_config_folder_created_later() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = dunce::canonicalize(tmp.path()).unwrap();
-        let (project, global) = (root.join("p"), root.join("app"));
-        std::fs::create_dir_all(&project).unwrap();
-        std::fs::create_dir_all(&global).unwrap();
-        let (count, on_change) = counting();
-        let _watch = SourcesWatch::start(&project, Some(&global), on_change).unwrap();
-
-        // No `.openidea/` yet: it is created, then the file written into it.
-        std::fs::create_dir_all(project.join(".openidea")).unwrap();
-        assert!(wait_for(&count, 1));
-        let seen = count.load(Ordering::SeqCst);
-        std::fs::write(project.join(".openidea/data-sources.toml"), "").unwrap();
-        assert!(wait_for(&count, seen + 1), "project file");
-
-        let seen = count.load(Ordering::SeqCst);
-        std::fs::write(global.join("data-sources.toml"), "").unwrap();
-        assert!(wait_for(&count, seen + 1), "global file");
-    }
-
-    #[test]
-    fn ignores_other_files() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = dunce::canonicalize(tmp.path()).unwrap();
-        std::fs::create_dir_all(root.join(".openidea")).unwrap();
-        let (count, on_change) = counting();
-        let _watch = SourcesWatch::start(&root, None, on_change).unwrap();
-        std::fs::write(root.join(".openidea/settings.toml"), "").unwrap();
-        std::fs::write(root.join("main.py"), "").unwrap();
-        std::thread::sleep(SETTLE * 3);
-        assert_eq!(count.load(Ordering::SeqCst), 0);
-    }
-}
@@ -342,31 +342,3 @@ async fn applies_driver_properties_and_the_startup_script_on_connect() -> IdeRes
    assert_eq!(db.schemas("s1").await?, vec!["main"]);
    Ok(())
 }
-
-#[tokio::test]
-async fn data_sources_edited_on_disk_close_their_connections() -> IdeResult<()> {
-    let (tmp, db) = setup().await;
-    std::fs::File::create(tmp.path().join("other.db")).unwrap();
-    let (tx, rx) = std::sync::mpsc::channel();
-    let _watch = db.watch_sources(Box::new(move || _ = tx.send(())))?;
-    db.pool("s1").await?;
-    assert_eq!(db.connected(), vec!["s1"]);
-
-    // Our own save is no edit on disk.
-    let mut sources = db.sources()?;
-    sources[0].name = "renamed".into();
-    db.save_sources(sources.clone()).await?;
-    assert!(!db.reconcile_sources().await);
-
-    // Edited outside the IDE (by hand, by an agent): the watcher reports it, and the
-    // connection made with the old settings closes.
-    db.pool("s1").await?;
-    sources[0].file = Some("other.db".into());
-    ide_db::source::save(tmp.path(), &sources)?;
-    rx.recv_timeout(std::time::Duration::from_secs(10)).expect("the watcher reports the edit");
-    assert!(db.reconcile_sources().await);
-    assert!(db.connected().is_empty());
-    assert_eq!(db.sources()?[0].file.as_ref().map(|f| f.0.clone()), Some("other.db".into()));
-    assert!(!db.reconcile_sources().await);
-    Ok(())
-}
@@ -136,19 +136,24 @@ pub struct DockerRegistry {
    pub username: String,
 }

-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct DockerSettings {
-    #[serde(default)]
+    #[serde(default = "default_connections")]
    pub connections: Vec<DockerConnection>,
    #[serde(default)]
    pub registries: Vec<DockerRegistry>,
 }

-/// Whether `c` is the connection older versions injected when nothing was configured:
-/// Services lists only connections the user added, so this one is dropped on load.
-fn is_injected_default(c: &DockerConnection) -> bool {
-    c.id == "default" && c.name == "Docker" && c.endpoint == DockerEndpoint::Default
+impl Default for DockerSettings {
+    fn default() -> Self {
+        Self { connections: default_connections(), registries: Vec::new() }
+    }
+}
+
+/// Before anything is configured the CLI's own daemon is shown, as before connections existed.
+fn default_connections() -> Vec<DockerConnection> {
+    vec![DockerConnection { id: "default".into(), name: "Docker".into(), endpoint: DockerEndpoint::Default }]
 }

 const SETTINGS_FILE: &str = "docker.json";
@@ -156,17 +161,10 @@ const PASSWORDS_FILE: &str = "docker-passwords.json";

 pub fn load_settings(data_dir: &Path) -> DockerSettings {
    match std::fs::read(data_dir.join(SETTINGS_FILE)) {
-        // A file written before the opt-in Services rework carries the injected default
-        // (saved along with a registry or another connection); drop it unless edited.
-        Ok(bytes) => serde_json::from_slice(&bytes)
-            .map(|mut s: DockerSettings| {
-                s.connections.retain(|c| !is_injected_default(c));
-                s
-            })
-            .unwrap_or_else(|e| {
-                tracing::warn!("{SETTINGS_FILE}: {e}");
-                DockerSettings::default()
-            }),
+        Ok(bytes) => serde_json::from_slice(&bytes).unwrap_or_else(|e| {
+            tracing::warn!("{SETTINGS_FILE}: {e}");
+            DockerSettings::default()
+        }),
        Err(_) => DockerSettings::default(),
    }
 }
@@ -375,8 +373,7 @@ mod tests {
    fn settings_round_trip_and_passwords() {
        let tmp = tempfile::tempdir().unwrap();
        let dir = tmp.path();
-        // Nothing configured: no connection is invented.
-        assert!(load_settings(dir).connections.is_empty());
+        assert_eq!(load_settings(dir).connections[0].endpoint, DockerEndpoint::Default);
        let settings = DockerSettings {
            connections: vec![DockerConnection {
                id: "c1".into(),
@@ -398,32 +395,8 @@ mod tests {
        assert!(auth_for(dir, "postgres").is_none());
        save_settings(dir, &DockerSettings { registries: Vec::new(), ..settings }).unwrap();
        assert_eq!(registry_password(dir, "r1"), None);
-        // An empty list stays empty.
+        // An empty list stays empty (the default connection is only for a missing file).
        save_settings(dir, &DockerSettings { connections: Vec::new(), registries: Vec::new() }).unwrap();
        assert!(load_settings(dir).connections.is_empty());
    }
-
-    #[test]
-    fn load_drops_the_injected_default_connection() {
-        let tmp = tempfile::tempdir().unwrap();
-        let dir = tmp.path();
-        let injected =
-            || DockerConnection { id: "default".into(), name: "Docker".into(), endpoint: DockerEndpoint::Default };
-        let registry =
-            DockerRegistry { id: "r1".into(), name: "GHCR".into(), address: "ghcr.io".into(), username: "me".into() };
-        // Saved untouched by an older version (e.g. along with a registry): dropped on load.
-        save_settings(dir, &DockerSettings { connections: vec![injected()], registries: vec![registry.clone()] })
-            .unwrap();
-        let loaded = load_settings(dir);
-        assert!(loaded.connections.is_empty());
-        assert_eq!(loaded.registries, vec![registry]);
-        // A connection the user renamed or re-pointed stays theirs.
-        let renamed = DockerConnection { name: "Local engine".into(), ..injected() };
-        save_settings(dir, &DockerSettings { connections: vec![renamed.clone()], registries: Vec::new() }).unwrap();
-        assert_eq!(load_settings(dir).connections, vec![renamed]);
-        let repointed =
-            DockerConnection { endpoint: DockerEndpoint::Socket { path: "/var/run/docker.sock".into() }, ..injected() };
-        save_settings(dir, &DockerSettings { connections: vec![repointed.clone()], registries: Vec::new() }).unwrap();
-        assert_eq!(load_settings(dir).connections, vec![repointed]);
-    }
 }
@@ -71,6 +71,7 @@ impl Capability {
        match self {
            Self::ProjectRead | Self::EditorRead | Self::Storage | Self::Events | Self::VcsRead => Risk::Low,
            Self::EditorWrite
+            | Self::ProjectWrite
            | Self::DatabaseSources
            | Self::VcsWrite
            | Self::Net(_)
@@ -79,14 +80,7 @@ impl Capability {
            | Self::Secrets
            | Self::InputEvents
            | Self::Clipboard => Risk::Medium,
-            // A trusted project's own files name the programs the IDE starts (its settings, its
-            // build scripts), so writing them is running code.
-            Self::ProjectWrite
-            | Self::IdeCommands
-            | Self::Ipc(_)
-            | Self::Process(_)
-            | Self::FsRead(_)
-            | Self::FsWrite(_) => Risk::High,
+            Self::IdeCommands | Self::Ipc(_) | Self::Process(_) | Self::FsRead(_) | Self::FsWrite(_) => Risk::High,
        }
    }

@@ -408,15 +402,6 @@ mod tests {
        assert!(Capability::Storage.auto_migrates() && !Capability::EditorWrite.auto_migrates());
    }

-    /// A trusted project's files name programs the IDE starts by itself: the git and language
-    /// server executables in `.openidea/settings.toml`, its build scripts. Writing them is
-    /// running code, and the install dialog says so.
-    #[test]
-    fn writing_project_files_is_a_high_risk_grant() {
-        assert_eq!(Capability::ProjectWrite.risk(), Risk::High);
-        assert!(!Capability::ProjectWrite.auto_migrates());
-    }
-
    #[test]
    fn host_patterns() {
        assert!(host_matches("crates.io", "crates.io"));
@@ -34,7 +34,7 @@ use std::path::{Component, Path, PathBuf};

 pub const MANIFEST_FILE: &str = "plugin.toml";
 /// The plugin API (engine) version this host implements.
-pub const ENGINE_VERSION: &str = "1.6.0";
+pub const ENGINE_VERSION: &str = "1.5.0";
 /// The 0.1 API, still accepted for contribution-only packages and 0.1 components.
 pub const LEGACY_API: &str = "0.1";
 /// Marketplace categories, in the order they are shown.
@@ -151,8 +151,6 @@ impl ActivationEvent {
 /// Workbench event kinds (`on-event:<kind>`, WIT `events.event-kind`).
 /// `scheduled` comes from `on-schedule` instead.
 pub const EVENT_KINDS: &[&str] = &[
-    "document-changed",
-    "websocket-ready",
    "run-exited",
    "terminal-exited",
    "content-tab-action",
@@ -368,10 +366,6 @@ impl Manifest {
        }
        let mut seen = BTreeSet::new();
        for event in &self.activation {
-            if matches!(event, ActivationEvent::Event(kind) if matches!(kind.as_str(), "document-changed" | "websocket-ready"))
-            {
-                self.needs_api(&format!("`{event}`"), 6)?;
-            }
            if matches!(event, ActivationEvent::Event(kind) if matches!(kind.as_str(), "file-closed" | "settings-changed" | "input-mode-changed" | "run-exited" | "terminal-exited" | "content-tab-action"))
            {
                self.needs_api(&format!("`{event}`"), 4)?;
@@ -588,8 +582,6 @@ mod tests {
            ActivationEvent::parse("on-event:files-changed"),
            Ok(ActivationEvent::Event("files-changed".into()))
        );
-        assert!(ActivationEvent::parse("on-event:document-changed").is_ok());
-        assert!(ActivationEvent::parse("on-event:websocket-ready").is_ok());
        let err = ActivationEvent::parse("on-event:keystroke").unwrap_err();
        assert!(err.contains("unknown event kind") && err.contains("action-performed"), "{err}");
        assert!(ActivationEvent::parse("on-event:scheduled").is_err(), "declared with on-schedule");
@@ -868,7 +860,7 @@ mod commands_api_tests {
 mod net_ask_api_tests {
    use super::*;
    #[test]
-    fn api_1_5_declarations_require_api_1_5() {
+    fn net_ask_requires_api_1_5() {
        for declaration in ["[capabilities]\nrequired = [\"net:ask\"]", "[capabilities]\noptional = [\"net:ask\"]"] {
            for engine in ["^1.4", "^1.5"] {
                let manifest = format!(
@@ -883,23 +875,4 @@ mod net_ask_api_tests {
            }
        }
    }
-
-    #[test]
-    fn realtime_events_require_api_1_6() {
-        for declaration in
-            ["activation = [\"on-event:document-changed\"]", "activation = [\"on-event:websocket-ready\"]"]
-        {
-            for engine in ["^1.5", "^1.6"] {
-                let manifest = format!(
-                    "id = 'test'\nname = 'Test'\nversion = '0.1.0'\nwasm = 'plugin.wasm'\nengines.openidea = '{engine}'\n{declaration}\n"
-                );
-                let parsed = Manifest::parse(&manifest);
-                if engine == "^1.6" {
-                    parsed.unwrap();
-                } else {
-                    assert!(parsed.unwrap_err().contains("new in plugin API 1.6"), "{engine}");
-                }
-            }
-        }
-    }
 }
@@ -352,22 +352,6 @@ pub struct IndexEntry {
    /// the IDE before showing it.
    #[serde(default)]
    pub icon: Option<PluginIcon>,
-    /// Where to read more: the manifest's homepage, else the registry's source repository.
-    #[serde(default)]
-    pub homepage: Option<String>,
-    /// This version's release notes (the manifest's `change-notes`).
-    #[serde(default)]
-    pub notes: Option<String>,
-    /// Downloads of the plugin's packages, as counted by whoever serves them.
-    #[serde(default)]
-    pub downloads: Option<u64>,
-    /// Picked by the marketplace's maintainers.
-    #[serde(default)]
-    pub featured: bool,
-    /// Project-relative paths whose presence makes the plugin worth suggesting
-    /// (`pom.xml`, `config/routes.rb`).
-    #[serde(default)]
-    pub suggest: Vec<String>,
 }

 impl IndexEntry {
@@ -405,31 +389,10 @@ impl Index {
    /// revocations, publisher keys (revoked ones) and `moved` — and lists no
    /// plugins ([`Index::is_newer`]): the IDE needs updating to install from it.
    pub fn parse(text: &str) -> Result<Self, String> {
-        let (index, dropped) = Self::parse_dropping(text)?;
-        if let Some(first) = dropped.first() {
-            // One line per index, and a bounded one: whoever wrote the index chose the text.
-            let id: String = first.id.chars().take(80).collect();
-            tracing::warn!(
-                "index: {} entries are not offered, their id or version is not one a manifest may carry (first: {id:?})",
-                dropped.len()
-            );
-        }
-        Ok(index)
-    }
-
-    /// [`Index::parse`], with the entries it does not offer: those whose id or
-    /// version no manifest may carry, so no IDE could install them.
-    pub fn parse_dropping(text: &str) -> Result<(Self, Vec<IndexEntry>), String> {
        let value: serde_json::Value = serde_json::from_str(text).map_err(|e| format!("index: {e}"))?;
        let format = value.get("format").and_then(serde_json::Value::as_u64).ok_or("index: `format` is missing")?;
        if format == u64::from(INDEX_FORMAT) {
-            let mut index: Index = serde_json::from_value(value).map_err(|e| format!("index: {e}"))?;
-            // What no manifest may carry is not offered: the id and version also name files on disk.
-            let (offered, dropped) = std::mem::take(&mut index.plugins)
-                .into_iter()
-                .partition(|e| crate::validate_plugin_id(&e.id).is_ok() && e.semver().is_some());
-            index.plugins = offered;
-            return Ok((index, dropped));
+            return serde_json::from_value(value).map_err(|e| format!("index: {e}"));
        }
        if format < u64::from(INDEX_FORMAT) {
            return Err(format!("index format {format} is not supported (this IDE reads {INDEX_FORMAT})"));
@@ -438,14 +401,13 @@ impl Index {
            let items = value.get(field).and_then(serde_json::Value::as_array);
            items.into_iter().flatten().filter_map(|v| serde_json::from_value(v.clone()).ok()).collect()
        }
-        let index = Index {
+        Ok(Index {
            format: u32::try_from(format).unwrap_or(u32::MAX),
            publishers: each(&value, "publishers"),
            plugins: Vec::new(),
            revoked: each(&value, "revoked"),
            moved: value.get("moved").and_then(serde_json::Value::as_str).map(str::to_owned),
-        };
-        Ok((index, Vec::new()))
+        })
    }

    /// Written in a format newer than this IDE reads: it lists no plugins.
@@ -723,33 +685,9 @@ mod tests {
            engine: "^1.0".into(),
            categories: Vec::new(),
            icon: None,
-            homepage: None,
-            notes: None,
-            downloads: None,
-            featured: false,
-            suggest: Vec::new(),
        }
    }

-    #[test]
-    fn listing_details_are_optional() {
-        let mut json = serde_json::to_value(entry("acme.a", "acme")).unwrap();
-        for key in ["homepage", "notes", "downloads", "featured", "suggest"] {
-            json.as_object_mut().unwrap().remove(key);
-        }
-        assert_eq!(serde_json::from_value::<IndexEntry>(json).unwrap(), entry("acme.a", "acme"));
-        let full = IndexEntry {
-            homepage: Some("https://example.com".into()),
-            notes: Some("Fixes".into()),
-            downloads: Some(42),
-            featured: true,
-            suggest: vec!["pom.xml".into()],
-            ..entry("acme.a", "acme")
-        };
-        let back: IndexEntry = serde_json::from_str(&serde_json::to_string(&full).unwrap()).unwrap();
-        assert_eq!(back, full);
-    }
-
    fn version(id: &str, version: &str, engine: &str) -> IndexEntry {
        IndexEntry { version: version.into(), engine: engine.into(), ..entry(id, "acme") }
    }
@@ -930,51 +868,6 @@ mod tests {
        }
    }

-    #[test]
-    fn an_index_offers_only_the_ids_and_versions_a_manifest_may_carry() {
-        let invalid_ids = [
-            "../x",
-            "../../escape",
-            "acme/../x",
-            r"acme.\..\x",
-            "acme./../../../escape",
-            "/abs",
-            r"C:\x",
-            "ACME.x",
-            "acme.",
-            "acme..x",
-            "acme.x y",
-            "",
-        ];
-        let invalid_versions =
-            ["../1.0.0", "1.0.0/../../../escape", r"1.0.0\..\x", "1.0.0-..", " 1.0.0", "1.0", "latest", ""];
-        let valid = [("acme.x", "1.0.0"), ("acme.tools-2_b", "1.0.0-rc.1+b.2")];
-        let mut listed: Vec<(&str, &str)> = valid.to_vec();
-        listed.extend(invalid_ids.iter().map(|id| (*id, "1.0.0")));
-        listed.extend(invalid_versions.iter().map(|version| ("acme.x", *version)));
-        let plugins: Vec<serde_json::Value> = listed
-            .iter()
-            .map(|(id, version)| {
-                serde_json::json!({
-                    "id": id, "name": "X", "version": version, "publisher": "acme",
-                    "download": "x.oiplugin", "digest": "d", "engine": "^1.0",
-                })
-            })
-            .collect();
-        let text = serde_json::json!({ "format": INDEX_FORMAT, "plugins": plugins }).to_string();
-        let pairs = |entries: &[IndexEntry]| -> Vec<(String, String)> {
-            entries.iter().map(|e| (e.id.clone(), e.version.clone())).collect()
-        };
-        let owned = |pairs: &[(&str, &str)]| -> Vec<(String, String)> {
-            pairs.iter().map(|(id, version)| ((*id).to_owned(), (*version).to_owned())).collect()
-        };
-
-        assert_eq!(pairs(&Index::parse(&text).unwrap().plugins), owned(&valid));
-        let (index, dropped) = Index::parse_dropping(&text).unwrap();
-        assert_eq!(pairs(&index.plugins), owned(&valid));
-        assert_eq!(pairs(&dropped), owned(&listed[valid.len()..]));
-    }
-
    #[test]
    fn a_newer_index_still_revokes_and_moves() {
        let newer = format!(
@@ -102,14 +102,6 @@ fn parse<T>(r: serde_json::Result<T>) -> IdeResult<T> {
    r.map_err(|e| IdeError::new(ide_core::error::ErrorKind::Protocol, format!("unexpected gh output: {e}")))
 }

-/// The repository of `root`, free to execute: the host runs the `gh_*` commands only in a
-/// trusted project.
-fn trusted_repo(root: &Path) -> IdeResult<Repo> {
-    let repo = Repo::discover(root)?.ok_or_else(|| IdeError::invalid("not a git repository"))?;
-    repo.set_execution_allowed(true);
-    Ok(repo)
-}
-
 /// Whether gh is installed and signed in, and which GitHub repository `root` maps to.
 pub fn availability(root: &Path) -> GhAvailability {
    if gh_executable().is_none() {
@@ -241,7 +233,7 @@ pub fn create(
        return Err(IdeError::invalid("choose a base branch"));
    }
    if req.push {
-        let repo = trusted_repo(root)?;
+        let repo = Repo::discover(root)?.ok_or_else(|| IdeError::invalid("not a git repository"))?;
        repo.push(false, true, cancel, on_output)?;
    }
    let mut args = vec!["pr", "create", "--title", req.title.trim(), "--body", &req.body, "--base", req.base.trim()];
@@ -362,7 +354,7 @@ pub fn prepare_diff(
    cancel: &CancellationToken,
    on_output: &dyn Fn(String),
 ) -> IdeResult<PrDiffRevisions> {
-    let repo = trusted_repo(root)?;
+    let repo = Repo::discover(root)?.ok_or_else(|| IdeError::invalid("not a git repository"))?;
    if !repo.has_commit(head_oid) || !repo.has_commit(base_oid) {
        let remotes = repo.remotes()?;
        let remote = remote_for(&remotes, name_with_owner)
@@ -1,28 +0,0 @@
-[package]
-name = "ide-heap"
-description = "HotSpot .hprof parser and heap-snapshot analysis for the debugger's JVM Memory view"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-ide-core.workspace = true
-memmap2.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-specta.workspace = true
-thiserror.workspace = true
-tracing.workspace = true
-uuid.workspace = true
-
-[target.'cfg(unix)'.dependencies]
-libc = "0.2"
-
-[dev-dependencies]
-criterion = { version = "0.5", default-features = false }
-proptest.workspace = true
-tempfile.workspace = true
-
-[[bench]]
-name = "heap"
-harness = false
@@ -1,100 +0,0 @@
-//! `cargo bench -p ide-heap`: whole-dump analysis and the dominator tree at a million objects.
-
-use criterion::{Criterion, black_box, criterion_group, criterion_main};
-use ide_core::CancellationToken;
-use ide_heap::testing::{MiniHeap, XorShift};
-use ide_heap::{AnalyzeOptions, BasicType, HeapError, HeapPhase, HeapRootKind, Store, analyze, dominators};
-
-const CHAINS: u64 = 100_000;
-const CHAIN_LEN: u64 = 5;
-const NODES: u64 = CHAINS * CHAIN_LEN;
-/// Every object takes one slot: node `k` at slot `2k`, its payload at `2k + 1`.
-const BASE: u64 = 0x1_0000_0000;
-const SLOT: u64 = 0x20;
-
-fn node_addr(k: u64) -> u64 {
-    BASE + 2 * k * SLOT
-}
-
-fn payload_addr(k: u64) -> u64 {
-    node_addr(k) + SLOT
-}
-
-/// 100k rooted chains of five `Node { next, payload }`, each node with its own `byte[16]`. Every
-/// seventh node points at the payload of the same position in the next chain instead, so that
-/// payload has two owners and its own one is garbage: 1M objects in all.
-fn million_objects() -> MiniHeap {
-    let mut heap = MiniHeap::new();
-    heap.class("Node", Some("java.lang.Object"), &[("next", BasicType::Object), ("payload", BasicType::Object)]);
-    for k in 0..NODES {
-        let next = if (k + 1) % CHAIN_LEN == 0 { 0 } else { node_addr(k + 1) };
-        let payload = if k % 7 == 0 { payload_addr((k + CHAIN_LEN) % NODES) } else { payload_addr(k) };
-        heap.object(node_addr(k), "Node", &[("next", next), ("payload", payload)]);
-        heap.prim(payload_addr(k), BasicType::Byte, 16);
-        if k % CHAIN_LEN == 0 {
-            heap.root(HeapRootKind::JniGlobal, node_addr(k));
-        }
-    }
-    heap
-}
-
-/// CSR of a random tree on `nodes` nodes rooted at 0 plus `extra` random edges, targets of each
-/// node in scrambled order.
-fn random_graph(nodes: u32, extra: u32, seed: u64) -> (Vec<u32>, Vec<u32>) {
-    let mut rng = XorShift::new(seed);
-    let mut edges: Vec<(u32, u32)> = (1..nodes).map(|v| (rng.below(v), v)).collect();
-    edges.extend((0..extra).map(|_| (rng.below(nodes), rng.below(nodes))));
-    for i in (1..edges.len()).rev() {
-        edges.swap(i, rng.below(i as u32 + 1) as usize);
-    }
-    let mut start = vec![0u32; nodes as usize + 1];
-    for &(from, _) in &edges {
-        start[from as usize + 1] += 1;
-    }
-    for v in 0..nodes as usize {
-        start[v + 1] += start[v];
-    }
-    let mut cursor = start.clone();
-    let mut out = vec![0u32; edges.len()];
-    for &(from, to) in &edges {
-        out[cursor[from as usize] as usize] = to;
-        cursor[from as usize] += 1;
-    }
-    (start, out)
-}
-
-fn no_progress(_: HeapPhase, _: u64, _: u64) -> Result<(), HeapError> {
-    Ok(())
-}
-
-fn bench(c: &mut Criterion) {
-    let dir = tempfile::tempdir().expect("temp dir");
-    let hprof = dir.path().join("dump.hprof");
-    million_objects().write_to(&hprof);
-    let (start, out) = random_graph(1_000_000, 500_000, 0x5EED_D0D0);
-    let cancel = CancellationToken::new();
-    let opts = AnalyzeOptions { in_memory: true, ..AnalyzeOptions::default() };
-    let summary = analyze(&hprof, dir.path(), opts, &no_progress, &cancel).expect("analyze").summary;
-    assert_eq!(summary.objects, 2 * NODES, "{summary:?}");
-    assert_eq!(summary.unreachable_objects, NODES.div_ceil(7), "{summary:?}");
-
-    let mut g = c.benchmark_group("heap");
-    g.sample_size(10);
-    g.bench_function("index_1m_objects", |b| {
-        b.iter(|| {
-            let opts = AnalyzeOptions { in_memory: true, ..AnalyzeOptions::default() };
-            let index = analyze(&hprof, dir.path(), opts, &no_progress, &cancel).expect("analyze");
-            black_box(index.summary.objects)
-        })
-    });
-    g.bench_function("dominators_1m_random", |b| {
-        b.iter(|| {
-            let d = dominators(&start, &out, 0, &Store::Ram, &no_progress, &cancel).expect("dominators");
-            black_box(d.reachable)
-        })
-    });
-    g.finish();
-}
-
-criterion_group!(benches, bench);
-criterion_main!(benches);
@@ -1,202 +0,0 @@
-//! Ties the passes together: graph, dominators, shallow and retained sizes, the class table and
-//! paths to GC roots, into a [`HeapIndex`].
-
-mod classes;
-mod paths;
-mod retained;
-
-use std::collections::HashMap;
-use std::fs::File;
-use std::path::Path;
-use std::time::Instant;
-
-use ide_core::CancellationToken;
-use memmap2::Mmap;
-
-use crate::column::Store;
-use crate::dominators::{Dominators, dominators};
-use crate::error::HeapError;
-use crate::files::INDEX_FILES;
-use crate::graph::{HeapGraph, build_graph};
-use crate::index::{HeapIndex, HeapSummary, write_summary};
-use crate::progress::{CHECK_EVERY, HeapPhase, Progress};
-use crate::shallow::{HistogramEntry, ShallowModel, VmLayout};
-
-#[derive(Clone, Debug, Default)]
-pub struct AnalyzeOptions {
-    /// The JVM's class histogram from the same stop as the dump.
-    pub histogram: Option<Vec<HistogramEntry>>,
-    /// `VM.flags` output of the JVM that wrote the dump.
-    pub vm_flags: Option<String>,
-    pub java_major: Option<u32>,
-    /// Keep every array in RAM and write nothing to `index_dir`.
-    pub in_memory: bool,
-}
-
-/// Analyzes the dump at `hprof`, writing the index columns and `summary.json` into `index_dir`
-/// (which must exist and may hold the dump itself). `progress` gets every [`HeapPhase`] in order;
-/// an `Err` from it, a cancel or any other error removes every index file from `index_dir` and
-/// leaves the rest of the directory alone.
-pub fn analyze(
-    hprof: &Path,
-    index_dir: &Path,
-    opts: AnalyzeOptions,
-    progress: &dyn Fn(HeapPhase, u64, u64) -> Result<(), HeapError>,
-    cancel: &CancellationToken,
-) -> Result<HeapIndex, HeapError> {
-    let store = if opts.in_memory { Store::Ram } else { Store::Dir(index_dir.to_path_buf()) };
-    let result = run(hprof, &store, opts, progress, cancel);
-    // `run` has dropped every column by now: Windows cannot delete a mapped file.
-    if result.is_err() && !matches!(store, Store::Ram) {
-        remove_index_files(index_dir);
-    }
-    result
-}
-
-fn run(
-    hprof: &Path,
-    store: &Store,
-    opts: AnalyzeOptions,
-    report: &dyn Fn(HeapPhase, u64, u64) -> Result<(), HeapError>,
-    cancel: &CancellationToken,
-) -> Result<HeapIndex, HeapError> {
-    let started = Instant::now();
-    let progress = Progress::new(report, cancel);
-    let file = File::open(hprof)?;
-    // SAFETY: nothing writes the dump while it is analyzed or viewed: a capture finishes writing
-    // it before analysis and deletes it only with the snapshot that holds this index.
-    let dump = unsafe { Mmap::map(&file)? };
-    let graph = build_graph(&dump, store, report, cancel)?;
-    let Dominators { idom, preorder, .. } =
-        dominators(&graph.out_start, &graph.out, graph.root, store, report, cancel)?;
-
-    let nodes = u64::from(graph.root) + 1;
-    // Seven walks over the nodes, roughly: sizes, retained, child counts, child sorting, class
-    // counts and the tree walk, which visits every node twice.
-    let mut meter = Meter::start(&progress, HeapPhase::Retained, 7 * nodes)?;
-    let layout = VmLayout::from_vm_flags(opts.vm_flags.as_deref().unwrap_or(""), opts.java_major);
-    let model = ShallowModel::new(&graph, layout, opts.histogram.as_deref(), cancel)?;
-    let (shallow8, retained) = retained::sizes(&graph, &model, &idom, &preorder, store, &mut meter)?;
-    drop(preorder);
-    let (kids_start, kids) = retained::children(&idom, &retained, graph.root, store, &mut meter)?;
-    let tree = retained::Tree { idom, shallow8, retained, kids_start, kids };
-    let (classes, totals) = classes::table(&graph, &tree, store, &mut meter)?;
-    meter.finish()?;
-
-    let mut meter = Meter::start(&progress, HeapPhase::Paths, nodes + graph.out.len() as u64)?;
-    let gc_parent = paths::gc_parents(&graph, store, &mut meter)?;
-    meter.finish()?;
-
-    progress.report(HeapPhase::Saving, 0, 1)?;
-    let HeapGraph {
-        ids,
-        types,
-        offsets,
-        roots,
-        classes: class_info,
-        class_slot,
-        thread_objects,
-        weak_edges_skipped,
-        id_size,
-        ..
-    } = graph;
-    let summary = HeapSummary {
-        objects: totals.reachable_objects + totals.unreachable_objects,
-        reachable_objects: totals.reachable_objects,
-        reachable_bytes: totals.reachable_bytes,
-        unreachable_objects: totals.unreachable_objects,
-        unreachable_bytes: totals.unreachable_bytes,
-        classes: class_info.iter().filter(|c| c.id != 0).count() as u32,
-        weak_edges_skipped,
-        size_source: model.source,
-        analysis_ms: u32::try_from(started.elapsed().as_millis()).unwrap_or(u32::MAX),
-    };
-    if let Store::Dir(dir) = store {
-        write_summary(dir, &summary)?;
-    }
-    let mut root_kinds = HashMap::with_capacity(roots.len());
-    for (object, kind, serial) in roots {
-        root_kinds.entry(object).or_insert((kind, serial));
-    }
-    progress.report(HeapPhase::Saving, 1, 1)?;
-
-    let retained::Tree { idom, shallow8, retained, kids_start, kids } = tree;
-    Ok(HeapIndex {
-        hprof: dump,
-        ids,
-        types,
-        offsets,
-        shallow8,
-        retained,
-        idom,
-        kids_start,
-        kids,
-        gc_parent,
-        classes,
-        class_info,
-        class_slot,
-        roots: root_kinds,
-        thread_objects,
-        id_size,
-        summary,
-    })
-}
-
-/// Removes what an analysis may have written; a file that is not there is fine.
-fn remove_index_files(dir: &Path) {
-    for name in INDEX_FILES {
-        let path = dir.join(name);
-        if let Err(err) = std::fs::remove_file(&path)
-            && err.kind() != std::io::ErrorKind::NotFound
-        {
-            tracing::warn!("could not remove {}: {err}", path.display());
-        }
-    }
-}
-
-/// Steps of one phase: reports progress every [`CHECK_EVERY`] steps, and each loop looks at the
-/// token before its first step.
-pub(super) struct Meter<'a> {
-    progress: &'a Progress<'a>,
-    phase: HeapPhase,
-    /// An estimate; `done` is clamped to it.
-    total: u64,
-    done: u64,
-    next_report: u64,
-}
-
-impl<'a> Meter<'a> {
-    fn start(progress: &'a Progress<'a>, phase: HeapPhase, total: u64) -> Result<Self, HeapError> {
-        progress.report(phase, 0, total)?;
-        Ok(Self { progress, phase, total, done: 0, next_report: CHECK_EVERY })
-    }
-
-    pub(super) fn begin_loop(&self) -> Result<(), HeapError> {
-        self.progress.check()
-    }
-
-    pub(super) fn token(&self) -> &'a CancellationToken {
-        self.progress.token()
-    }
-
-    #[inline]
-    pub(super) fn tick(&mut self) -> Result<(), HeapError> {
-        self.advance(1)
-    }
-
-    pub(super) fn advance(&mut self, steps: u64) -> Result<(), HeapError> {
-        self.done += steps;
-        if self.done < self.next_report {
-            return Ok(());
-        }
-        self.next_report = self.done + CHECK_EVERY;
-        self.progress.report(self.phase, self.done.min(self.total), self.total)
-    }
-
-    fn finish(self) -> Result<(), HeapError> {
-        self.progress.report(self.phase, self.total, self.total)
-    }
-}
-
-#[cfg(test)]
-mod tests;
@@ -1,117 +0,0 @@
-//! The class table: counts and shallow sizes per type slot, retained sizes per type from a walk of
-//! the dominator tree, and the reachable / unreachable totals of the summary.
-
-use super::Meter;
-use super::retained::Tree;
-use crate::column::{NONE, Store};
-use crate::error::HeapError;
-use crate::graph::{HeapGraph, PRIM_SLOTS};
-use crate::hprof::BasicType;
-use crate::index::ClassStat;
-use crate::names::display_name;
-
-/// Instances and arrays only: class objects are left out.
-#[derive(Default)]
-pub(super) struct Totals {
-    pub(super) reachable_objects: u64,
-    pub(super) reachable_bytes: u64,
-    pub(super) unreachable_objects: u64,
-    pub(super) unreachable_bytes: u64,
-}
-
-pub(super) fn table(
-    graph: &HeapGraph,
-    tree: &Tree,
-    store: &Store,
-    meter: &mut Meter,
-) -> Result<(Vec<ClassStat>, Totals), HeapError> {
-    let slots = graph.classes.len() + PRIM_SLOTS as usize;
-    let mut classes: Vec<ClassStat> = (0..slots as u32)
-        .map(|slot| ClassStat { name: slot_name(graph, slot), count: 0, shallow: 0, retained: 0, unreachable_count: 0 })
-        .collect();
-    let mut totals = Totals::default();
-    meter.begin_loop()?;
-    for v in 0..graph.root as usize {
-        meter.tick()?;
-        let slot = graph.types[v];
-        let bytes = u64::from(tree.shallow8[v]) * 8;
-        let stat = &mut classes[slot as usize];
-        let instance = slot != graph.class_slot;
-        if tree.idom[v] == NONE {
-            stat.unreachable_count += 1;
-            if instance {
-                totals.unreachable_objects += 1;
-                totals.unreachable_bytes += bytes;
-            }
-        } else {
-            stat.count += 1;
-            stat.shallow += bytes;
-            if instance {
-                totals.reachable_objects += 1;
-                totals.reachable_bytes += bytes;
-            }
-        }
-    }
-    retained_by_type(graph, tree, &mut classes, store, meter)?;
-    Ok((classes, totals))
-}
-
-/// Adds to each type the retained size of its instances that have no instance of the same type
-/// above them in the dominator tree. The walk keeps no stack: it goes up through `idom` and
-/// resumes a node's children from `cursor`, while `active[t]` counts the instances of type `t` on
-/// the path from the root.
-fn retained_by_type(
-    graph: &HeapGraph,
-    tree: &Tree,
-    classes: &mut [ClassStat],
-    store: &Store,
-    meter: &mut Meter,
-) -> Result<(), HeapError> {
-    let root = graph.root;
-    let mut cursor = store.scratch::<u32>(root as usize + 1, 0)?;
-    let mut active = vec![0u32; classes.len()];
-    cursor[root as usize] = tree.kids_start[root as usize];
-    let mut v = root;
-    meter.begin_loop()?;
-    loop {
-        meter.tick()?;
-        let next = cursor[v as usize];
-        if next < tree.kids_start[v as usize + 1] {
-            cursor[v as usize] = next + 1;
-            let child = tree.kids[next as usize];
-            let slot = graph.types[child as usize] as usize;
-            if active[slot] == 0 {
-                classes[slot].retained += tree.retained[child as usize];
-            }
-            active[slot] += 1;
-            cursor[child as usize] = tree.kids_start[child as usize];
-            v = child;
-        } else if v == root {
-            return Ok(());
-        } else {
-            active[graph.types[v as usize] as usize] -= 1;
-            v = tree.idom[v as usize];
-        }
-    }
-}
-
-fn slot_name(graph: &HeapGraph, slot: u32) -> String {
-    match graph.classes.get(slot as usize) {
-        Some(class) => display_name(&class.name),
-        None => graph.prim_type(slot).map_or_else(String::new, |ty| prim_array_name(ty).to_owned()),
-    }
-}
-
-fn prim_array_name(ty: BasicType) -> &'static str {
-    match ty {
-        BasicType::Object => "java.lang.Object[]",
-        BasicType::Boolean => "boolean[]",
-        BasicType::Char => "char[]",
-        BasicType::Float => "float[]",
-        BasicType::Double => "double[]",
-        BasicType::Byte => "byte[]",
-        BasicType::Short => "short[]",
-        BasicType::Int => "int[]",
-        BasicType::Long => "long[]",
-    }
-}
@@ -1,32 +0,0 @@
-//! Parents on shortest paths from the GC roots, by breadth-first search over strong edges.
-
-use super::Meter;
-use crate::column::{Column, NONE, Store};
-use crate::error::HeapError;
-use crate::files::GC_PARENT_FILE;
-use crate::graph::HeapGraph;
-
-pub(super) fn gc_parents(graph: &HeapGraph, store: &Store, meter: &mut Meter) -> Result<Column<u32>, HeapError> {
-    let root = graph.root;
-    let nodes = root as usize + 1;
-    let mut parent = store.column::<u32>(GC_PARENT_FILE, nodes, NONE)?;
-    let mut queue = store.scratch::<u32>(nodes, 0)?;
-    parent[root as usize] = root;
-    queue[0] = root;
-    let (mut head, mut tail) = (0, 1);
-    meter.begin_loop()?;
-    while head < tail {
-        meter.tick()?;
-        let v = queue[head];
-        head += 1;
-        for &w in graph.out_edges(v) {
-            meter.tick()?;
-            if parent[w as usize] == NONE {
-                parent[w as usize] = v;
-                queue[tail] = w;
-                tail += 1;
-            }
-        }
-    }
-    Ok(parent)
-}
@@ -1,209 +0,0 @@
-//! Shallow and retained sizes, and the dominator tree as child lists sorted by retained size.
-
-use std::cmp::Reverse;
-
-use super::Meter;
-use crate::column::{Column, NONE, Store};
-use crate::error::HeapError;
-use crate::files::{KIDS_FILE, KIDS_START_FILE, RETAINED_FILE, SHALLOW8_FILE};
-use crate::graph::{HeapGraph, accumulate};
-use crate::progress::CHECK_EVERY;
-use crate::shallow::ShallowModel;
-
-/// The dominator tree with sizes; see [`crate::HeapIndex`] for each column.
-pub(super) struct Tree {
-    pub(super) idom: Column<u32>,
-    pub(super) shallow8: Column<u32>,
-    pub(super) retained: Column<u64>,
-    pub(super) kids_start: Column<u32>,
-    pub(super) kids: Column<u32>,
-}
-
-/// `(shallow8, retained)` of every node, the root included. `preorder` is the DFS preorder of the
-/// reachable nodes, from the root.
-pub(super) fn sizes(
-    graph: &HeapGraph,
-    model: &ShallowModel,
-    idom: &[u32],
-    preorder: &[u32],
-    store: &Store,
-    meter: &mut Meter,
-) -> Result<(Column<u32>, Column<u64>), HeapError> {
-    let nodes = idom.len();
-    let mut shallow8 = store.column::<u32>(SHALLOW8_FILE, nodes, 0)?;
-    let mut retained = store.column::<u64>(RETAINED_FILE, nodes, 0)?;
-    meter.begin_loop()?;
-    for v in 0..graph.root {
-        meter.tick()?;
-        let units = u32::try_from(model.size_of(graph, v).div_ceil(8)).unwrap_or(u32::MAX);
-        shallow8[v as usize] = units;
-        if idom[v as usize] != NONE {
-            retained[v as usize] = u64::from(units) * 8;
-        }
-    }
-    // A dominator is a DFS ancestor, so in reverse preorder every node is complete before it is
-    // added to its dominator.
-    meter.begin_loop()?;
-    for &v in preorder.iter().skip(1).rev() {
-        meter.tick()?;
-        let own = retained[v as usize];
-        retained[idom[v as usize] as usize] += own;
-    }
-    Ok((shallow8, retained))
-}
-
-/// `(kids_start, kids)`: the children of every reachable node in the dominator tree, as CSR.
-pub(super) fn children(
-    idom: &[u32],
-    retained: &[u64],
-    root: u32,
-    store: &Store,
-    meter: &mut Meter,
-) -> Result<(Column<u32>, Column<u32>), HeapError> {
-    let nodes = idom.len();
-    // Counted into `starts[d + 1]`; filled through `starts[d]` as a cursor, which leaves it at d's
-    // end until the column is shifted one slot.
-    let mut starts = store.column::<u32>(KIDS_START_FILE, nodes + 1, 0)?;
-    let mut longest = 0;
-    meter.begin_loop()?;
-    for (v, &d) in idom.iter().enumerate() {
-        meter.tick()?;
-        if d != NONE && v != root as usize {
-            let count = &mut starts[d as usize + 1];
-            *count += 1;
-            longest = longest.max(*count);
-        }
-    }
-    let total = accumulate(&mut starts, meter.token())?;
-    let mut kids = store.column::<u32>(KIDS_FILE, total as usize, 0)?;
-    meter.begin_loop()?;
-    for (v, &d) in idom.iter().enumerate() {
-        meter.tick()?;
-        if d != NONE && v != root as usize {
-            let cursor = &mut starts[d as usize];
-            kids[*cursor as usize] = v as u32;
-            *cursor += 1;
-        }
-    }
-    starts.copy_within(0..nodes, 1);
-    starts[0] = 0;
-    sort_children(&mut kids, &starts, retained, longest as usize, CHECK_EVERY as usize, store, meter)?;
-    Ok((starts, kids))
-}
-
-/// Sorts each child list by retained size descending, then by node. A list longer than `run` is
-/// sorted in runs of `run` that are then merged, so no single step takes longer than one run.
-fn sort_children(
-    kids: &mut [u32],
-    starts: &[u32],
-    retained: &[u64],
-    longest: usize,
-    run: usize,
-    store: &Store,
-    meter: &mut Meter,
-) -> Result<(), HeapError> {
-    let key = |&k: &u32| (Reverse(retained[k as usize]), k);
-    let mut buffer = if longest > run { store.scratch::<u32>(longest, 0)? } else { Column::ram(0, 0) };
-    meter.begin_loop()?;
-    for v in 0..starts.len() - 1 {
-        meter.tick()?;
-        let list = &mut kids[starts[v] as usize..starts[v + 1] as usize];
-        if list.len() <= run {
-            list.sort_unstable_by_key(key);
-            meter.advance(list.len() as u64)?;
-            continue;
-        }
-        for chunk in list.chunks_mut(run) {
-            meter.begin_loop()?;
-            chunk.sort_unstable_by_key(key);
-            meter.advance(chunk.len() as u64)?;
-        }
-        let len = list.len();
-        let (mut from, mut to) = (list, &mut buffer[..len]);
-        let mut in_buffer = false;
-        let mut width = run;
-        while width < len {
-            meter.begin_loop()?;
-            for start in (0..len).step_by(2 * width) {
-                let mid = (start + width).min(len);
-                let end = (start + 2 * width).min(len);
-                merge(&from[start..mid], &from[mid..end], &mut to[start..end], &key, meter)?;
-            }
-            std::mem::swap(&mut from, &mut to);
-            in_buffer = !in_buffer;
-            width *= 2;
-        }
-        if in_buffer {
-            to.copy_from_slice(from);
-        }
-    }
-    Ok(())
-}
-
-fn merge<K: Ord>(
-    left: &[u32],
-    right: &[u32],
-    out: &mut [u32],
-    key: &impl Fn(&u32) -> K,
-    meter: &mut Meter,
-) -> Result<(), HeapError> {
-    let (mut i, mut j) = (0, 0);
-    for slot in out.iter_mut() {
-        meter.tick()?;
-        let take_left = j == right.len() || (i < left.len() && key(&left[i]) <= key(&right[j]));
-        if take_left {
-            *slot = left[i];
-            i += 1;
-        } else {
-            *slot = right[j];
-            j += 1;
-        }
-    }
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use ide_core::CancellationToken;
-
-    use super::*;
-    use crate::error::HeapError;
-    use crate::progress::{HeapPhase, Progress};
-    use crate::testing::XorShift;
-
-    fn sorted_with_run(lists: &[Vec<u32>], retained: &[u64], run: usize) -> Vec<u32> {
-        let report = |_, _, _| Ok::<(), HeapError>(());
-        let cancel = CancellationToken::new();
-        let progress = Progress::new(&report, &cancel);
-        let mut meter = Meter::start(&progress, HeapPhase::Retained, 1).unwrap();
-        let mut starts = vec![0u32];
-        for list in lists {
-            starts.push(starts.last().unwrap() + list.len() as u32);
-        }
-        let mut kids: Vec<u32> = lists.concat();
-        let longest = lists.iter().map(Vec::len).max().unwrap_or(0);
-        sort_children(&mut kids, &starts, retained, longest, run, &Store::Ram, &mut meter).unwrap();
-        kids
-    }
-
-    #[test]
-    fn long_child_lists_are_merged_from_sorted_runs() {
-        let mut rng = XorShift::new(7);
-        let retained: Vec<u64> = (0..500).map(|_| u64::from(rng.below(40))).collect();
-        let mut nodes: Vec<u32> = (0..500).collect();
-        for i in (1..nodes.len()).rev() {
-            nodes.swap(i, rng.below(i as u32 + 1) as usize);
-        }
-        // Lists below, at and above the run length, and one that ends on a partial run.
-        let lists = vec![nodes[..3].to_vec(), nodes[3..7].to_vec(), nodes[7..400].to_vec(), nodes[400..].to_vec()];
-        for run in [1, 4, 7, 64, 1000] {
-            let mut expected = Vec::new();
-            for list in &lists {
-                let mut list = list.clone();
-                list.sort_by_key(|&k| (Reverse(retained[k as usize]), k));
-                expected.extend(list);
-            }
-            assert_eq!(sorted_with_run(&lists, &retained, run), expected, "run {run}");
-        }
-    }
-}
@@ -1,265 +0,0 @@
-use std::cell::Cell;
-use std::collections::BTreeSet;
-use std::path::PathBuf;
-
-use super::*;
-use crate::column::{Column, NONE};
-use crate::files::INDEX_FILES;
-use crate::hprof::{BasicType, HeapRootKind};
-use crate::index::{ClassStat, HeapSummary};
-use crate::shallow::SizeSource;
-use crate::testing::{MiniHeap, sample};
-
-const DUMP: &str = "dump.hprof";
-const ROOT: Option<&str> = Some("java.lang.Object");
-const NODE_FIELDS: [(&str, BasicType); 2] = [("next", BasicType::Object), ("v", BasicType::Long)];
-
-fn no_progress(_: HeapPhase, _: u64, _: u64) -> Result<(), HeapError> {
-    Ok(())
-}
-
-fn in_memory() -> AnalyzeOptions {
-    AnalyzeOptions { in_memory: true, ..AnalyzeOptions::default() }
-}
-
-/// A temp dir holding `heap` as `dump.hprof`, the way a capture lays out its snapshot dir.
-fn dump_dir(heap: &MiniHeap) -> (tempfile::TempDir, PathBuf) {
-    let dir = tempfile::tempdir().unwrap();
-    let dump = dir.path().join(DUMP);
-    heap.write_to(&dump);
-    (dir, dump)
-}
-
-fn analyze_with(heap: &MiniHeap, opts: AnalyzeOptions) -> HeapIndex {
-    let (dir, dump) = dump_dir(heap);
-    analyze(&dump, dir.path(), opts, &no_progress, &CancellationToken::new()).unwrap()
-}
-
-fn file_names(dir: &Path) -> BTreeSet<String> {
-    std::fs::read_dir(dir).unwrap().map(|e| e.unwrap().file_name().into_string().unwrap()).collect()
-}
-
-fn node(index: &HeapIndex, addr: u64) -> u32 {
-    index.ids.rank(addr).unwrap_or_else(|| panic!("{addr:#x} is not in the dump"))
-}
-
-fn shallow(index: &HeapIndex, addr: u64) -> u64 {
-    u64::from(index.shallow8[node(index, addr) as usize]) * 8
-}
-
-fn retained(index: &HeapIndex, addr: u64) -> u64 {
-    index.retained[node(index, addr) as usize]
-}
-
-fn idom(index: &HeapIndex, addr: u64) -> u32 {
-    index.idom[node(index, addr) as usize]
-}
-
-fn class<'a>(index: &'a HeapIndex, name: &str) -> &'a ClassStat {
-    let mut rows = index.classes.iter().filter(|c| c.name == name);
-    let row = rows.next().unwrap_or_else(|| panic!("no class {name}"));
-    assert!(rows.next().is_none(), "two classes named {name}");
-    row
-}
-
-fn stat(c: &ClassStat) -> (u64, u64, u64, u64) {
-    (c.count, c.shallow, c.retained, c.unreachable_count)
-}
-
-fn kids_of(index: &HeapIndex, v: u32) -> &[u32] {
-    &index.kids[index.kids_start[v as usize] as usize..index.kids_start[v as usize + 1] as usize]
-}
-
-const H: u64 = 0x1000;
-const N1: u64 = 0x1100;
-const N2: u64 = 0x1200;
-const N3: u64 = 0x1300;
-const L: u64 = 0x1400;
-const R: u64 = 0x1500;
-const W: u64 = 0x1600;
-const N4: u64 = 0x1700;
-
-#[test]
-fn sample_retained_sizes() {
-    let index = analyze_with(&sample(), in_memory());
-    let shallows: Vec<u64> = [H, N1, L, W, R].iter().map(|&a| shallow(&index, a)).collect();
-    assert_eq!(shallows, [24, 24, 32, 24, 32]);
-    let retained_sizes: Vec<u64> = [L, N3, N1, N2, H, W].iter().map(|&a| retained(&index, a)).collect();
-    assert_eq!(retained_sizes, [32, 56, 24, 24, 72, 24]);
-    let root = index.root();
-    assert_eq!(
-        [idom(&index, N1), idom(&index, N2), idom(&index, N3), idom(&index, L)],
-        [node(&index, H), node(&index, H), root, node(&index, N3)]
-    );
-    assert_eq!((idom(&index, R), idom(&index, N4)), (NONE, NONE));
-    assert_eq!((retained(&index, R), retained(&index, N4)), (0, 0));
-
-    // Children by retained size descending, ties by node.
-    assert_eq!(kids_of(&index, node(&index, H)), [node(&index, N1), node(&index, N2)]);
-    let top = kids_of(&index, root);
-    assert_eq!(top[..2], [node(&index, H), node(&index, N3)]);
-    assert!(top.windows(2).all(|p| (index.retained[p[0] as usize], p[1]) > (index.retained[p[1] as usize], p[0])));
-    assert_eq!(index.retained[root as usize], top.iter().map(|&k| index.retained[k as usize]).sum::<u64>());
-}
-
-#[test]
-fn sample_class_table() {
-    let index = analyze_with(&sample(), in_memory());
-    assert_eq!(stat(class(&index, "Node")), (3, 72, 104, 1));
-    assert_eq!(stat(class(&index, "Holder")), (1, 24, 72, 0));
-    assert_eq!(stat(class(&index, "long[]")), (1, 32, 32, 0));
-    assert_eq!(stat(class(&index, "java.lang.ref.WeakReference")), (1, 24, 24, 0));
-    let objects = class(&index, "java.lang.Object[]");
-    assert_eq!((objects.count, objects.unreachable_count), (0, 1));
-    // Indexed by type slot, primitive array slots included.
-    assert_eq!(index.classes.len(), index.class_info.len() + crate::graph::PRIM_SLOTS as usize);
-    let slot = index.types[node(&index, H) as usize] as usize;
-    assert_eq!(index.classes[slot].name, "Holder");
-    assert_eq!(index.class_info[slot].name, "Holder");
-}
-
-#[test]
-fn sample_summary() {
-    let index = analyze_with(&sample(), in_memory());
-    let s = &index.summary;
-    assert_eq!(
-        (s.reachable_objects, s.reachable_bytes, s.unreachable_objects, s.unreachable_bytes, s.weak_edges_skipped),
-        (6, 152, 2, 56, 1)
-    );
-    assert_eq!(s.objects, 8);
-    assert_eq!(s.classes, 7);
-    assert_eq!(s.size_source, SizeSource::Layout);
-}
-
-#[test]
-fn sample_gc_parents() {
-    let index = analyze_with(&sample(), in_memory());
-    let parent = |addr| index.gc_parent[node(&index, addr) as usize];
-    let root = index.root();
-    assert_eq!(index.gc_parent[root as usize], root);
-    assert_eq!([parent(H), parent(N3), parent(W)], [root; 3]);
-    assert_eq!([parent(N1), parent(L)], [node(&index, H), node(&index, N3)]);
-    assert_eq!((parent(R), parent(N4)), (NONE, NONE));
-    assert_eq!(index.roots[&node(&index, N3)], (HeapRootKind::JavaFrame, Some(1)));
-}
-
-#[test]
-fn cycle_is_retained_once() {
-    let mut heap = MiniHeap::new();
-    heap.class("Node", ROOT, &NODE_FIELDS)
-        .object(0xA000, "Node", &[("next", 0xB000)])
-        .object(0xB000, "Node", &[("next", 0xA000)])
-        .root(HeapRootKind::JniGlobal, 0xA000);
-    let index = analyze_with(&heap, in_memory());
-    assert_eq!((retained(&index, 0xA000), retained(&index, 0xB000)), (48, 24));
-    assert_eq!(class(&index, "Node").retained, 48);
-}
-
-#[test]
-fn deep_chain_retained_by_class() {
-    // A small stack proves no pass recurses along the chain.
-    std::thread::Builder::new()
-        .stack_size(256 << 10)
-        .spawn(|| {
-            const NODES: u64 = 1_000_000;
-            let addr = |i: u64| 0x10_0000 + i * 0x100;
-            let mut heap = MiniHeap::new();
-            heap.class("Node", ROOT, &NODE_FIELDS);
-            for i in 0..NODES {
-                let next = if i + 1 < NODES { addr(i + 1) } else { 0 };
-                heap.object(addr(i), "Node", &[("next", next)]);
-            }
-            heap.root(HeapRootKind::JniGlobal, addr(0));
-            let index = analyze_with(&heap, in_memory());
-            assert_eq!(retained(&index, addr(0)), 24_000_000);
-            assert_eq!(retained(&index, addr(NODES - 1)), 24);
-            assert_eq!(class(&index, "Node").retained, 24_000_000);
-            assert_eq!(index.summary.reachable_objects, NODES);
-        })
-        .unwrap()
-        .join()
-        .unwrap();
-}
-
-#[test]
-fn histogram_sizes_flow_into_retained() {
-    let histogram = vec![HistogramEntry { name: "Node".to_owned(), instances: 3, bytes: 96 }];
-    let index = analyze_with(&sample(), AnalyzeOptions { histogram: Some(histogram), ..in_memory() });
-    assert_eq!(shallow(&index, N3), 32);
-    assert_eq!(retained(&index, N3), 64);
-    assert_eq!(index.summary.size_source, SizeSource::Jvm);
-}
-
-#[test]
-fn vm_flags_of_an_unknown_jdk_set_the_layout() {
-    // Without compressed oops a Node is 12 + 8 + 8 = 28 → 32.
-    let opts = AnalyzeOptions { vm_flags: Some("-XX:MaxHeapSize=42949672960".to_owned()), ..in_memory() };
-    let index = analyze_with(&sample(), opts);
-    assert_eq!(shallow(&index, N4), 32);
-}
-
-#[test]
-fn cancel_stops_analysis() {
-    let (dir, dump) = dump_dir(&sample());
-    let cancel = CancellationToken::new();
-    let phases = Cell::new(Vec::new());
-    let progress = |phase, _, _| {
-        let mut seen = phases.take();
-        seen.push(phase);
-        phases.set(seen);
-        if phase == HeapPhase::Dominators {
-            cancel.cancel();
-        }
-        Ok(())
-    };
-    let result = analyze(&dump, dir.path(), AnalyzeOptions::default(), &progress, &cancel);
-    assert!(matches!(result, Err(HeapError::Cancelled)), "{:?}", result.err());
-    assert_eq!(phases.take().last(), Some(&HeapPhase::Dominators), "stops at the first check");
-    // The dump the capture analyzes in place stays; every file the analysis wrote is gone.
-    assert_eq!(file_names(dir.path()), BTreeSet::from([DUMP.to_owned()]));
-}
-
-#[test]
-fn progress_error_stops_analysis_and_removes_its_files() {
-    let (dir, dump) = dump_dir(&sample());
-    // The last report, once every index file is written.
-    let progress = |phase, done, _| match (phase, done) {
-        (HeapPhase::Saving, 1) => Err(HeapError::NotEnoughDiskSpace { needed: 2, available: 1 }),
-        _ => Ok(()),
-    };
-    let result = analyze(&dump, dir.path(), AnalyzeOptions::default(), &progress, &CancellationToken::new());
-    assert!(matches!(result, Err(HeapError::NotEnoughDiskSpace { .. })), "{:?}", result.err());
-    assert_eq!(file_names(dir.path()), BTreeSet::from([DUMP.to_owned()]));
-}
-
-#[test]
-fn writes_index_files() {
-    let (dir, dump) = dump_dir(&sample());
-    let index = analyze(&dump, dir.path(), AnalyzeOptions::default(), &no_progress, &CancellationToken::new()).unwrap();
-    let names = file_names(dir.path());
-    for name in [
-        "types.u32",
-        "shallow8.u32",
-        "retained.u64",
-        "idom.u32",
-        "kids_start.u32",
-        "kids.u32",
-        "gc_parent.u32",
-        "offsets.u64",
-        "summary.json",
-    ] {
-        assert!(names.contains(name), "{name} missing from {names:?}");
-    }
-    assert!(names.iter().any(|n| n.starts_with("ids.")), "{names:?}");
-    // Nothing but the index files and the dump: scratch arrays are gone.
-    let unexpected: Vec<_> = names.iter().filter(|n| *n != DUMP && !INDEX_FILES.contains(&n.as_str())).collect();
-    assert!(unexpected.is_empty(), "{unexpected:?}");
-
-    let summary: HeapSummary =
-        serde_json::from_slice(&std::fs::read(dir.path().join("summary.json")).unwrap()).unwrap();
-    assert_eq!(summary, index.summary);
-    drop(index);
-    let retained = Column::<u64>::open(&dir.path().join("retained.u64")).unwrap();
-    let in_ram = analyze_with(&sample(), in_memory());
-    assert_eq!(&*retained, &*in_ram.retained);
-}
@@ -1,306 +0,0 @@
-//! Fixed-width arrays that live in RAM or in memory-mapped files, so the analysis arrays of a
-//! large heap do not count against the process's anonymous memory.
-
-use std::fs::{File, OpenOptions};
-use std::io;
-use std::marker::PhantomData;
-use std::mem::size_of;
-use std::ops::{Deref, DerefMut};
-use std::path::{Path, PathBuf};
-
-use memmap2::{Mmap, MmapMut};
-
-/// Index value meaning "no object" in every `u32` column.
-pub const NONE: u32 = u32::MAX;
-
-/// # Safety
-/// Every bit pattern of `Self` is a valid value and `Self` has no padding, so a mapped file's
-/// bytes can be viewed as `[Self]` and a file can be written from one.
-pub unsafe trait Pod: Copy + 'static {}
-
-unsafe impl Pod for u8 {}
-unsafe impl Pod for u32 {}
-unsafe impl Pod for u64 {}
-
-enum Backing<T> {
-    Ram(Vec<T>),
-    Map(MmapMut),
-    ReadOnly(Mmap),
-}
-
-/// A fixed-length array of `T`. File contents use the machine's byte order: the arrays are a
-/// cache for this machine and are never moved to another one.
-pub struct Column<T: Pod> {
-    backing: Backing<T>,
-    /// Scratch file to delete on drop where it could not be unlinked while mapped.
-    delete_on_drop: Option<PathBuf>,
-    _marker: PhantomData<T>,
-}
-
-fn byte_len<T: Pod>(len: usize) -> io::Result<usize> {
-    len.checked_mul(size_of::<T>())
-        .filter(|&bytes| bytes <= isize::MAX as usize)
-        .ok_or_else(|| io::Error::new(io::ErrorKind::InvalidInput, "column is too long"))
-}
-
-fn is_zero<T: Pod>(value: &T) -> bool {
-    // SAFETY: `Pod` types have no padding, so all `size_of::<T>()` bytes are initialized.
-    let bytes = unsafe { std::slice::from_raw_parts((value as *const T).cast::<u8>(), size_of::<T>()) };
-    bytes.iter().all(|&b| b == 0)
-}
-
-impl<T: Pod> Column<T> {
-    fn new(backing: Backing<T>, delete_on_drop: Option<PathBuf>) -> Self {
-        Self { backing, delete_on_drop, _marker: PhantomData }
-    }
-
-    pub fn ram(len: usize, fill: T) -> Self {
-        Self::new(Backing::Ram(vec![fill; len]), None)
-    }
-
-    /// Creates (or truncates) `path` and maps it; the file stays after the column is dropped.
-    pub fn file(path: &Path, len: usize, fill: T) -> io::Result<Self> {
-        let bytes = byte_len::<T>(len)?;
-        let file = OpenOptions::new().read(true).write(true).create(true).truncate(true).open(path)?;
-        match Self::map_new(&file, len, bytes, fill) {
-            Ok(column) => Ok(column),
-            Err(err) => {
-                drop(file);
-                let _ = std::fs::remove_file(path);
-                Err(err)
-            }
-        }
-    }
-
-    /// A temporary column in `dir` that never outlives the process. On unix the file is unlinked
-    /// right after mapping, so even a crash leaves nothing behind; elsewhere (Windows cannot delete
-    /// a mapped file) it is deleted on drop.
-    pub fn scratch(dir: &Path, len: usize, fill: T) -> io::Result<Self> {
-        let bytes = byte_len::<T>(len)?;
-        if bytes == 0 {
-            return Ok(Self::ram(0, fill));
-        }
-        let path = dir.join(format!("scratch-{}.tmp", uuid::Uuid::new_v4().simple()));
-        let file = OpenOptions::new().read(true).write(true).create_new(true).open(&path)?;
-        let mut column = match Self::map_new(&file, len, bytes, fill) {
-            Ok(column) => column,
-            Err(err) => {
-                drop(file);
-                let _ = std::fs::remove_file(&path);
-                return Err(err);
-            }
-        };
-        // If the unlink fails the drop-time delete is the fallback, so the file is never left behind.
-        if !cfg!(unix) || std::fs::remove_file(&path).is_err() {
-            column.delete_on_drop = Some(path);
-        }
-        Ok(column)
-    }
-
-    /// Maps an existing file read-only; writing through the column panics.
-    pub fn open(path: &Path) -> io::Result<Self> {
-        let file = File::open(path)?;
-        let bytes = file.metadata()?.len();
-        if bytes % size_of::<T>() as u64 != 0 {
-            return Err(io::Error::new(
-                io::ErrorKind::InvalidData,
-                format!("{} is {bytes} bytes, not a multiple of {}", path.display(), size_of::<T>()),
-            ));
-        }
-        if bytes == 0 {
-            return Ok(Self::ram(0, zero_value()));
-        }
-        // SAFETY: the file is private to the snapshot directory; nothing truncates it while mapped.
-        let map = unsafe { Mmap::map(&file)? };
-        Ok(Self::new(Backing::ReadOnly(map), None))
-    }
-
-    fn map_new(file: &File, len: usize, bytes: usize, fill: T) -> io::Result<Self> {
-        if bytes == 0 {
-            return Ok(Self::ram(0, fill));
-        }
-        file.set_len(bytes as u64)?;
-        // SAFETY: as in `open`; the file was just created by this process.
-        let map = unsafe { MmapMut::map_mut(file)? };
-        let mut column = Self::new(Backing::Map(map), None);
-        // A fresh file reads as zeros, and writing a zero fill would fault in every page.
-        if !is_zero(&fill) {
-            debug_assert_eq!(column.len(), len);
-            column.fill(fill);
-        }
-        Ok(column)
-    }
-}
-
-fn zero_value<T: Pod>() -> T {
-    // SAFETY: every bit pattern of a `Pod` type is a valid value.
-    unsafe { std::mem::zeroed() }
-}
-
-impl<T: Pod> Deref for Column<T> {
-    type Target = [T];
-
-    fn deref(&self) -> &[T] {
-        match &self.backing {
-            Backing::Ram(v) => v,
-            // SAFETY: maps are page-aligned, `T` is `Pod` and the length is a multiple of its width.
-            Backing::Map(m) => unsafe { std::slice::from_raw_parts(m.as_ptr().cast(), m.len() / size_of::<T>()) },
-            Backing::ReadOnly(m) => unsafe { std::slice::from_raw_parts(m.as_ptr().cast(), m.len() / size_of::<T>()) },
-        }
-    }
-}
-
-impl<T: Pod> DerefMut for Column<T> {
-    fn deref_mut(&mut self) -> &mut [T] {
-        match &mut self.backing {
-            Backing::Ram(v) => v,
-            // SAFETY: as in `deref`; `&mut self` makes the access exclusive.
-            Backing::Map(m) => unsafe {
-                std::slice::from_raw_parts_mut(m.as_mut_ptr().cast(), m.len() / size_of::<T>())
-            },
-            Backing::ReadOnly(_) => panic!("column opened from a file is read-only"),
-        }
-    }
-}
-
-impl<T: Pod> Drop for Column<T> {
-    fn drop(&mut self) {
-        if let Some(path) = self.delete_on_drop.take() {
-            // Unmap before deleting: Windows refuses to delete a mapped file.
-            self.backing = Backing::Ram(Vec::new());
-            let _ = std::fs::remove_file(path);
-        }
-    }
-}
-
-/// Where a computation puts its arrays: result columns are named files in `Dir`, temporary arrays
-/// are scratch columns in the same directory.
-pub enum Store {
-    Ram,
-    Dir(PathBuf),
-}
-
-impl Store {
-    /// `name` is the whole file name (`types.u32`); it is used as given.
-    pub fn column<T: Pod>(&self, name: &str, len: usize, fill: T) -> io::Result<Column<T>> {
-        match self {
-            Store::Ram => Ok(Column::ram(len, fill)),
-            Store::Dir(dir) => Column::file(&dir.join(name), len, fill),
-        }
-    }
-
-    pub fn scratch<T: Pod>(&self, len: usize, fill: T) -> io::Result<Column<T>> {
-        match self {
-            Store::Ram => Ok(Column::ram(len, fill)),
-            Store::Dir(dir) => Column::scratch(dir, len, fill),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn dir_is_empty(dir: &Path) -> bool {
-        std::fs::read_dir(dir).unwrap().next().is_none()
-    }
-
-    #[test]
-    fn file_column_round_trips() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("x.u32");
-        {
-            let mut col = Column::<u32>::file(&path, 4, 7).unwrap();
-            assert_eq!(&*col, &[7, 7, 7, 7]);
-            col.copy_from_slice(&[1, 2, 3, 4]);
-        }
-        let col = Column::<u32>::open(&path).unwrap();
-        assert_eq!(&*col, &[1, 2, 3, 4]);
-    }
-
-    #[test]
-    fn scratch_column_leaves_no_file() {
-        let dir = tempfile::tempdir().unwrap();
-        {
-            let mut col = Column::<u64>::scratch(dir.path(), 1024, 9).unwrap();
-            col[1023] = 5;
-            assert_eq!((col[0], col[1023]), (9, 5));
-            // Windows cannot delete a mapped file, so only unix unlinks while the map is alive.
-            #[cfg(unix)]
-            assert!(dir_is_empty(dir.path()));
-        }
-        assert!(dir_is_empty(dir.path()));
-    }
-
-    #[test]
-    fn zero_fill_and_non_zero_fill() {
-        let dir = tempfile::tempdir().unwrap();
-        let zeros = Column::<u64>::file(&dir.path().join("z.u64"), 3000, 0).unwrap();
-        assert!(zeros.iter().all(|&v| v == 0));
-        let ones = Column::<u8>::file(&dir.path().join("o.u8"), 10_000, 0xAB).unwrap();
-        assert!(ones.iter().all(|&v| v == 0xAB));
-        let ram = Column::<u32>::ram(5, NONE);
-        assert_eq!(&*ram, &[NONE; 5]);
-    }
-
-    #[test]
-    fn empty_columns_work_everywhere() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("e.u32");
-        assert_eq!(Column::<u32>::ram(0, 1).len(), 0);
-        assert_eq!(Column::<u32>::file(&path, 0, 1).unwrap().len(), 0);
-        assert_eq!(Column::<u32>::open(&path).unwrap().len(), 0);
-        assert_eq!(Column::<u32>::scratch(dir.path(), 0, 1).unwrap().len(), 0);
-    }
-
-    #[test]
-    fn open_rejects_a_length_that_is_not_a_multiple_of_the_width() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("odd.u32");
-        std::fs::write(&path, [0u8; 6]).unwrap();
-        let err = Column::<u32>::open(&path).err().unwrap();
-        assert_eq!(err.kind(), io::ErrorKind::InvalidData);
-    }
-
-    #[test]
-    fn file_rejects_a_byte_length_that_overflows() {
-        let dir = tempfile::tempdir().unwrap();
-        let err = Column::<u64>::file(&dir.path().join("big.u64"), usize::MAX, 0).err().unwrap();
-        assert_eq!(err.kind(), io::ErrorKind::InvalidInput);
-        assert!(dir_is_empty(dir.path()));
-    }
-
-    #[test]
-    #[should_panic(expected = "read-only")]
-    fn opened_columns_are_read_only() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("r.u32");
-        drop(Column::<u32>::file(&path, 2, 0).unwrap());
-        let mut col = Column::<u32>::open(&path).unwrap();
-        col[0] = 1;
-    }
-
-    #[test]
-    fn store_names_files_exactly_as_given() {
-        let dir = tempfile::tempdir().unwrap();
-        let store = Store::Dir(dir.path().to_path_buf());
-        let mut col = store.column::<u32>("types.u32", 3, 0).unwrap();
-        col[2] = 8;
-        drop(col);
-        let names: Vec<_> =
-            std::fs::read_dir(dir.path()).unwrap().map(|e| e.unwrap().file_name().into_string().unwrap()).collect();
-        assert_eq!(names, ["types.u32"]);
-        assert_eq!(&*Column::<u32>::open(&dir.path().join("types.u32")).unwrap(), &[0, 0, 8]);
-    }
-
-    #[test]
-    fn store_scratch_is_anonymous_and_ram_store_touches_no_disk() {
-        let dir = tempfile::tempdir().unwrap();
-        let store = Store::Dir(dir.path().to_path_buf());
-        drop(store.scratch::<u32>(16, 1).unwrap());
-        assert!(dir_is_empty(dir.path()));
-        let ram = Store::Ram.column::<u8>("ignored.u8", 4, 2).unwrap();
-        assert_eq!(&*ram, &[2; 4]);
-        assert_eq!(&*Store::Ram.scratch::<u8>(2, 3).unwrap(), &[3, 3]);
-    }
-}
@@ -1,59 +0,0 @@
-//! Class-by-class differences between two snapshots.
-
-use std::collections::HashMap;
-
-use serde::{Deserialize, Serialize};
-
-use crate::index::HeapIndex;
-
-/// One class name in two snapshots; a side without the name has zeros.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub struct HeapClassDiff {
-    pub name: String,
-    pub base_count: u64,
-    pub count: u64,
-    pub base_shallow: u64,
-    pub shallow: u64,
-    pub base_retained: u64,
-    pub retained: u64,
-    /// Several classes have this name on one side or both, so the sides cannot be matched: each
-    /// side shows the sum over its classes, and there is no difference to show.
-    pub ambiguous: bool,
-}
-
-/// Joined by class name, the only key two dumps share. By the change in retained size
-/// descending (none for an ambiguous name), then by name.
-pub fn compare(base: &HeapIndex, current: &HeapIndex) -> Vec<HeapClassDiff> {
-    let mut by_name: HashMap<String, HeapClassDiff> = HashMap::new();
-    for (index, is_base) in [(base, true), (current, false)] {
-        for row in index.class_rows() {
-            let diff = by_name.entry(row.name).or_insert_with_key(|name| HeapClassDiff {
-                name: name.clone(),
-                base_count: 0,
-                count: 0,
-                base_shallow: 0,
-                shallow: 0,
-                base_retained: 0,
-                retained: 0,
-                ambiguous: false,
-            });
-            let (count, shallow, retained) = if is_base {
-                (&mut diff.base_count, &mut diff.base_shallow, &mut diff.base_retained)
-            } else {
-                (&mut diff.count, &mut diff.shallow, &mut diff.retained)
-            };
-            *count = count.saturating_add(row.count);
-            *shallow = shallow.saturating_add(row.shallow);
-            *retained = retained.saturating_add(row.retained);
-            diff.ambiguous |= row.ambiguous;
-        }
-    }
-    let change = |d: &HeapClassDiff| if d.ambiguous { 0 } else { d.retained.abs_diff(d.base_retained) };
-    let mut diffs: Vec<HeapClassDiff> = by_name.into_values().collect();
-    diffs.sort_by(|a, b| change(b).cmp(&change(a)).then_with(|| a.name.cmp(&b.name)));
-    diffs
-}
-
-#[cfg(test)]
-mod tests;
@@ -1,78 +0,0 @@
-use super::*;
-use crate::hprof::HeapRootKind;
-use crate::test_index::analyzed;
-use crate::testing::{MiniHeap, sample, sample_with_two_more_nodes};
-
-fn diff<'a>(diffs: &'a [HeapClassDiff], name: &str) -> &'a HeapClassDiff {
-    let mut rows = diffs.iter().filter(|d| d.name == name);
-    let row = rows.next().unwrap_or_else(|| panic!("no diff for {name}"));
-    assert!(rows.next().is_none(), "two diffs for {name}");
-    row
-}
-
-fn sort_key(d: &HeapClassDiff) -> u64 {
-    if d.ambiguous { 0 } else { d.retained.abs_diff(d.base_retained) }
-}
-
-fn assert_sorted(diffs: &[HeapClassDiff]) {
-    assert!(diffs.windows(2).all(|p| (sort_key(&p[1]), &p[0].name) < (sort_key(&p[0]), &p[1].name)), "{diffs:#?}");
-}
-
-#[test]
-fn compare_counts_by_class() {
-    let base = analyzed(&sample());
-    let mut current = sample_with_two_more_nodes();
-    current
-        .class("Extra", Some("java.lang.Object"), &[])
-        .object(0x4000, "Extra", &[])
-        .root(HeapRootKind::JniGlobal, 0x4000);
-    let diffs = compare(&base, &analyzed(&current));
-    let node = diff(&diffs, "Node");
-    assert_eq!((node.base_count, node.count), (3, 5));
-    assert_eq!(node.shallow - node.base_shallow, 48);
-    assert_eq!((node.base_retained, node.retained), (104, 152));
-    assert!(!node.ambiguous);
-    let extra = diff(&diffs, "Extra");
-    assert_eq!((extra.base_count, extra.base_shallow, extra.base_retained, extra.count), (0, 0, 0, 1));
-    assert_eq!(diffs[0].name, "Node");
-    let holder = diff(&diffs, "Holder");
-    assert_eq!((holder.base_count, holder.count, holder.base_retained, holder.retained), (1, 1, 72, 72));
-    assert_sorted(&diffs);
-
-    // A class only in the base snapshot.
-    let gone = compare(&analyzed(&current), &base);
-    let extra = diff(&gone, "Extra");
-    assert_eq!((extra.base_count, extra.count, extra.shallow, extra.retained), (1, 0, 0, 0));
-    assert_sorted(&gone);
-}
-
-fn two_foos(extra: bool) -> MiniHeap {
-    let mut heap = sample();
-    heap.class("Foo", Some("java.lang.Object"), &[])
-        .object(0x3000, "Foo", &[])
-        .class("Foo", Some("java.lang.Object"), &[])
-        .object(0x3100, "Foo", &[]);
-    if extra {
-        heap.object(0x3200, "Foo", &[]);
-    }
-    for addr in [0x3000, 0x3100, 0x3200] {
-        heap.root(HeapRootKind::JniGlobal, addr);
-    }
-    heap
-}
-
-#[test]
-fn compare_gives_no_diff_for_a_name_of_several_classes() {
-    let diffs = compare(&analyzed(&two_foos(false)), &analyzed(&two_foos(true)));
-    let foo = diff(&diffs, "Foo");
-    assert!(foo.ambiguous);
-    assert_eq!((foo.base_count, foo.count), (2, 3));
-    assert!(diffs.iter().filter(|d| d.name != "Foo").all(|d| !d.ambiguous));
-    assert_sorted(&diffs);
-
-    // Ambiguous on one side only is still ambiguous.
-    let diffs = compare(&analyzed(&sample()), &analyzed(&two_foos(false)));
-    let foo = diff(&diffs, "Foo");
-    assert!(foo.ambiguous);
-    assert_eq!((foo.base_count, foo.count), (0, 2));
-}
@@ -1,137 +0,0 @@
-//! Disk-space estimates and the per-snapshot directories under the app's cache.
-//!
-//! A snapshot directory holds the index columns and, for a capture, the dump itself. Its `owner`
-//! file names the host process that created it, so a host that starts later can remove the
-//! directories of hosts that died without cleaning up.
-
-use std::fs;
-use std::io::{self, Read};
-use std::path::{Path, PathBuf};
-use std::time::{Duration, SystemTime};
-
-/// Space to leave free on top of an estimate.
-pub const DISK_MARGIN: u64 = 1 << 30;
-
-/// hprof ≈ `bytes + 16 × instances`; index columns and scratch arrays ≈ `90 × instances`.
-const CAPTURE_BYTES_PER_INSTANCE: u64 = 106;
-const INDEX_BYTES_PER_OBJECT: u64 = 90;
-
-const OWNER_FILE: &str = "owner";
-const TMP_SUFFIX: &str = ".tmp";
-/// A directory still being created by a live host has no `owner` for a moment; one that stays
-/// unfinished for longer than this was abandoned.
-const TMP_GRACE: Duration = Duration::from_secs(60 * 60);
-
-/// Bytes of free space that a dump of `heap_bytes` bytes holding `instances` instances needs,
-/// including its index.
-pub fn capture_need(heap_bytes: u64, instances: u64) -> u64 {
-    heap_bytes.saturating_add(CAPTURE_BYTES_PER_INSTANCE.saturating_mul(instances)).saturating_add(DISK_MARGIN)
-}
-
-/// Bytes of free space that indexing a dump of `objects` objects needs.
-pub fn index_need(objects: u64) -> u64 {
-    INDEX_BYTES_PER_OBJECT.saturating_mul(objects).saturating_add(DISK_MARGIN)
-}
-
-/// Bytes available to this process on the volume holding `dir`; `None` where it is not checked
-/// (not unix) or cannot be read, so callers go ahead rather than refuse.
-pub fn free_bytes(dir: &Path) -> Option<u64> {
-    #[cfg(unix)]
-    {
-        use std::os::unix::ffi::OsStrExt;
-
-        let path = std::ffi::CString::new(dir.as_os_str().as_bytes()).ok()?;
-        // SAFETY: `path` is NUL-terminated and `stat` is only read after `statvfs` filled it in.
-        let stat = unsafe {
-            let mut stat = std::mem::MaybeUninit::<libc::statvfs>::zeroed();
-            if libc::statvfs(path.as_ptr(), stat.as_mut_ptr()) != 0 {
-                return None;
-            }
-            stat.assume_init()
-        };
-        // The field widths differ between unix targets.
-        #[allow(clippy::unnecessary_cast)]
-        Some((stat.f_bavail as u64).saturating_mul(stat.f_frsize as u64))
-    }
-    #[cfg(not(unix))]
-    {
-        let _ = dir;
-        None
-    }
-}
-
-/// `<local_data_dir>/cache/heap-snapshots`.
-pub fn snapshots_root(local_data_dir: &Path) -> PathBuf {
-    local_data_dir.join("cache").join("heap-snapshots")
-}
-
-/// Creates `<root>/<uuid>/` holding an `owner` file with this process's pid. The directory is
-/// built as `<uuid>.tmp` and renamed, so another host scanning `root` never sees it without its
-/// owner and removes it as abandoned.
-pub fn create_snapshot_dir(root: &Path) -> io::Result<PathBuf> {
-    fs::create_dir_all(root)?;
-    let name = uuid::Uuid::new_v4().to_string();
-    let building = root.join(format!("{name}{TMP_SUFFIX}"));
-    let dir = root.join(&name);
-    create_private_dir(&building)?;
-    let published =
-        fs::write(building.join(OWNER_FILE), std::process::id().to_string()).and_then(|()| fs::rename(&building, &dir));
-    if let Err(err) = published {
-        let _ = fs::remove_dir_all(&building);
-        return Err(err);
-    }
-    Ok(dir)
-}
-
-/// A dump holds whatever was in the JVM's memory, passwords and tokens included, so on unix only
-/// the owner may enter the directory. Windows keeps the ACL inherited from the user's data dir.
-fn create_private_dir(path: &Path) -> io::Result<()> {
-    #[cfg(unix)]
-    {
-        use std::os::unix::fs::DirBuilderExt;
-        fs::DirBuilder::new().mode(0o700).create(path)
-    }
-    #[cfg(not(unix))]
-    {
-        fs::DirBuilder::new().create(path)
-    }
-}
-
-/// Removes the directories under `root` whose owner file is missing, unreadable or names a pid
-/// for which `alive` is false, and unfinished `*.tmp` ones older than an hour. Only directories
-/// directly under `root` are touched; a symlink there is left alone.
-pub fn remove_stale(root: &Path, alive: impl Fn(u32) -> bool) {
-    remove_stale_at(root, alive, SystemTime::now());
-}
-
-fn remove_stale_at(root: &Path, alive: impl Fn(u32) -> bool, now: SystemTime) {
-    let Ok(entries) = fs::read_dir(root) else { return };
-    for entry in entries.flatten() {
-        let path = entry.path();
-        // `symlink_metadata` does not follow: a link out of `root` is not a directory here.
-        let Ok(meta) = fs::symlink_metadata(&path) else { continue };
-        if !meta.file_type().is_dir() {
-            continue;
-        }
-        let stale = if path.extension().is_some_and(|ext| ext == "tmp") {
-            meta.modified()
-                .ok()
-                .and_then(|modified| now.duration_since(modified).ok())
-                .is_some_and(|age| age >= TMP_GRACE)
-        } else {
-            read_owner(&path).is_none_or(|pid| !alive(pid))
-        };
-        if stale && let Err(err) = fs::remove_dir_all(&path) {
-            tracing::warn!(dir = %path.display(), %err, "could not remove a stale heap snapshot directory");
-        }
-    }
-}
-
-fn read_owner(dir: &Path) -> Option<u32> {
-    let mut text = String::new();
-    fs::File::open(dir.join(OWNER_FILE)).ok()?.take(32).read_to_string(&mut text).ok()?;
-    text.trim().parse().ok()
-}
-
-#[cfg(test)]
-mod tests;
@@ -1,137 +0,0 @@
-use std::time::{Duration, SystemTime};
-
-use super::*;
-
-fn names(dir: &Path) -> Vec<String> {
-    let mut names: Vec<_> =
-        std::fs::read_dir(dir).unwrap().map(|e| e.unwrap().file_name().into_string().unwrap()).collect();
-    names.sort();
-    names
-}
-
-fn dir_with_owner(root: &Path, name: &str, owner: Option<&str>) {
-    let dir = root.join(name);
-    std::fs::create_dir(&dir).unwrap();
-    std::fs::write(dir.join("dump.hprof"), b"x").unwrap();
-    if let Some(owner) = owner {
-        std::fs::write(dir.join(OWNER_FILE), owner).unwrap();
-    }
-}
-
-#[test]
-fn estimates() {
-    assert_eq!(capture_need(664_018_520, 20_087_506), 664_018_520 + 106 * 20_087_506 + (1 << 30));
-    assert_eq!(index_need(10), 900 + (1 << 30));
-}
-
-#[test]
-fn estimates_saturate_instead_of_wrapping() {
-    assert_eq!(capture_need(u64::MAX, u64::MAX), u64::MAX);
-    assert_eq!(index_need(u64::MAX), u64::MAX);
-}
-
-#[cfg(unix)]
-#[test]
-fn not_enough_space_for_estimate() {
-    let dir = tempfile::tempdir().unwrap();
-    let free = free_bytes(dir.path()).expect("statvfs works on a temp dir");
-    assert!(free > 0);
-    assert!(capture_need(u64::MAX / 4, 0) > free);
-}
-
-#[cfg(unix)]
-#[test]
-fn free_bytes_of_a_missing_dir_is_unknown() {
-    let dir = tempfile::tempdir().unwrap();
-    assert_eq!(free_bytes(&dir.path().join("missing")), None);
-}
-
-#[cfg(not(unix))]
-#[test]
-fn free_space_is_not_checked_off_unix() {
-    assert_eq!(free_bytes(Path::new(".")), None);
-}
-
-#[test]
-fn snapshots_root_is_under_the_cache() {
-    let local = Path::new("local");
-    assert_eq!(snapshots_root(local), local.join("cache").join("heap-snapshots"));
-}
-
-#[test]
-fn snapshot_dir_records_its_owner_and_leaves_no_tmp() {
-    let root = tempfile::tempdir().unwrap();
-    let missing_parent = root.path().join("cache").join("heap-snapshots");
-    let dir = create_snapshot_dir(&missing_parent).unwrap();
-    assert_eq!(dir.parent(), Some(missing_parent.as_path()));
-    assert!(uuid::Uuid::parse_str(dir.file_name().unwrap().to_str().unwrap()).is_ok());
-    assert_eq!(std::fs::read_to_string(dir.join(OWNER_FILE)).unwrap(), std::process::id().to_string());
-    assert_eq!(names(&missing_parent), [dir.file_name().unwrap().to_str().unwrap()]);
-    assert_ne!(create_snapshot_dir(&missing_parent).unwrap(), dir);
-}
-
-#[cfg(unix)]
-#[test]
-fn snapshot_dir_is_private_to_the_owner() {
-    use std::os::unix::fs::PermissionsExt;
-
-    let root = tempfile::tempdir().unwrap();
-    let dir = create_snapshot_dir(root.path()).unwrap();
-    assert_eq!(std::fs::metadata(&dir).unwrap().permissions().mode() & 0o777, 0o700);
-}
-
-#[test]
-fn stale_dirs_removed_on_start() {
-    let root = tempfile::tempdir().unwrap();
-    dir_with_owner(root.path(), "a", Some("999999"));
-    dir_with_owner(root.path(), "b", Some(&std::process::id().to_string()));
-    dir_with_owner(root.path(), "c", None);
-    remove_stale(root.path(), |pid| pid == std::process::id());
-    assert_eq!(names(root.path()), ["b"]);
-}
-
-#[test]
-fn owner_that_is_not_a_pid_is_stale() {
-    let root = tempfile::tempdir().unwrap();
-    dir_with_owner(root.path(), "empty", Some(""));
-    dir_with_owner(root.path(), "word", Some("not-a-pid"));
-    dir_with_owner(root.path(), "negative", Some("-1"));
-    dir_with_owner(root.path(), "padded", Some(&format!(" {}\n", std::process::id())));
-    remove_stale(root.path(), |pid| pid == std::process::id());
-    assert_eq!(names(root.path()), ["padded"]);
-}
-
-#[test]
-fn stale_scan_tolerates_a_missing_root_and_leaves_loose_files_alone() {
-    let root = tempfile::tempdir().unwrap();
-    remove_stale(&root.path().join("missing"), |_| false);
-    std::fs::write(root.path().join("notes.txt"), b"keep").unwrap();
-    remove_stale(root.path(), |_| false);
-    assert_eq!(names(root.path()), ["notes.txt"]);
-}
-
-#[test]
-fn unfinished_dir_is_left_alone_for_an_hour() {
-    let root = tempfile::tempdir().unwrap();
-    // Another host may be between `create_dir` and the rename of its own snapshot dir.
-    dir_with_owner(root.path(), "young.tmp", None);
-    let now = SystemTime::now();
-    remove_stale_at(root.path(), |_| false, now);
-    assert_eq!(names(root.path()), ["young.tmp"]);
-    remove_stale_at(root.path(), |_| false, now + TMP_GRACE - Duration::from_secs(60));
-    assert_eq!(names(root.path()), ["young.tmp"]);
-    remove_stale_at(root.path(), |_| false, now + TMP_GRACE + Duration::from_secs(60));
-    assert!(names(root.path()).is_empty());
-}
-
-#[cfg(unix)]
-#[test]
-fn stale_scan_never_follows_a_symlink_out_of_the_root() {
-    let outside = tempfile::tempdir().unwrap();
-    std::fs::write(outside.path().join("precious"), b"x").unwrap();
-    let root = tempfile::tempdir().unwrap();
-    std::os::unix::fs::symlink(outside.path(), root.path().join("link")).unwrap();
-    remove_stale(root.path(), |_| false);
-    remove_stale_at(root.path(), |_| false, SystemTime::now() + 2 * TMP_GRACE);
-    assert_eq!(names(outside.path()), ["precious"]);
-}
@@ -1,247 +0,0 @@
-//! Dominator tree of the object graph, by Lengauer–Tarjan with path compression and no recursion:
-//! the DFS "stack" is the chain of DFS parents, and `eval` reverses the links of the path it
-//! compresses instead of keeping a stack.
-//!
-//! Between the DFS and the final translation every array is indexed by DFS number, so the root is
-//! 0 and a vertex's DFS ancestors all have smaller numbers.
-
-use ide_core::CancellationToken;
-
-use crate::column::{Column, NONE, Store};
-use crate::error::HeapError;
-use crate::files::IDOM_FILE;
-use crate::graph::accumulate;
-use crate::progress::{CHECK_EVERY, HeapPhase, Progress};
-
-const PHASE: HeapPhase = HeapPhase::Dominators;
-
-pub struct Dominators {
-    /// Immediate dominator of each node, saved as `idom.u32` in the store; [`NONE`] for
-    /// unreachable nodes, `root` for `root`.
-    pub idom: Column<u32>,
-    /// Nodes in DFS preorder from `root`, `reachable` entries.
-    pub preorder: Column<u32>,
-    pub reachable: u32,
-}
-
-/// The dominators of the graph whose node `v` has targets `out[out_start[v]..out_start[v + 1]]`,
-/// from `root` (which must be a node). `progress` gets `Dominators` from `(0, total)` to
-/// `(total, total)`; an `Err` from it stops the computation with that error.
-pub fn dominators(
-    out_start: &[u32],
-    out: &[u32],
-    root: u32,
-    store: &Store,
-    progress: &dyn Fn(HeapPhase, u64, u64) -> Result<(), HeapError>,
-    cancel: &CancellationToken,
-) -> Result<Dominators, HeapError> {
-    compute(out_start, out, root, store, progress, cancel).map(|(dominators, _)| dominators)
-}
-
-/// [`dominators`], plus the number of steps of work it took.
-fn compute(
-    out_start: &[u32],
-    out: &[u32],
-    root: u32,
-    store: &Store,
-    progress: &dyn Fn(HeapPhase, u64, u64) -> Result<(), HeapError>,
-    cancel: &CancellationToken,
-) -> Result<(Dominators, u64), HeapError> {
-    let nodes = out_start.len().saturating_sub(1);
-    if nodes >= NONE as usize {
-        return Err(HeapError::TooLarge);
-    }
-    assert!((root as usize) < nodes, "root {root} is not one of the {nodes} nodes");
-    // Three walks of at most `nodes` vertices each: DFS, semidominators, immediate dominators.
-    let span = nodes as u64;
-    let mut work = Work::new(Progress::new(progress, cancel), 3 * span);
-    work.report(0)?;
-
-    // DFS: `pre` maps nodes to DFS numbers and `vertex` back; `cursor[d]` is the next edge of
-    // DFS vertex d to follow.
-    let mut pre = store.scratch::<u32>(nodes, NONE)?;
-    let mut vertex = store.scratch::<u32>(nodes, 0)?;
-    let mut parent = store.scratch::<u32>(nodes, 0)?;
-    let mut cursor = store.scratch::<u32>(nodes, 0)?;
-    pre[root as usize] = 0;
-    vertex[0] = root;
-    cursor[0] = out_start[root as usize];
-    let (mut reachable, mut d) = (1u32, 0u32);
-    loop {
-        work.tick()?;
-        let edge = cursor[d as usize];
-        if edge < out_start[vertex[d as usize] as usize + 1] {
-            cursor[d as usize] = edge + 1;
-            let w = out[edge as usize] as usize;
-            if pre[w] == NONE {
-                let next = reachable as usize;
-                pre[w] = reachable;
-                vertex[next] = w as u32;
-                parent[next] = d;
-                cursor[next] = out_start[w];
-                d = reachable;
-                reachable += 1;
-                work.done = u64::from(reachable);
-            }
-        } else if d == 0 {
-            break;
-        } else {
-            d = parent[d as usize];
-        }
-    }
-    let r = reachable as usize;
-    work.report(span)?;
-
-    // Predecessors by DFS number, as CSR: counted into `starts[w + 1]`, then filled through
-    // `starts[w]` as a cursor, which leaves it at w's end until the column is shifted one slot.
-    let mut semi = cursor;
-    let mut label = store.scratch::<u32>(r, 0)?;
-    let mut starts = store.scratch::<u32>(r + 1, 0)?;
-    for d in 0..r {
-        work.tick()?;
-        semi[d] = d as u32;
-        label[d] = d as u32;
-        for &w in targets(out_start, out, vertex[d]) {
-            work.tick()?;
-            starts[pre[w as usize] as usize + 1] += 1;
-        }
-    }
-    let edges = accumulate(&mut starts, cancel)?;
-    let mut preds = store.scratch::<u32>(edges as usize, 0)?;
-    for d in 0..r {
-        work.tick()?;
-        for &w in targets(out_start, out, vertex[d]) {
-            work.tick()?;
-            let slot = &mut starts[pre[w as usize] as usize];
-            preds[*slot as usize] = d as u32;
-            *slot += 1;
-        }
-    }
-    starts.copy_within(0..r, 1);
-    starts[0] = 0;
-    drop(pre);
-    work.report(span)?;
-
-    // Semidominators in reverse preorder, linking each finished vertex to its parent. Vertex w
-    // waits in its semidominator's bucket until a child of that semidominator is linked; then
-    // `eval` gives w's idom, or a vertex whose idom is also w's, fixed up in preorder below.
-    // `idom[v]` is the next vertex in v's bucket until v leaves the bucket.
-    let mut ancestor = store.scratch::<u32>(r, NONE)?;
-    let mut bucket = store.scratch::<u32>(r, NONE)?;
-    let mut idom = store.scratch::<u32>(r, NONE)?;
-    for w in (1..r).rev() {
-        work.done = span + (r - w) as u64;
-        work.tick()?;
-        let mut s = semi[w];
-        for &v in &preds[starts[w] as usize..starts[w + 1] as usize] {
-            work.tick()?;
-            let u = eval(v, &mut ancestor, &mut label, &semi, &mut work)?;
-            s = s.min(semi[u as usize]);
-        }
-        semi[w] = s;
-        idom[w] = bucket[s as usize];
-        bucket[s as usize] = w as u32;
-        let p = parent[w];
-        ancestor[w] = p;
-        let mut v = std::mem::replace(&mut bucket[p as usize], NONE);
-        while v != NONE {
-            work.tick()?;
-            let next = idom[v as usize];
-            let u = eval(v, &mut ancestor, &mut label, &semi, &mut work)?;
-            idom[v as usize] = if semi[u as usize] < semi[v as usize] { u } else { p };
-            v = next;
-        }
-    }
-    drop((label, starts, preds, ancestor, bucket, parent));
-    work.report(2 * span)?;
-
-    // Immediate dominators, translated back to nodes; in preorder, so a deferred vertex's
-    // stand-in already has its final idom.
-    let mut node_idom = store.column::<u32>(IDOM_FILE, nodes, NONE)?;
-    let mut preorder = store.scratch::<u32>(r, 0)?;
-    idom[0] = 0;
-    node_idom[root as usize] = root;
-    preorder[0] = root;
-    for w in 1..r {
-        work.done = 2 * span + w as u64;
-        work.tick()?;
-        if idom[w] != semi[w] {
-            idom[w] = idom[idom[w] as usize];
-        }
-        node_idom[vertex[w] as usize] = vertex[idom[w] as usize];
-        preorder[w] = vertex[w];
-    }
-    work.report(3 * span)?;
-    Ok((Dominators { idom: node_idom, preorder, reachable }, work.steps))
-}
-
-fn targets<'a>(out_start: &[u32], out: &'a [u32], v: u32) -> &'a [u32] {
-    let v = v as usize;
-    &out[out_start[v] as usize..out_start[v + 1] as usize]
-}
-
-/// Counts steps of work and reports progress, which also looks at the cancellation token, at
-/// every phase boundary and after every [`CHECK_EVERY`] steps, whichever loop they are in.
-struct Work<'a> {
-    progress: Progress<'a>,
-    total: u64,
-    /// Progress to report at the next check; the loops keep it current.
-    done: u64,
-    steps: u64,
-    next_report: u64,
-}
-
-impl<'a> Work<'a> {
-    fn new(progress: Progress<'a>, total: u64) -> Self {
-        Self { progress, total, done: 0, steps: 0, next_report: CHECK_EVERY }
-    }
-
-    fn report(&mut self, done: u64) -> Result<(), HeapError> {
-        self.done = done;
-        self.next_report = self.steps + CHECK_EVERY;
-        self.progress.report(PHASE, done, self.total)
-    }
-
-    #[inline]
-    fn tick(&mut self) -> Result<(), HeapError> {
-        self.steps += 1;
-        if self.steps < self.next_report { Ok(()) } else { self.report(self.done) }
-    }
-}
-
-/// The vertex of smallest semidominator on the forest path from `v` up to, not including, its
-/// tree's root (`v` itself when it is a root), compressing that path so the root becomes the
-/// ancestor of every vertex on it. The walk up reverses the `ancestor` links so the walk down can
-/// fold labels nearest-root first, as the recursive compress does, without a stack.
-fn eval(v: u32, ancestor: &mut [u32], label: &mut [u32], semi: &[u32], work: &mut Work) -> Result<u32, HeapError> {
-    let at = |x: u32| x as usize;
-    if ancestor[at(v)] == NONE {
-        return Ok(v);
-    }
-    let (mut x, mut below) = (v, NONE);
-    while ancestor[at(ancestor[at(x)])] != NONE {
-        work.tick()?;
-        let up = ancestor[at(x)];
-        ancestor[at(x)] = below;
-        below = x;
-        x = up;
-    }
-    // `x` is the root's child, already compressed; `below` is the vertex under it.
-    let root = ancestor[at(x)];
-    let mut best = label[at(x)];
-    while below != NONE {
-        work.tick()?;
-        let y = at(below);
-        if semi[at(best)] < semi[at(label[y])] {
-            label[y] = best;
-        } else {
-            best = label[y];
-        }
-        below = ancestor[y];
-        ancestor[y] = root;
-    }
-    Ok(label[at(v)])
-}
-
-#[cfg(test)]
-mod tests;
@@ -1,348 +0,0 @@
-use std::cell::RefCell;
-use std::time::Instant;
-
-use proptest::collection::vec;
-use proptest::prelude::*;
-
-use super::*;
-use crate::NONE;
-use crate::graph::build_graph;
-use crate::testing::{XorShift, sample};
-
-fn no_progress(_: HeapPhase, _: u64, _: u64) -> Result<(), HeapError> {
-    Ok(())
-}
-
-/// CSR of `edges` over `n` nodes, targets in edge order.
-fn csr(n: usize, edges: &[(u32, u32)]) -> (Vec<u32>, Vec<u32>) {
-    let mut start = vec![0u32; n + 1];
-    for &(from, _) in edges {
-        start[from as usize + 1] += 1;
-    }
-    for v in 0..n {
-        start[v + 1] += start[v];
-    }
-    let mut cursor = start.clone();
-    let mut out = vec![0u32; edges.len()];
-    for &(from, to) in edges {
-        out[cursor[from as usize] as usize] = to;
-        cursor[from as usize] += 1;
-    }
-    (start, out)
-}
-
-fn run(n: usize, edges: &[(u32, u32)], root: u32) -> Dominators {
-    let (start, out) = csr(n, edges);
-    dominators(&start, &out, root, &Store::Ram, &no_progress, &CancellationToken::new()).unwrap()
-}
-
-fn preds(n: usize, edges: &[(u32, u32)]) -> Vec<Vec<u32>> {
-    let mut preds = vec![Vec::new(); n];
-    for &(from, to) in edges {
-        preds[to as usize].push(from);
-    }
-    preds
-}
-
-/// Immediate dominators from iterated `Dom` sets (one `u64` bitset per node, `n <= 64`).
-fn dataflow_idom(n: usize, edges: &[(u32, u32)], root: u32) -> Vec<u32> {
-    let (start, out) = csr(n, edges);
-    let mut reachable = vec![false; n];
-    let mut todo = vec![root];
-    reachable[root as usize] = true;
-    while let Some(v) = todo.pop() {
-        for &w in &out[start[v as usize] as usize..start[v as usize + 1] as usize] {
-            if !std::mem::replace(&mut reachable[w as usize], true) {
-                todo.push(w);
-            }
-        }
-    }
-    let preds = preds(n, edges);
-    let mut dom = vec![u64::MAX; n];
-    dom[root as usize] = 1 << root;
-    let mut changed = true;
-    while changed {
-        changed = false;
-        for v in (0..n).filter(|&v| reachable[v] && v != root as usize) {
-            let meet =
-                preds[v].iter().filter(|&&p| reachable[p as usize]).fold(u64::MAX, |acc, &p| acc & dom[p as usize]);
-            let next = meet | 1 << v;
-            if next != dom[v] {
-                dom[v] = next;
-                changed = true;
-            }
-        }
-    }
-    (0..n)
-        .map(|v| {
-            if !reachable[v] {
-                NONE
-            } else if v == root as usize {
-                root
-            } else {
-                // The strict dominator dominated by all the others has the most dominators itself.
-                let strict = dom[v] & !(1 << v);
-                (0..n as u32).filter(|&d| strict & 1 << d != 0).max_by_key(|&d| dom[d as usize].count_ones()).unwrap()
-            }
-        })
-        .collect()
-}
-
-/// Cooper–Harvey–Kennedy iteration over reverse postorder from an explicit-stack DFS.
-fn chk_idom(n: usize, edges: &[(u32, u32)], root: u32) -> Vec<u32> {
-    let (start, out) = csr(n, edges);
-    let mut post_number = vec![NONE; n];
-    let mut postorder = Vec::new();
-    let mut seen = vec![false; n];
-    let mut stack = vec![(root, start[root as usize])];
-    seen[root as usize] = true;
-    while let Some(&mut (v, ref mut next)) = stack.last_mut() {
-        if *next < start[v as usize + 1] {
-            let w = out[*next as usize];
-            *next += 1;
-            if !std::mem::replace(&mut seen[w as usize], true) {
-                stack.push((w, start[w as usize]));
-            }
-        } else {
-            post_number[v as usize] = postorder.len() as u32;
-            postorder.push(v);
-            stack.pop();
-        }
-    }
-    let preds = preds(n, edges);
-    let mut idom = vec![NONE; n];
-    idom[root as usize] = root;
-    let intersect = |idom: &[u32], mut a: u32, mut b: u32| {
-        while a != b {
-            while post_number[a as usize] < post_number[b as usize] {
-                a = idom[a as usize];
-            }
-            while post_number[b as usize] < post_number[a as usize] {
-                b = idom[b as usize];
-            }
-        }
-        a
-    };
-    let mut changed = true;
-    while changed {
-        changed = false;
-        for &v in postorder.iter().rev().filter(|&&v| v != root) {
-            let mut new = NONE;
-            for &p in &preds[v as usize] {
-                if idom[p as usize] != NONE {
-                    new = if new == NONE { p } else { intersect(&idom, p, new) };
-                }
-            }
-            if new != idom[v as usize] {
-                idom[v as usize] = new;
-                changed = true;
-            }
-        }
-    }
-    idom
-}
-
-#[test]
-fn diamond() {
-    let d = run(5, &[(0, 1), (0, 2), (1, 3), (2, 3), (3, 4)], 0);
-    assert_eq!(&*d.idom, &[0, 0, 0, 0, 3]);
-    assert_eq!(d.reachable, 5);
-    assert_eq!(&*d.preorder, &[0, 1, 3, 4, 2]);
-}
-
-#[test]
-fn unreachable_is_none() {
-    let d = run(6, &[(0, 1), (0, 2), (1, 3), (2, 3), (3, 4), (5, 3)], 0);
-    assert_eq!(&*d.idom, &[0, 0, 0, 0, 3, NONE]);
-    assert_eq!(d.reachable, 5);
-    assert_eq!(d.preorder.len(), 5);
-}
-
-#[test]
-fn cycle_back_to_root() {
-    let d = run(3, &[(0, 1), (1, 2), (2, 1), (2, 0)], 0);
-    assert_eq!(&*d.idom, &[0, 0, 1]);
-}
-
-#[test]
-fn root_need_not_be_node_zero() {
-    let d = run(4, &[(3, 1), (1, 0), (3, 2), (2, 0), (0, 3)], 3);
-    assert_eq!(&*d.idom, &[3, 3, 3, 3]);
-    assert_eq!(d.preorder[0], 3);
-}
-
-#[test]
-fn sample_heap_dominators() {
-    let bytes = sample().bytes();
-    let g = build_graph(&bytes, &Store::Ram, &no_progress, &CancellationToken::new()).unwrap();
-    let d = dominators(&g.out_start, &g.out, g.root, &Store::Ram, &no_progress, &CancellationToken::new()).unwrap();
-    let node = |id: u64| g.ids.rank(id).unwrap();
-    let idom_of = |id: u64| d.idom[node(id) as usize];
-    assert_eq!(idom_of(0x1100), node(0x1000), "N1 → H");
-    assert_eq!(idom_of(0x1200), node(0x1000), "N2 → H");
-    assert_eq!(idom_of(0x1300), g.root, "N3 → root");
-    assert_eq!(idom_of(0x1400), node(0x1300), "L → N3");
-    assert_eq!(idom_of(0x1500), NONE, "R is unreachable");
-    assert_eq!(idom_of(0x1700), NONE, "N4 only through the weak referent");
-    assert_eq!(d.idom[g.root as usize], g.root);
-}
-
-#[test]
-fn idom_is_written_to_the_store() {
-    let dir = tempfile::tempdir().unwrap();
-    let (start, out) = csr(3, &[(0, 1), (1, 2)]);
-    let store = Store::Dir(dir.path().to_path_buf());
-    let d = dominators(&start, &out, 0, &store, &no_progress, &CancellationToken::new()).unwrap();
-    drop(d);
-    assert_eq!(&*Column::<u32>::open(&dir.path().join("idom.u32")).unwrap(), &[0, 0, 1]);
-    let names: Vec<_> = std::fs::read_dir(dir.path()).unwrap().map(|e| e.unwrap().file_name()).collect();
-    assert_eq!(names, ["idom.u32"], "scratch columns leave no files");
-}
-
-#[test]
-fn reports_dominators_progress_and_stops_on_cancel() {
-    let (start, out) = csr(3, &[(0, 1), (1, 2)]);
-    let calls = RefCell::new(Vec::new());
-    let record = |phase, done, total| {
-        calls.borrow_mut().push((phase, done, total));
-        Ok(())
-    };
-    dominators(&start, &out, 0, &Store::Ram, &record, &CancellationToken::new()).unwrap();
-    let calls = calls.into_inner();
-    let total = calls[0].2;
-    assert_eq!(calls.first(), Some(&(HeapPhase::Dominators, 0, total)));
-    assert_eq!(calls.last(), Some(&(HeapPhase::Dominators, total, total)));
-    assert!(calls.windows(2).all(|w| w[0].1 <= w[1].1), "progress never goes back: {calls:?}");
-
-    let cancel = CancellationToken::new();
-    let cancel_on_first = |_, _, _| {
-        cancel.cancel();
-        Ok(())
-    };
-    let result = dominators(&start, &out, 0, &Store::Ram, &cancel_on_first, &cancel);
-    assert!(matches!(result, Err(HeapError::Cancelled)));
-
-    let refuse = |_, _, _| Err(HeapError::TooLarge);
-    let result = dominators(&start, &out, 0, &Store::Ram, &refuse, &CancellationToken::new());
-    assert!(matches!(result, Err(HeapError::TooLarge)));
-}
-
-#[test]
-fn cancel_during_idom_phase() {
-    // Long enough that the last phase alone passes a check interval.
-    const NODES: u32 = (CHECK_EVERY + CHECK_EVERY / 2) as u32;
-    let edges: Vec<_> = (1..NODES).map(|v| (v - 1, v)).collect();
-    let (start, out) = csr(NODES as usize, &edges);
-    let span = u64::from(NODES);
-    let cancel = CancellationToken::new();
-    let calls = RefCell::new(Vec::new());
-    let cancel_past_semidominators = |_, done, _| {
-        calls.borrow_mut().push(done);
-        if done > 2 * span {
-            cancel.cancel();
-        }
-        Ok(())
-    };
-    let result = dominators(&start, &out, 0, &Store::Ram, &cancel_past_semidominators, &cancel);
-    assert!(matches!(result, Err(HeapError::Cancelled)));
-    let calls = calls.into_inner();
-    assert!(calls.contains(&(2 * span)), "the semidominator phase finished: {calls:?}");
-    let last = *calls.last().unwrap();
-    assert!(last > 2 * span && last < 3 * span, "stopped inside the idom phase: {calls:?}");
-}
-
-proptest! {
-    #[test]
-    fn matches_dataflow_on_random_graphs(n in 2usize..64, edges in vec((0u32..64, 0u32..64), 0..192)) {
-        let edges: Vec<_> = edges.into_iter().map(|(a, b)| (a % n as u32, b % n as u32)).collect();
-        let d = run(n, &edges, 0);
-        prop_assert_eq!(d.idom.to_vec(), dataflow_idom(n, &edges, 0));
-        prop_assert_eq!(d.preorder.len(), d.reachable as usize);
-    }
-}
-
-#[test]
-fn matches_chk_on_a_large_random_graph() {
-    const NODES: u32 = 200_000;
-    const EXTRA_EDGES: u32 = 100_000;
-    let mut rng = XorShift::new(0x5EED_D0D0);
-    let mut edges: Vec<_> = (1..NODES).map(|v| (rng.below(v), v)).collect();
-    edges.extend((0..EXTRA_EDGES).map(|_| (rng.below(NODES), rng.below(NODES))));
-    // Visit edges in a scrambled order so the DFS tree differs from the generating tree.
-    for i in (1..edges.len()).rev() {
-        edges.swap(i, rng.below(i as u32 + 1) as usize);
-    }
-    let started = Instant::now();
-    let d = run(NODES as usize, &edges, 0);
-    let elapsed = started.elapsed();
-    let expected = chk_idom(NODES as usize, &edges, 0);
-    let mismatches = d.idom.iter().zip(&expected).filter(|(a, b)| a != b).count();
-    assert_eq!(mismatches, 0);
-    assert_eq!(d.reachable, NODES);
-    eprintln!("dominators of {NODES} random nodes: {elapsed:?}");
-}
-
-/// A doubly linked list whose items an array list also holds: super-root 0 → list 1 → node 0,
-/// 0 → array list 2 → element array 3 → every item; node j → item j, next, prev.
-fn shared_list_and_array(k: u32) -> (usize, Vec<(u32, u32)>) {
-    let node = |j: u32| 4 + 2 * j;
-    let item = |j: u32| 5 + 2 * j;
-    let mut edges = vec![(0, 1), (0, 2), (2, 3), (1, node(0))];
-    for j in 0..k {
-        edges.push((node(j), item(j)));
-        if j + 1 < k {
-            edges.push((node(j), node(j + 1)));
-        }
-        if j > 0 {
-            edges.push((node(j), node(j - 1)));
-        }
-        edges.push((3, item(j)));
-    }
-    ((4 + 2 * k) as usize, edges)
-}
-
-#[test]
-fn shared_list_and_array_is_near_linear() {
-    let (n, edges) = shared_list_and_array(29);
-    assert_eq!(run(n, &edges, 0).idom.to_vec(), dataflow_idom(n, &edges, 0));
-    let (n, edges) = shared_list_and_array(3_000);
-    assert_eq!(run(n, &edges, 0).idom.to_vec(), chk_idom(n, &edges, 0));
-
-    const K: u32 = 200_000;
-    let (n, edges) = shared_list_and_array(K);
-    let (start, out) = csr(n, &edges);
-    let started = Instant::now();
-    let (d, steps) = compute(&start, &out, 0, &Store::Ram, &no_progress, &CancellationToken::new()).unwrap();
-    let elapsed = started.elapsed();
-    let item = |j: u32| (5 + 2 * j) as usize;
-    assert!((0..K).all(|j| d.idom[item(j)] == 0), "every item is held by both collections");
-    let m = edges.len() as u64;
-    let bound = (n as u64 + m) * u64::from(n.ilog2());
-    eprintln!("shared list k={K}: {steps} steps (n={n}, m={m}, bound {bound}), {elapsed:?}");
-    assert!(steps <= bound, "{steps} steps for n={n}, m={m}");
-}
-
-#[test]
-fn deep_chain_has_linear_dominators() {
-    // A small stack proves the algorithm does not recurse along the chain.
-    std::thread::Builder::new()
-        .stack_size(256 << 10)
-        .spawn(|| {
-            const NODES: u32 = 1_000_000;
-            let mut edges: Vec<_> = (1..NODES).map(|v| (v - 1, v)).collect();
-            edges.push((0, NODES - 1));
-            // Makes `eval` compress the whole chain at once.
-            edges.push((NODES - 1, 1));
-            let started = Instant::now();
-            let d = run(NODES as usize, &edges, 0);
-            eprintln!("dominators of a {NODES}-node chain: {:?}", started.elapsed());
-            assert_eq!(d.reachable, NODES);
-            assert_eq!(d.idom[0], 0);
-            assert_eq!(d.idom[NODES as usize - 1], 0);
-            let wrong = (1..NODES - 1).filter(|&v| d.idom[v as usize] != v - 1).count();
-            assert_eq!(wrong, 0);
-        })
-        .unwrap()
-        .join()
-        .unwrap();
-}
@@ -1,26 +0,0 @@
-/// Offsets (`at`) are byte positions in the `.hprof` file.
-#[derive(Debug, thiserror::Error)]
-pub enum HeapError {
-    #[error("the dump ends early at byte {at}")]
-    Truncated { at: u64 },
-    #[error("not a heap dump (no JAVA PROFILE header)")]
-    NotHprof,
-    #[error("unsupported identifier size {0}")]
-    UnsupportedIdSize(u32),
-    #[error("unknown heap sub-record tag {tag:#04x} at byte {at}")]
-    UnknownSubRecord { tag: u8, at: u64 },
-    #[error("unknown value type {ty} at byte {at}")]
-    UnknownType { ty: u8, at: u64 },
-    #[error("class {id:#x} used at byte {at} is not in the dump")]
-    MissingClass { id: u64, at: u64 },
-    #[error("the heap has too many objects to analyze")]
-    TooLarge,
-    #[error("the dump's class and field names are too long; it is not a dump a JVM wrote")]
-    NamesTooLarge,
-    #[error("not enough disk space: {needed} bytes needed, {available} free")]
-    NotEnoughDiskSpace { needed: u64, available: u64 },
-    #[error("cancelled")]
-    Cancelled,
-    #[error("{0}")]
-    Io(#[from] std::io::Error),
-}
@@ -1,34 +0,0 @@
-//! Names of the files an analysis writes into its index directory. They live in one list so a
-//! failed analysis removes exactly these and never the dump or anything else sharing the directory.
-
-pub(crate) const IDS_BITS_FILE: &str = "ids.bits.u64";
-pub(crate) const IDS_WRANK_FILE: &str = "ids.wrank.u32";
-pub(crate) const IDS_TABLE_FILE: &str = "ids.table.u32";
-pub(crate) const IDS_CHUNKS_FILE: &str = "ids.chunks.u32";
-pub(crate) const IDS_SORTED_FILE: &str = "ids.sorted.u64";
-pub(crate) const TYPES_FILE: &str = "types.u32";
-pub(crate) const OFFSETS_FILE: &str = "offsets.u64";
-pub(crate) const IDOM_FILE: &str = "idom.u32";
-pub(crate) const SHALLOW8_FILE: &str = "shallow8.u32";
-pub(crate) const RETAINED_FILE: &str = "retained.u64";
-pub(crate) const KIDS_START_FILE: &str = "kids_start.u32";
-pub(crate) const KIDS_FILE: &str = "kids.u32";
-pub(crate) const GC_PARENT_FILE: &str = "gc_parent.u32";
-pub(crate) const SUMMARY_FILE: &str = "summary.json";
-
-pub(crate) const INDEX_FILES: &[&str] = &[
-    IDS_BITS_FILE,
-    IDS_WRANK_FILE,
-    IDS_TABLE_FILE,
-    IDS_CHUNKS_FILE,
-    IDS_SORTED_FILE,
-    TYPES_FILE,
-    OFFSETS_FILE,
-    IDOM_FILE,
-    SHALLOW8_FILE,
-    RETAINED_FILE,
-    KIDS_START_FILE,
-    KIDS_FILE,
-    GC_PARENT_FILE,
-    SUMMARY_FILE,
-];
@@ -1,274 +0,0 @@
-//! The object graph of a heap dump in CSR form: one node per object, plus a super-root.
-
-mod classes;
-mod link;
-
-use std::collections::hash_map::Entry;
-use std::collections::{HashMap, HashSet};
-
-use ide_core::CancellationToken;
-
-use self::classes::{ClassTable, IdHash};
-use self::link::Linker;
-use crate::column::{Column, Store};
-use crate::error::HeapError;
-use crate::files::{OFFSETS_FILE, TYPES_FILE};
-use crate::hprof::{BasicType, HeapRecord, HeapRootKind, Record, parse_header, scan, scan_segment};
-use crate::ids::{IdMap, IdMapBuilder};
-use crate::progress::{CHECK_EVERY, HeapPhase, Progress};
-
-/// Number of primitive array type slots, one per non-object [`BasicType`].
-pub const PRIM_SLOTS: u32 = 8;
-
-pub struct ClassInfo {
-    pub id: u64,
-    /// The hprof name with `/` turned into `.` (`java.lang.String`, `[Ljava.lang.Object;`).
-    pub name: String,
-    /// Index in [`HeapGraph::classes`]. Chains always end: a super cycle in the dump is cut where it closes.
-    pub super_index: Option<u32>,
-    /// This class's own instance fields, in dump order.
-    pub fields: Vec<(String, BasicType)>,
-    /// `(name, object id)` of reference statics; a null static has object id 0.
-    pub statics: Vec<(String, u64)>,
-    pub static_bytes: u64,
-    /// Index in `fields` of `java.lang.ref.Reference.referent`, on that class only.
-    pub weak_field: Option<usize>,
-}
-
-pub struct HeapGraph {
-    pub ids: IdMap,
-    /// Type slot of each object: class index for instances and object arrays,
-    /// [`Self::class_slot`] for class objects, [`Self::prim_slot`] for primitive arrays.
-    pub types: Column<u32>,
-    /// Array length, 0 for instances and classes.
-    pub lens: Column<u32>,
-    /// File offset of each object's record, for [`crate::record_at`].
-    pub offsets: Column<u64>,
-    /// `n + 2` entries: node `v`'s targets are `out[out_start[v]..out_start[v + 1]]`.
-    pub out_start: Column<u32>,
-    pub out: Column<u32>,
-    /// The super-root, node `n`, with an edge to every rooted object.
-    pub root: u32,
-    /// `(object, kind, thread serial)` of every root record whose object is in the dump.
-    pub roots: Vec<(u32, HeapRootKind, Option<u32>)>,
-    /// Class dumps in dump order, then a synthetic `java.lang.Class` when the dump has none.
-    pub classes: Vec<ClassInfo>,
-    /// Type slot of class objects (`java.lang.Class`).
-    pub class_slot: u32,
-    /// Thread serial → thread object, from `ROOT THREAD OBJECT` records.
-    pub thread_objects: HashMap<u32, u32>,
-    /// `Reference.referent` edges left out of the graph.
-    pub weak_edges_skipped: u64,
-    pub id_size: u8,
-    pub timestamp_ms: u64,
-}
-
-impl HeapGraph {
-    pub fn prim_slot(&self, ty: BasicType) -> u32 {
-        self.classes.len() as u32 + (ty as u32 - BasicType::Boolean as u32)
-    }
-
-    /// The element type of primitive array slot `slot`, or `None` for a class slot.
-    pub fn prim_type(&self, slot: u32) -> Option<BasicType> {
-        let offset = slot.checked_sub(self.classes.len() as u32).filter(|&o| o < PRIM_SLOTS)?;
-        BasicType::from_u8(offset as u8 + BasicType::Boolean as u8)
-    }
-
-    pub fn out_edges(&self, v: u32) -> &[u32] {
-        let v = v as usize;
-        &self.out[self.out_start[v] as usize..self.out_start[v + 1] as usize]
-    }
-}
-
-/// Builds the graph of the dump in `buf`. Strong edges only: `Reference.referent` is counted in
-/// [`HeapGraph::weak_edges_skipped`] instead. `progress` gets `Reading` by bytes, then
-/// `Linking` by objects, starting with `(Linking, 0, objects)` once the object count is known;
-/// an `Err` from it stops the build with that error.
-pub fn build_graph(
-    buf: &[u8],
-    store: &Store,
-    progress: &dyn Fn(HeapPhase, u64, u64) -> Result<(), HeapError>,
-    cancel: &CancellationToken,
-) -> Result<HeapGraph, HeapError> {
-    let progress = Progress::new(progress, cancel);
-    let header = parse_header(buf)?;
-    let id_size = header.id_size;
-    let len = buf.len() as u64;
-
-    // Pass 1: names, classes, roots and every object id.
-    progress.report(HeapPhase::Reading, 0, len)?;
-    let mut names: IdHash<&[u8]> = IdHash::default();
-    let mut class_names: IdHash<u64> = IdHash::default();
-    let mut dumps = Vec::new();
-    let mut class_by_id: IdHash<u32> = IdHash::default();
-    let mut raw_roots = Vec::new();
-    let mut segments = Vec::new();
-    let mut builder = IdMapBuilder::new();
-    let (mut step, mut pos) = (0, header.body_start as u64);
-    scan(buf, &header, &mut |record| {
-        progress.step(step, HeapPhase::Reading, pos, len)?;
-        step += 1;
-        match record {
-            Record::Utf8 { id, text } => {
-                names.insert(id, text);
-            }
-            Record::LoadClass { class_id, name_id } => {
-                class_names.insert(class_id, name_id);
-            }
-            Record::Segment(range) => {
-                pos = range.start as u64;
-                segments.push(range);
-            }
-            Record::Heap { at, record } => {
-                pos = at as u64;
-                match record {
-                    HeapRecord::Root { kind, id, thread_serial } => raw_roots.push((id, kind, thread_serial)),
-                    HeapRecord::Class(dump) => {
-                        builder.insert(dump.id);
-                        if let Entry::Vacant(slot) = class_by_id.entry(dump.id) {
-                            slot.insert(dumps.len() as u32);
-                            dumps.push(dump);
-                        }
-                    }
-                    HeapRecord::Instance { id, .. }
-                    | HeapRecord::ObjectArray { id, .. }
-                    | HeapRecord::PrimitiveArray { id, .. } => builder.insert(id),
-                }
-            }
-        }
-        Ok(())
-    })?;
-    progress.report(HeapPhase::Reading, len, len)?;
-
-    let ids = builder.build(store, cancel)?;
-    let table = classes::resolve(dumps, class_by_id, &names, &class_names, id_size, buf.len())?;
-    drop((names, class_names));
-    let n = ids.len();
-    let objects = u64::from(n);
-    progress.report(HeapPhase::Linking, 0, objects)?;
-
-    let mut roots = Vec::new();
-    let mut root_targets = Vec::new();
-    let mut thread_objects = HashMap::new();
-    let (mut seen_records, mut seen_targets) = (HashSet::new(), HashSet::new());
-    for (i, &(id, kind, serial)) in raw_roots.iter().enumerate() {
-        progress.step(i as u64, HeapPhase::Linking, 0, objects)?;
-        let Some(object) = ids.rank(id).filter(|_| id != 0) else { continue };
-        if seen_records.insert((object, kind as u8, serial)) {
-            roots.push((object, kind, serial));
-        }
-        if seen_targets.insert(object) {
-            root_targets.push(object);
-        }
-        if let (HeapRootKind::ThreadObject, Some(serial)) = (kind, serial) {
-            thread_objects.entry(serial).or_insert(object);
-        }
-    }
-    drop((raw_roots, seen_records, seen_targets));
-
-    let linker = Linker::new(&ids, &table, id_size);
-    let nodes = n as usize;
-    let mut types = store.column::<u32>(TYPES_FILE, nodes, 0)?;
-    let mut lens = store.scratch::<u32>(nodes, 0)?;
-    let mut offsets = store.column::<u64>(OFFSETS_FILE, nodes, 0)?;
-    let mut out_start = store.scratch::<u32>(nodes + 2, 0)?;
-    // Both passes visit every object record once; report them as one walk over the objects.
-    let mut visited = 0u64;
-    let tick = |visited: &mut u64| {
-        let result = progress.step(*visited, HeapPhase::Linking, (*visited / 2).min(objects), objects);
-        *visited += 1;
-        result
-    };
-
-    // Pass 2: node columns and out-degrees, counted into `out_start[v + 1]`.
-    let mut weak_edges_skipped = 0;
-    for segment in &segments {
-        scan_segment(buf, segment.clone(), id_size, &mut |at, record| {
-            let Some(node) = linker.node(at, &record)? else { return Ok(()) };
-            tick(&mut visited)?;
-            let v = node.index as usize;
-            types[v] = node.ty;
-            lens[v] = node.len;
-            offsets[v] = at as u64;
-            let mut degree = 0u64;
-            linker.edges(&record, &mut |_, weak| {
-                if weak {
-                    weak_edges_skipped += 1;
-                } else {
-                    degree += 1;
-                }
-            });
-            let count = &mut out_start[v + 1];
-            *count = u32::try_from(u64::from(*count) + degree).map_err(|_| HeapError::TooLarge)?;
-            Ok(())
-        })?;
-    }
-    out_start[nodes + 1] = u32::try_from(root_targets.len()).map_err(|_| HeapError::TooLarge)?;
-    let edges = accumulate(&mut out_start, cancel)?;
-
-    // Pass 3: `out_start[v]` is node v's write cursor; once filled it holds v's end, so the
-    // column is shifted one slot right to become the starts again.
-    let mut out = store.scratch::<u32>(edges as usize, 0)?;
-    for segment in &segments {
-        scan_segment(buf, segment.clone(), id_size, &mut |at, record| {
-            let Some(node) = linker.node(at, &record)? else { return Ok(()) };
-            tick(&mut visited)?;
-            let v = node.index as usize;
-            let mut cursor = out_start[v] as usize;
-            linker.edges(&record, &mut |target, weak| {
-                if !weak && let Some(slot) = out.get_mut(cursor) {
-                    *slot = target;
-                    cursor += 1;
-                }
-            });
-            out_start[v] = cursor as u32;
-            Ok(())
-        })?;
-    }
-    let first_root_edge = out_start[nodes] as usize;
-    for (slot, &target) in out[first_root_edge..].iter_mut().zip(&root_targets) {
-        *slot = target;
-    }
-    out_start[nodes] = edges;
-    out_start.copy_within(0..nodes + 1, 1);
-    out_start[0] = 0;
-    progress.report(HeapPhase::Linking, objects, objects)?;
-
-    drop(linker);
-    let ClassTable { classes, class_slot, .. } = table;
-    Ok(HeapGraph {
-        ids,
-        types,
-        lens,
-        offsets,
-        out_start,
-        out,
-        root: n,
-        roots,
-        classes,
-        class_slot,
-        thread_objects,
-        weak_edges_skipped,
-        id_size,
-        timestamp_ms: header.timestamp_ms,
-    })
-}
-
-/// Turns per-node counts into running totals in place (`counts[k]` becomes the sum of
-/// `counts[..=k]`) and returns the last one; past `u32::MAX` the graph is `TooLarge`.
-pub(crate) fn accumulate(counts: &mut [u32], cancel: &CancellationToken) -> Result<u32, HeapError> {
-    let mut sum = 0u32;
-    for chunk in counts.chunks_mut(CHECK_EVERY as usize) {
-        if cancel.is_cancelled() {
-            return Err(HeapError::Cancelled);
-        }
-        for count in chunk {
-            sum = sum.checked_add(*count).ok_or(HeapError::TooLarge)?;
-            *count = sum;
-        }
-    }
-    Ok(sum)
-}
-
-#[cfg(test)]
-mod tests;
@@ -1,188 +0,0 @@
-//! Class dumps resolved into [`ClassInfo`]s, plus where the references sit in instance data.
-
-use std::collections::HashMap;
-use std::hash::BuildHasherDefault;
-
-use super::{ClassInfo, PRIM_SLOTS};
-use crate::column::NONE;
-use crate::error::HeapError;
-use crate::hprof::{BasicType, ClassDump};
-use crate::ids::ChunkHasher;
-
-/// Keyed by hprof id (an address).
-pub(super) type IdHash<V> = HashMap<u64, V, BuildHasherDefault<ChunkHasher>>;
-
-const REFERENCE: &str = "java.lang.ref.Reference";
-const JAVA_LANG_CLASS: &str = "java.lang.Class";
-/// Not computed yet, in [`ClassTable::fielded`].
-const UNSET: u32 = NONE - 1;
-
-pub(super) struct ClassTable {
-    pub(super) classes: Vec<ClassInfo>,
-    /// Class id → class index.
-    pub(super) by_id: IdHash<u32>,
-    pub(super) class_slot: u32,
-    /// Per class: `(offset, is the referent)` of each reference field in the class's own part of
-    /// the instance data.
-    pub(super) refs: Vec<Vec<(usize, bool)>>,
-    /// Per class: bytes of its own part of the instance data.
-    pub(super) own_bytes: Vec<usize>,
-    /// Per class: the nearest class up its chain (itself included) whose own part is not empty, or
-    /// `NONE`. Walking these instead of every super keeps a walk bounded by the data it reads.
-    pub(super) fielded: Vec<u32>,
-}
-
-/// The longest name a JVM gives a class or field (a constant pool UTF8 has a `u2` length).
-const MAX_NAME_BYTES: usize = 65_535;
-/// Name bytes a dump may decode beyond 4 per byte of the file.
-const NAME_BUDGET_FLOOR: usize = 64 << 20;
-
-/// Names decoded from the UTF8 records within a budget: every field of every class may name the
-/// same record, so a small crafted file could otherwise ask for terabytes and abort the IDE.
-struct Names<'m, 'b> {
-    records: &'m IdHash<&'b [u8]>,
-    left: usize,
-}
-
-impl Names<'_, '_> {
-    /// Empty for an id with no record.
-    fn text(&mut self, id: u64) -> Result<String, HeapError> {
-        let Some(bytes) = self.records.get(&id) else { return Ok(String::new()) };
-        if bytes.len() > MAX_NAME_BYTES || bytes.len() > self.left {
-            return Err(HeapError::NamesTooLarge);
-        }
-        self.left -= bytes.len();
-        Ok(String::from_utf8_lossy(bytes).into_owned())
-    }
-}
-
-/// `dumps` holds one dump per class id, and `by_id` its position; `names` are the UTF8 records
-/// and `class_names` the LOAD CLASS class id → name id pairs. `file_len` bounds the name bytes.
-pub(super) fn resolve(
-    dumps: Vec<ClassDump>,
-    by_id: IdHash<u32>,
-    names: &IdHash<&[u8]>,
-    class_names: &IdHash<u64>,
-    id_size: u8,
-    file_len: usize,
-) -> Result<ClassTable, HeapError> {
-    // Room for the synthetic java.lang.Class and the primitive slots in a `u32` type id.
-    if dumps.len() > (u32::MAX - PRIM_SLOTS - 1) as usize {
-        return Err(HeapError::TooLarge);
-    }
-    let mut names = Names { records: names, left: file_len.saturating_mul(4).saturating_add(NAME_BUDGET_FLOOR) };
-    let mut supers: Vec<Option<u32>> =
-        dumps.iter().map(|d| if d.super_id == 0 { None } else { by_id.get(&d.super_id).copied() }).collect();
-    cut_super_cycles(&mut supers);
-
-    let mut classes = Vec::with_capacity(dumps.len() + 1);
-    let mut refs = Vec::with_capacity(dumps.len() + 1);
-    let mut own_bytes = Vec::with_capacity(dumps.len() + 1);
-    for (dump, super_index) in dumps.into_iter().zip(supers) {
-        let name = match class_names.get(&dump.id) {
-            Some(&name_id) if names.records.contains_key(&name_id) => names.text(name_id)?.replace('/', "."),
-            _ => format!("{:#x}", dump.id),
-        };
-        let fields =
-            dump.fields.iter().map(|&(n, ty)| Ok((names.text(n)?, ty))).collect::<Result<Vec<_>, HeapError>>()?;
-        let weak_field = if name == REFERENCE {
-            fields.iter().position(|(n, ty)| n == "referent" && *ty == BasicType::Object)
-        } else {
-            None
-        };
-        let mut offset = 0;
-        let mut class_refs = Vec::new();
-        for (k, &(_, ty)) in fields.iter().enumerate() {
-            if ty == BasicType::Object {
-                class_refs.push((offset, weak_field == Some(k)));
-            }
-            offset += ty.hprof_size(id_size);
-        }
-        refs.push(class_refs);
-        own_bytes.push(offset);
-        classes.push(ClassInfo {
-            id: dump.id,
-            name,
-            super_index,
-            fields,
-            statics: dump
-                .statics
-                .iter()
-                .map(|&(n, object)| Ok((names.text(n)?, object)))
-                .collect::<Result<_, HeapError>>()?,
-            static_bytes: dump.static_bytes,
-            weak_field,
-        });
-    }
-
-    let class_slot = match classes.iter().position(|c| c.name == JAVA_LANG_CLASS) {
-        Some(slot) => slot as u32,
-        None => {
-            classes.push(ClassInfo {
-                id: 0,
-                name: JAVA_LANG_CLASS.to_owned(),
-                super_index: None,
-                fields: Vec::new(),
-                statics: Vec::new(),
-                static_bytes: 0,
-                weak_field: None,
-            });
-            refs.push(Vec::new());
-            own_bytes.push(0);
-            classes.len() as u32 - 1
-        }
-    };
-    let fielded = nearest_fielded(&classes, &own_bytes);
-    Ok(ClassTable { classes, by_id, class_slot, refs, own_bytes, fielded })
-}
-
-/// A dump may claim `A extends B extends A`; the edge that closes a cycle is dropped so every
-/// walk up the chain ends. Iterative, so a long chain cannot overflow the stack.
-fn cut_super_cycles(supers: &mut [Option<u32>]) {
-    const NEW: u8 = 0;
-    const ON_PATH: u8 = 1;
-    const DONE: u8 = 2;
-    let mut state = vec![NEW; supers.len()];
-    let mut path = Vec::new();
-    for start in 0..supers.len() {
-        let mut c = start;
-        while state[c] == NEW {
-            state[c] = ON_PATH;
-            path.push(c);
-            match supers[c] {
-                Some(s) if state[s as usize] == ON_PATH => {
-                    supers[c] = None;
-                    break;
-                }
-                Some(s) => c = s as usize,
-                None => break,
-            }
-        }
-        for p in path.drain(..) {
-            state[p] = DONE;
-        }
-    }
-}
-
-fn nearest_fielded(classes: &[ClassInfo], own_bytes: &[usize]) -> Vec<u32> {
-    let mut fielded: Vec<u32> =
-        own_bytes.iter().enumerate().map(|(c, &b)| if b > 0 { c as u32 } else { UNSET }).collect();
-    let mut path = Vec::new();
-    for start in 0..classes.len() {
-        let mut c = start;
-        let found = loop {
-            if fielded[c] != UNSET {
-                break fielded[c];
-            }
-            path.push(c);
-            match classes[c].super_index {
-                Some(s) => c = s as usize,
-                None => break NONE,
-            }
-        };
-        for p in path.drain(..) {
-            fielded[p] = found;
-        }
-    }
-    fielded
-}
@@ -1,107 +0,0 @@
-//! Turns one heap sub-record into its node (index, type, length) and its outgoing edges. Both
-//! linking passes go through here, so the degrees counted in the first match the edges written
-//! in the second.
-
-use super::classes::ClassTable;
-use crate::column::NONE;
-use crate::error::HeapError;
-use crate::hprof::{BasicType, HeapRecord};
-use crate::ids::IdMap;
-
-pub(super) struct Node {
-    pub(super) index: u32,
-    pub(super) ty: u32,
-    pub(super) len: u32,
-}
-
-pub(super) struct Linker<'a> {
-    ids: &'a IdMap,
-    table: &'a ClassTable,
-    /// Per class: the node of its class object, `NONE` for the synthetic `java.lang.Class`.
-    class_objects: Vec<u32>,
-    id_size: u8,
-}
-
-impl<'a> Linker<'a> {
-    pub(super) fn new(ids: &'a IdMap, table: &'a ClassTable, id_size: u8) -> Self {
-        let class_objects =
-            table.classes.iter().map(|c| if c.id == 0 { NONE } else { ids.rank(c.id).unwrap_or(NONE) }).collect();
-        Self { ids, table, class_objects, id_size }
-    }
-
-    /// `None` for root records. `at` is the record's offset, for the error of an instance or array
-    /// whose class is not in the dump.
-    pub(super) fn node(&self, at: usize, record: &HeapRecord<'_>) -> Result<Option<Node>, HeapError> {
-        let class_index = |class_id: u64| {
-            self.table.by_id.get(&class_id).copied().ok_or(HeapError::MissingClass { id: class_id, at: at as u64 })
-        };
-        let (id, ty, len) = match record {
-            HeapRecord::Root { .. } => return Ok(None),
-            HeapRecord::Class(c) => (c.id, self.table.class_slot, 0),
-            HeapRecord::Instance { id, class_id, .. } => (*id, class_index(*class_id)?, 0),
-            HeapRecord::ObjectArray { id, class_id, len, .. } => (*id, class_index(*class_id)?, *len),
-            HeapRecord::PrimitiveArray { id, ty, len, .. } => {
-                let prim_base = self.table.classes.len() as u32;
-                (*id, prim_base + (*ty as u32 - BasicType::Boolean as u32), *len)
-            }
-        };
-        Ok(self.ids.rank(id).map(|index| Node { index, ty, len }))
-    }
-
-    /// Calls `edge(target, is_referent)` for every reference to an object in the dump, in field
-    /// order; `is_referent` marks `Reference.referent`, which callers leave out of the graph.
-    pub(super) fn edges(&self, record: &HeapRecord<'_>, edge: &mut impl FnMut(u32, bool)) {
-        let mut to = |id: u64, weak: bool| {
-            if let Some(target) = self.target(id) {
-                edge(target, weak);
-            }
-        };
-        match record {
-            HeapRecord::Root { .. } | HeapRecord::PrimitiveArray { .. } => {}
-            HeapRecord::Class(c) => {
-                to(c.super_id, false);
-                to(c.loader_id, false);
-                for &(_, object) in &c.statics {
-                    to(object, false);
-                }
-            }
-            HeapRecord::ObjectArray { data, .. } => {
-                for item in data.chunks_exact(usize::from(self.id_size)) {
-                    to(read_id(item, 0, self.id_size).unwrap_or(0), false);
-                }
-            }
-            HeapRecord::Instance { class_id, data, .. } => {
-                let Some(&class) = self.table.by_id.get(class_id) else { return };
-                let mut base = 0;
-                let mut next = self.table.fielded[class as usize];
-                'chain: while next != NONE && base < data.len() {
-                    let c = next as usize;
-                    for &(offset, weak) in &self.table.refs[c] {
-                        let Some(id) = read_id(data, base + offset, self.id_size) else { break 'chain };
-                        to(id, weak);
-                    }
-                    base += self.table.own_bytes[c];
-                    next = self.table.classes[c].super_index.map_or(NONE, |s| self.table.fielded[s as usize]);
-                }
-                let object = self.class_objects[class as usize];
-                if object != NONE {
-                    edge(object, false);
-                }
-            }
-        }
-    }
-
-    /// Id 0 is null; ids not in the dump have no node.
-    fn target(&self, id: u64) -> Option<u32> {
-        if id == 0 { None } else { self.ids.rank(id) }
-    }
-}
-
-/// The big-endian id at `at`, or `None` when `data` ends first.
-fn read_id(data: &[u8], at: usize, id_size: u8) -> Option<u64> {
-    let bytes = data.get(at..at.checked_add(usize::from(id_size))?)?;
-    Some(match *bytes {
-        [a, b, c, d] => u64::from(u32::from_be_bytes([a, b, c, d])),
-        _ => u64::from_be_bytes(bytes.try_into().ok()?),
-    })
-}
@@ -1,479 +0,0 @@
-use std::cell::RefCell;
-
-use proptest::prelude::*;
-
-use super::*;
-use crate::hprof::{HeapRecord, record_at};
-use crate::testing::{HprofWriter, MiniHeap, sample};
-
-const H: u64 = 0x1000;
-const N1: u64 = 0x1100;
-const N2: u64 = 0x1200;
-const N3: u64 = 0x1300;
-const L: u64 = 0x1400;
-const R: u64 = 0x1500;
-const W: u64 = 0x1600;
-const N4: u64 = 0x1700;
-
-fn no_progress(_: HeapPhase, _: u64, _: u64) -> Result<(), HeapError> {
-    Ok(())
-}
-
-fn build(bytes: &[u8]) -> Result<HeapGraph, HeapError> {
-    build_graph(bytes, &Store::Ram, &no_progress, &CancellationToken::new())
-}
-
-fn index(g: &HeapGraph, id: u64) -> u32 {
-    g.ids.rank(id).unwrap_or_else(|| panic!("{id:#x} is not in the graph"))
-}
-
-fn class(g: &HeapGraph, name: &str) -> (u32, u64) {
-    let slot = g.classes.iter().position(|c| c.name == name).unwrap_or_else(|| panic!("no class {name}"));
-    (slot as u32, g.classes[slot].id)
-}
-
-/// Targets of `id`'s edges, as ids, in edge order.
-fn out_of(g: &HeapGraph, id: u64) -> Vec<u64> {
-    g.out_edges(index(g, id)).iter().map(|&t| g.ids.id_at(t)).collect()
-}
-
-fn root_targets(g: &HeapGraph) -> Vec<u64> {
-    g.out_edges(g.root).iter().map(|&t| g.ids.id_at(t)).collect()
-}
-
-fn assert_csr(g: &HeapGraph) {
-    let n = g.ids.len();
-    assert_eq!(g.root, n);
-    assert_eq!(g.out_start.len(), n as usize + 2);
-    assert_eq!(g.out_start[0], 0);
-    assert!(g.out_start.windows(2).all(|w| w[0] <= w[1]), "out_start is not monotone");
-    assert_eq!(g.out_start[n as usize + 1] as usize, g.out.len());
-    assert!(g.out.iter().all(|&t| t < n), "edge to a node outside the objects");
-    assert_eq!((g.types.len(), g.lens.len(), g.offsets.len()), (n as usize, n as usize, n as usize));
-    let slots = g.classes.len() as u32 + PRIM_SLOTS;
-    assert!(g.types.iter().all(|&t| t < slots), "type outside the slots");
-    for c in &g.classes {
-        let mut steps = 0;
-        let mut cursor = c.super_index;
-        while let Some(s) = cursor {
-            steps += 1;
-            assert!(steps <= g.classes.len(), "super chain of {} does not end", c.name);
-            cursor = g.classes[s as usize].super_index;
-        }
-    }
-}
-
-#[test]
-fn edges_follow_fields_and_skip_weak_referents() {
-    let g = build(&sample().bytes()).unwrap();
-    assert_csr(&g);
-    let (_, holder) = class(&g, "Holder");
-    let (_, node) = class(&g, "Node");
-    let (_, weak) = class(&g, "java.lang.ref.WeakReference");
-    assert_eq!(out_of(&g, H), [N1, N2, holder]);
-    assert_eq!(out_of(&g, N1), [N3, node]);
-    assert_eq!(out_of(&g, N3), [L, node]);
-    assert_eq!(out_of(&g, W), [weak]);
-    assert_eq!(out_of(&g, N4), [node]);
-    assert_eq!(out_of(&g, L), Vec::<u64>::new());
-    assert_eq!(g.weak_edges_skipped, 1);
-    let (reference, _) = class(&g, "java.lang.ref.Reference");
-    assert_eq!(g.classes[reference as usize].weak_field, Some(0));
-    assert!(g.classes.iter().filter(|c| c.name != "java.lang.ref.Reference").all(|c| c.weak_field.is_none()));
-}
-
-#[test]
-fn object_arrays_skip_null_and_unknown() {
-    let mut heap = sample();
-    heap.array_of(0x1800, "[Ljava.lang.Object;", &[N2, 0, 0x9990, N1, 0xDEAD_BEEF]);
-    let g = build(&heap.bytes()).unwrap();
-    assert_csr(&g);
-    assert_eq!(out_of(&g, R), [N1]);
-    assert_eq!(out_of(&g, 0x1800), [N2, N1]);
-}
-
-#[test]
-fn super_root_points_at_each_root_once() {
-    let mut heap = sample();
-    heap.root(HeapRootKind::JniGlobal, H).root(HeapRootKind::MonitorUsed, H).root(HeapRootKind::JniLocal, 0x9990);
-    let g = build(&heap.bytes()).unwrap();
-    assert_csr(&g);
-    let targets = root_targets(&g);
-    assert_eq!(targets.iter().filter(|&&t| t == H).count(), 1);
-    assert!(targets.contains(&N3) && targets.contains(&W));
-    assert!(!targets.contains(&N1) && !targets.contains(&R) && !targets.contains(&N4));
-    let classes = g.classes.iter().filter(|c| c.id != 0).count();
-    assert_eq!(targets.len(), 3 + classes, "H, N3, W and every sticky class");
-    let mut sorted = targets.clone();
-    sorted.sort_unstable();
-    sorted.dedup();
-    assert_eq!(sorted.len(), targets.len());
-
-    let h = index(&g, H);
-    let of_h: Vec<_> = g.roots.iter().filter(|r| r.0 == h).map(|r| (r.1, r.2)).collect();
-    assert_eq!(of_h, [(HeapRootKind::JniGlobal, None), (HeapRootKind::MonitorUsed, None)]);
-    assert!(g.roots.contains(&(index(&g, N3), HeapRootKind::JavaFrame, Some(1))));
-    assert!(g.roots.iter().all(|r| r.0 < g.root));
-}
-
-#[test]
-fn class_dump_edges_cover_statics() {
-    let mut w = HprofWriter::new();
-    w.string(1, "java/lang/Object")
-        .load_class(0x100, 1)
-        .class(0x100, 0, &[], &[])
-        .string(2, "Config")
-        .string(3, "INSTANCE")
-        .string(4, "EMPTY")
-        .string(5, "LOST")
-        .load_class(0x200, 2)
-        .class_with_loader(0x200, 0x100, 0x1200, &[], &[(3, N1), (4, 0), (5, 0x9990)])
-        .instance(N1, 0x100, &[])
-        .instance(0x1200, 0x100, &[]);
-    let g = build(&w.finish()).unwrap();
-    assert_csr(&g);
-    assert_eq!(out_of(&g, 0x200), [0x100, 0x1200, N1]);
-    assert_eq!(out_of(&g, 0x100), Vec::<u64>::new());
-    let (config, _) = class(&g, "Config");
-    let info = &g.classes[config as usize];
-    let statics: Vec<_> = info.statics.iter().map(|(n, id)| (n.as_str(), *id)).collect();
-    assert_eq!(statics, [("INSTANCE", N1), ("EMPTY", 0), ("LOST", 0x9990)]);
-    assert_eq!(info.super_index, Some(class(&g, "java.lang.Object").0));
-}
-
-#[test]
-fn missing_class_is_an_error() {
-    let mut w = HprofWriter::new();
-    w.string(1, "java/lang/Object").load_class(0x100, 1).class(0x100, 0, &[], &[]).instance(N1, 0x999, &[]);
-    let bytes = w.finish();
-    let at = instance_offset(&bytes, N1);
-    let err = build(&bytes).err().unwrap();
-    assert!(matches!(err, HeapError::MissingClass { id: 0x999, at: a } if a == at as u64), "{err:?}");
-
-    let mut w = HprofWriter::new();
-    w.obj_array(0x10, 0x999, &[]);
-    assert!(matches!(build(&w.finish()), Err(HeapError::MissingClass { id: 0x999, .. })));
-}
-
-fn instance_offset(bytes: &[u8], id: u64) -> usize {
-    let header = crate::hprof::parse_header(bytes).unwrap();
-    let mut found = None;
-    crate::hprof::scan(bytes, &header, &mut |r| {
-        if let crate::hprof::Record::Heap { at, record: HeapRecord::Instance { id: i, .. } } = r
-            && i == id
-        {
-            found = Some(at);
-        }
-        Ok(())
-    })
-    .unwrap();
-    found.unwrap()
-}
-
-#[test]
-fn cancel_during_linking_returns_cancelled() {
-    let bytes = sample().bytes();
-    let cancelled = CancellationToken::new();
-    cancelled.cancel();
-    let result = build_graph(&bytes, &Store::Ram, &no_progress, &cancelled);
-    assert!(matches!(result, Err(HeapError::Cancelled)));
-
-    let cancel = CancellationToken::new();
-    let phases = RefCell::new(Vec::new());
-    let result = build_graph(
-        &bytes,
-        &Store::Ram,
-        &|phase, done, total| {
-            phases.borrow_mut().push((phase, done, total));
-            if phase == HeapPhase::Linking {
-                cancel.cancel();
-            }
-            Ok(())
-        },
-        &cancel,
-    );
-    assert!(matches!(result, Err(HeapError::Cancelled)));
-    let phases = phases.into_inner();
-    assert_eq!(phases.first(), Some(&(HeapPhase::Reading, 0, bytes.len() as u64)));
-    assert_eq!(phases.last(), Some(&(HeapPhase::Linking, 0, 15)), "stops at the first Linking report");
-}
-
-#[test]
-fn progress_error_stops_the_build() {
-    let bytes = sample().bytes();
-    let fail = |phase, _, total| {
-        if phase == HeapPhase::Linking {
-            Err(HeapError::NotEnoughDiskSpace { needed: total * 90, available: 0 })
-        } else {
-            Ok(())
-        }
-    };
-    let result = build_graph(&bytes, &Store::Ram, &fail, &CancellationToken::new());
-    assert!(matches!(result, Err(HeapError::NotEnoughDiskSpace { needed: 1350, available: 0 })));
-}
-
-#[test]
-fn progress_reads_bytes_then_links_objects() {
-    let bytes = sample().bytes();
-    let phases = RefCell::new(Vec::new());
-    let g = build_graph(
-        &bytes,
-        &Store::Ram,
-        &|phase, done, total| {
-            phases.borrow_mut().push((phase, done, total));
-            Ok(())
-        },
-        &CancellationToken::new(),
-    )
-    .unwrap();
-    let phases = phases.into_inner();
-    let len = bytes.len() as u64;
-    let objects = u64::from(g.root);
-    assert_eq!(objects, 15, "7 classes and 8 objects");
-    assert_eq!(phases.first(), Some(&(HeapPhase::Reading, 0, len)));
-    assert!(phases.contains(&(HeapPhase::Reading, len, len)));
-    let linking: Vec<_> = phases.iter().filter(|p| p.0 == HeapPhase::Linking).collect();
-    assert_eq!(linking.first(), Some(&&(HeapPhase::Linking, 0, objects)));
-    assert_eq!(linking.iter().filter(|p| ***p == (HeapPhase::Linking, 0, objects)).count(), 1, "{linking:?}");
-    assert_eq!(linking.last(), Some(&&(HeapPhase::Linking, objects, objects)));
-    assert!(phases.iter().all(|&(_, done, total)| done <= total));
-}
-
-#[test]
-fn types_lengths_and_offsets() {
-    let bytes = sample().bytes();
-    let g = build(&bytes).unwrap();
-    let (holder, holder_id) = class(&g, "Holder");
-    let (node, _) = class(&g, "Node");
-    let (array, _) = class(&g, "[Ljava.lang.Object;");
-    let (java_lang_class, _) = class(&g, "java.lang.Class");
-    assert_eq!(g.class_slot, java_lang_class);
-    let ty = |id| g.types[index(&g, id) as usize];
-    let len = |id| g.lens[index(&g, id) as usize];
-    assert_eq!([ty(H), ty(N1), ty(R), ty(holder_id)], [holder, node, array, java_lang_class]);
-    assert_eq!(ty(L), g.prim_slot(BasicType::Long));
-    assert_eq!(g.prim_type(ty(L)), Some(BasicType::Long));
-    assert_eq!(g.prim_type(holder), None);
-    assert_eq!(g.prim_type(g.classes.len() as u32 + PRIM_SLOTS), None);
-    assert_eq!(g.prim_slot(BasicType::Boolean), g.classes.len() as u32);
-    assert_eq!(g.prim_slot(BasicType::Long), g.classes.len() as u32 + PRIM_SLOTS - 1);
-    assert_eq!([len(H), len(L), len(R), len(holder_id)], [0, 2, 3, 0]);
-    for i in 0..g.root {
-        let id = match record_at(&bytes, g.offsets[i as usize] as usize, g.id_size).unwrap() {
-            HeapRecord::Class(c) => c.id,
-            HeapRecord::Instance { id, .. } | HeapRecord::ObjectArray { id, .. } => id,
-            HeapRecord::PrimitiveArray { id, .. } => id,
-            other => panic!("offset of object {i} points at {other:?}"),
-        };
-        assert_eq!(id, g.ids.id_at(i));
-    }
-    assert_eq!((g.id_size, g.timestamp_ms), (8, 1_700_000_000_000));
-    let holder_info = &g.classes[holder as usize];
-    let fields: Vec<_> = holder_info.fields.iter().map(|(n, t)| (n.as_str(), *t)).collect();
-    assert_eq!(fields, [("a", BasicType::Object), ("b", BasicType::Object)]);
-    assert_eq!(holder_info.super_index, Some(class(&g, "java.lang.Object").0));
-    assert_eq!(g.classes[class(&g, "java.lang.Object").0 as usize].super_index, None);
-}
-
-#[test]
-fn dump_without_java_lang_class_gets_a_synthetic_slot() {
-    let mut w = HprofWriter::new();
-    w.string(1, "java/lang/Object").load_class(0x100, 1).class(0x100, 0, &[], &[]).instance(N1, 0x100, &[]);
-    let g = build(&w.finish()).unwrap();
-    assert_csr(&g);
-    assert_eq!(g.classes.len(), 2);
-    let synthetic = &g.classes[g.class_slot as usize];
-    assert_eq!((synthetic.id, synthetic.name.as_str(), synthetic.super_index), (0, "java.lang.Class", None));
-    assert_eq!(g.types[index(&g, 0x100) as usize], g.class_slot);
-    assert_eq!(g.types[index(&g, N1) as usize], 0);
-}
-
-#[test]
-fn classes_without_a_name_record_get_their_address() {
-    let mut w = HprofWriter::new();
-    w.class(0x100, 0, &[(9, BasicType::Object)], &[])
-        .instance(N1, 0x100, &N2.to_be_bytes())
-        .instance(N2, 0x100, &[0; 8]);
-    let g = build(&w.finish()).unwrap();
-    assert_eq!(g.classes[0].name, "0x100");
-    assert_eq!(g.classes[0].fields, [(String::new(), BasicType::Object)]);
-    assert_eq!(out_of(&g, N1), [N2, 0x100]);
-}
-
-#[test]
-fn thread_objects_map_serials_to_threads() {
-    let mut heap = sample();
-    heap.class("java.lang.Thread", Some("java.lang.Object"), &[])
-        .object(0x2000, "java.lang.Thread", &[])
-        .object(0x2100, "java.lang.Thread", &[])
-        .root_in_thread(HeapRootKind::ThreadObject, 0x2000, 1)
-        .root_in_thread(HeapRootKind::ThreadObject, 0x2100, 7)
-        .root_in_thread(HeapRootKind::ThreadObject, 0x9990, 9);
-    let g = build(&heap.bytes()).unwrap();
-    let expected: HashMap<u32, u32> = [(1, index(&g, 0x2000)), (7, index(&g, 0x2100))].into();
-    assert_eq!(g.thread_objects, expected);
-    assert!(g.roots.contains(&(index(&g, 0x2100), HeapRootKind::ThreadObject, Some(7))));
-}
-
-#[test]
-fn inherited_fields_follow_the_class_first_layout() {
-    let mut heap = MiniHeap::new();
-    heap.class("A", Some("java.lang.Object"), &[("a", BasicType::Object), ("n", BasicType::Int)])
-        .class("Empty", Some("A"), &[])
-        .class("B", Some("Empty"), &[("flag", BasicType::Byte), ("b", BasicType::Object)])
-        .object(0x10, "B", &[("a", 0x20), ("b", 0x30), ("flag", 1)])
-        .object(0x20, "A", &[])
-        .object(0x30, "A", &[]);
-    let g = build(&heap.bytes()).unwrap();
-    assert_csr(&g);
-    assert_eq!(out_of(&g, 0x10), [0x30, 0x20, class(&g, "B").1]);
-}
-
-#[test]
-fn super_class_cycles_are_cut() {
-    let mut w = HprofWriter::new();
-    w.string(1, "A")
-        .string(2, "B")
-        .string(3, "S")
-        .string(4, "f")
-        .load_class(0x100, 1)
-        .load_class(0x200, 2)
-        .load_class(0x300, 3)
-        .class(0x100, 0x200, &[(4, BasicType::Object)], &[])
-        .class(0x200, 0x100, &[(4, BasicType::Object)], &[])
-        .class(0x300, 0x300, &[], &[])
-        .instance(0x10, 0x100, &[[0; 7].as_slice(), &[0x20], &[0; 7], &[0x30]].concat())
-        .instance(0x20, 0x300, &[])
-        .instance(0x30, 0x300, &[0; 64]);
-    let g = build(&w.finish()).unwrap();
-    assert_csr(&g);
-    assert_eq!(out_of(&g, 0x10), [0x20, 0x30, 0x100]);
-    assert_eq!(out_of(&g, 0x30), [0x300]);
-}
-
-#[test]
-fn short_instance_data_stops_at_the_last_whole_field() {
-    let mut w = HprofWriter::new();
-    w.string(1, "P")
-        .string(2, "x")
-        .load_class(0x100, 1)
-        .class(0x100, 0, &[(2, BasicType::Object), (2, BasicType::Object)], &[])
-        .instance(0x10, 0x100, &[[0; 7].as_slice(), &[0x20], &[0; 5]].concat())
-        .instance(0x20, 0x100, &[]);
-    let g = build(&w.finish()).unwrap();
-    assert_csr(&g);
-    assert_eq!(out_of(&g, 0x10), [0x20, 0x100]);
-}
-
-#[test]
-fn id_size_4_dump_links() {
-    let mut w = HprofWriter::with_id_size(4);
-    w.string(1, "Node")
-        .string(2, "next")
-        .load_class(0x100, 1)
-        .class(0x100, 0, &[(2, BasicType::Object)], &[(2, 0x20)])
-        .instance(0x10, 0x100, &0x20u32.to_be_bytes())
-        .instance(0x20, 0x100, &[0; 4])
-        .obj_array(0x30, 0x100, &[0x10, 0, 0x20])
-        .root(HeapRootKind::JniGlobal, 0x30);
-    let g = build(&w.finish()).unwrap();
-    assert_csr(&g);
-    assert_eq!(g.id_size, 4);
-    assert_eq!(out_of(&g, 0x10), [0x20, 0x100]);
-    assert_eq!(out_of(&g, 0x30), [0x10, 0x20]);
-    assert_eq!(out_of(&g, 0x100), [0x20]);
-    assert_eq!(root_targets(&g), [0x30]);
-}
-
-#[test]
-fn dir_store_keeps_types_and_offsets_only() {
-    let dir = tempfile::tempdir().unwrap();
-    // The id map's own files (`ids.*`) depend on its layout; MiniHeap's class ids are unaligned.
-    let names = || {
-        let mut names: Vec<_> = std::fs::read_dir(dir.path())
-            .unwrap()
-            .map(|e| e.unwrap().file_name().into_string().unwrap())
-            .filter(|name| !name.starts_with("ids."))
-            .collect();
-        names.sort();
-        names
-    };
-    let g =
-        build_graph(&sample().bytes(), &Store::Dir(dir.path().to_path_buf()), &no_progress, &CancellationToken::new())
-            .unwrap();
-    assert_eq!(out_of(&g, H).len(), 3);
-    let kept = ["offsets.u64", "types.u32"];
-    assert!(dir.path().join("ids.sorted.u64").exists());
-    #[cfg(unix)]
-    assert_eq!(names(), kept);
-    drop(g);
-    assert_eq!(names(), kept);
-}
-
-#[test]
-fn empty_dump_has_only_the_super_root() {
-    let g = build(&HprofWriter::new().finish()).unwrap();
-    assert_csr(&g);
-    assert_eq!((g.root, g.out.len(), g.classes.len()), (0, 0, 1));
-    assert_eq!(g.class_slot, 0);
-}
-
-#[test]
-fn edge_count_past_u32_is_too_large() {
-    let cancel = CancellationToken::new();
-    let mut counts = [0, 2, 0, 3, 1];
-    assert_eq!(accumulate(&mut counts, &cancel).unwrap(), 6);
-    assert_eq!(counts, [0, 2, 2, 5, 6]);
-    let mut full = [0, u32::MAX - 1, 1];
-    assert_eq!(accumulate(&mut full, &cancel).unwrap(), u32::MAX);
-    let mut over = [0, u32::MAX, 1];
-    assert!(matches!(accumulate(&mut over, &cancel), Err(HeapError::TooLarge)));
-    cancel.cancel();
-    assert!(matches!(accumulate(&mut [0, 1], &cancel), Err(HeapError::Cancelled)));
-}
-
-/// A class with `fields` instance fields, every one named by the same `name_len`-byte UTF8 record.
-fn shared_long_field_names(name_len: usize, fields: usize) -> Vec<u8> {
-    let mut w = HprofWriter::new();
-    let long = "f".repeat(name_len);
-    w.string(1, "java/lang/Object").load_class(0x100, 1).class(0x100, 0, &[], &[]);
-    w.string(2, "Wide").string(3, &long).load_class(0x200, 2);
-    w.class(0x200, 0x100, &vec![(3, BasicType::Int); fields], &[]);
-    w.finish()
-}
-
-#[test]
-fn names_that_would_decode_far_larger_than_the_file_are_refused() {
-    // 128 MiB of names from a file of about 70 KB.
-    let bytes = shared_long_field_names(32 << 10, 4000);
-    assert!(bytes.len() < 100 << 10, "{}", bytes.len());
-    let err = build(&bytes).err().expect("refused");
-    assert!(matches!(err, HeapError::NamesTooLarge), "{err:?}");
-}
-
-#[test]
-fn a_name_longer_than_the_jvm_allows_is_refused() {
-    let mut w = HprofWriter::new();
-    w.string(1, &"C".repeat(70_000)).load_class(0x100, 1).class(0x100, 0, &[], &[]);
-    assert!(matches!(build(&w.finish()), Err(HeapError::NamesTooLarge)));
-}
-
-#[test]
-fn real_sized_names_shared_by_many_fields_are_fine() {
-    let g = build(&shared_long_field_names(40, 4000)).unwrap();
-    assert_eq!(g.classes[class(&g, "Wide").0 as usize].fields.len(), 4000);
-}
-
-proptest! {
-    #[test]
-    fn build_graph_never_panics_on_mutated_dumps(flips in proptest::collection::vec((0usize..4096, any::<u8>()), 1..12)) {
-        let mut bytes = sample().bytes();
-        for (pos, value) in flips {
-            let at = pos % bytes.len();
-            bytes[at] = value;
-        }
-        if let Ok(g) = build(&bytes) {
-            assert_csr(&g);
-        }
-    }
-}
@@ -1,945 +0,0 @@
-//! Reader for HotSpot `.hprof` heap dumps (format 1.0.1 / 1.0.2, 4- or 8-byte ids).
-
-use std::ops::Range;
-
-use serde::{Deserialize, Serialize};
-
-use crate::error::HeapError;
-use crate::reader::Reader;
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-#[repr(u8)]
-pub enum BasicType {
-    Object = 2,
-    Boolean = 4,
-    Char = 5,
-    Float = 6,
-    Double = 7,
-    Byte = 8,
-    Short = 9,
-    Int = 10,
-    Long = 11,
-}
-
-impl BasicType {
-    pub fn from_u8(v: u8) -> Option<Self> {
-        Some(match v {
-            2 => Self::Object,
-            4 => Self::Boolean,
-            5 => Self::Char,
-            6 => Self::Float,
-            7 => Self::Double,
-            8 => Self::Byte,
-            9 => Self::Short,
-            10 => Self::Int,
-            11 => Self::Long,
-            _ => return None,
-        })
-    }
-
-    /// Bytes one value takes in the dump; `id_size` is the dump's identifier size.
-    pub fn hprof_size(self, id_size: u8) -> usize {
-        match self {
-            Self::Object => usize::from(id_size),
-            Self::Boolean | Self::Byte => 1,
-            Self::Char | Self::Short => 2,
-            Self::Float | Self::Int => 4,
-            Self::Double | Self::Long => 8,
-        }
-    }
-
-    /// Bytes one value takes in the JVM heap; `ref_size` is 4 with compressed oops, else 8.
-    pub fn heap_size(self, ref_size: u8) -> u64 {
-        match self {
-            Self::Object => u64::from(ref_size),
-            other => other.hprof_size(ref_size) as u64,
-        }
-    }
-
-    /// JVM class name of an array of this type (`[I`); `Object` arrays have no single name, so
-    /// they report the most general one.
-    pub fn array_name(self) -> &'static str {
-        match self {
-            Self::Object => "[Ljava.lang.Object;",
-            Self::Boolean => "[Z",
-            Self::Char => "[C",
-            Self::Float => "[F",
-            Self::Double => "[D",
-            Self::Byte => "[B",
-            Self::Short => "[S",
-            Self::Int => "[I",
-            Self::Long => "[J",
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub enum HeapRootKind {
-    Unknown,
-    JniGlobal,
-    JniLocal,
-    JavaFrame,
-    NativeStack,
-    StickyClass,
-    ThreadBlock,
-    MonitorUsed,
-    ThreadObject,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct HprofHeader {
-    pub version: String,
-    pub id_size: u8,
-    pub timestamp_ms: u64,
-    /// Offset of the first record.
-    pub body_start: usize,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct ClassDump {
-    pub id: u64,
-    pub super_id: u64,
-    pub loader_id: u64,
-    /// `(name id, object id)` of reference statics; a null static has object id 0.
-    pub statics: Vec<(u64, u64)>,
-    /// Heap bytes taken by the primitive statics.
-    pub static_bytes: u64,
-    /// Instance fields in dump order, `(name id, type)`.
-    pub fields: Vec<(u64, BasicType)>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum HeapRecord<'a> {
-    /// `thread_serial` is present for the kinds that carry one.
-    Root {
-        kind: HeapRootKind,
-        id: u64,
-        thread_serial: Option<u32>,
-    },
-    Class(ClassDump),
-    /// `data` is the field values, class first, then each superclass.
-    Instance {
-        id: u64,
-        class_id: u64,
-        data: &'a [u8],
-    },
-    /// `data` is `len` ids.
-    ObjectArray {
-        id: u64,
-        class_id: u64,
-        len: u32,
-        data: &'a [u8],
-    },
-    /// `data` is `len` big-endian elements.
-    PrimitiveArray {
-        id: u64,
-        ty: BasicType,
-        len: u32,
-        data: &'a [u8],
-    },
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum Record<'a> {
-    Utf8 {
-        id: u64,
-        text: &'a [u8],
-    },
-    LoadClass {
-        class_id: u64,
-        name_id: u64,
-    },
-    /// Byte range of a heap-dump segment's sub-records; its contents follow as `Heap` records.
-    Segment(Range<usize>),
-    /// `at` is the offset of the sub-record's tag, for [`record_at`].
-    Heap {
-        at: usize,
-        record: HeapRecord<'a>,
-    },
-}
-
-const MAGIC_1_0_2: &[u8] = b"JAVA PROFILE 1.0.2\0";
-const MAGIC_1_0_1: &[u8] = b"JAVA PROFILE 1.0.1\0";
-
-const TAG_UTF8: u8 = 0x01;
-const TAG_LOAD_CLASS: u8 = 0x02;
-const TAG_HEAP_DUMP: u8 = 0x0C;
-const TAG_HEAP_DUMP_SEGMENT: u8 = 0x1C;
-const TAG_HEAP_DUMP_END: u8 = 0x2C;
-/// Tag (u1), timestamp (u4) and body length (u4).
-const RECORD_HEADER_LEN: usize = 9;
-
-fn check_id_size(id_size: u8) -> Result<(), HeapError> {
-    match id_size {
-        4 | 8 => Ok(()),
-        other => Err(HeapError::UnsupportedIdSize(u32::from(other))),
-    }
-}
-
-fn truncated(buf: &[u8]) -> HeapError {
-    HeapError::Truncated { at: buf.len() as u64 }
-}
-
-pub fn parse_header(buf: &[u8]) -> Result<HprofHeader, HeapError> {
-    let magic =
-        [MAGIC_1_0_2, MAGIC_1_0_1].into_iter().find(|magic| buf.starts_with(magic)).ok_or(HeapError::NotHprof)?;
-    let mut r = Reader::new(buf, magic.len(), 8);
-    let id_size = r.u4()?;
-    let id_size = u8::try_from(id_size).map_err(|_| HeapError::UnsupportedIdSize(id_size))?;
-    check_id_size(id_size)?;
-    let timestamp_ms = r.u8()?;
-    let version = String::from_utf8_lossy(&magic[..magic.len() - 1]).into_owned();
-    Ok(HprofHeader { version, id_size, timestamp_ms, body_start: r.pos() })
-}
-
-/// Walks every top-level record and, for heap-dump segments, the sub-records inside them.
-/// A record whose length runs past the end of `buf` is `Truncated`, and so are segments that no
-/// HEAP DUMP END follows: HotSpot writes whole segments, so a dump it did not finish ends after one.
-pub fn scan<'a>(
-    buf: &'a [u8],
-    header: &HprofHeader,
-    visit: &mut dyn FnMut(Record<'a>) -> Result<(), HeapError>,
-) -> Result<(), HeapError> {
-    let id_size = header.id_size;
-    check_id_size(id_size)?;
-    if header.body_start > buf.len() {
-        return Err(truncated(buf));
-    }
-    let mut pos = header.body_start;
-    let mut unended_segments = false;
-    while pos < buf.len() {
-        let mut head = Reader::new(buf, pos, id_size);
-        let tag = head.u1()?;
-        head.skip(4)?; // timestamp
-        let len = head.u4()? as usize;
-        let start = pos + RECORD_HEADER_LEN;
-        let end = start.checked_add(len).filter(|&end| end <= buf.len()).ok_or_else(|| truncated(buf))?;
-        let body = &buf[..end];
-        let mut r = Reader::new(body, start, id_size);
-        match tag {
-            TAG_UTF8 => {
-                let id = r.id()?;
-                let text = r.bytes(end - r.pos())?;
-                visit(Record::Utf8 { id, text })?;
-            }
-            TAG_LOAD_CLASS => {
-                r.skip(4)?; // class serial
-                let class_id = r.id()?;
-                r.skip(4)?; // stack trace serial
-                let name_id = r.id()?;
-                visit(Record::LoadClass { class_id, name_id })?;
-            }
-            TAG_HEAP_DUMP | TAG_HEAP_DUMP_SEGMENT => {
-                // A single HEAP DUMP (JDK 8, under 2 GB) has no end record.
-                unended_segments |= tag == TAG_HEAP_DUMP_SEGMENT;
-                visit(Record::Segment(start..end))?;
-                walk_segment(buf, start..end, id_size, &mut |at, record| visit(Record::Heap { at, record }))?;
-            }
-            TAG_HEAP_DUMP_END => unended_segments = false,
-            _ => {}
-        }
-        pos = end;
-    }
-    if unended_segments {
-        return Err(truncated(buf));
-    }
-    Ok(())
-}
-
-/// Visits the sub-records of one segment (the range from [`Record::Segment`]) with their offsets.
-/// The last sub-record must end exactly at the segment's end.
-pub fn scan_segment<'a>(
-    buf: &'a [u8],
-    segment: Range<usize>,
-    id_size: u8,
-    visit: &mut dyn FnMut(usize, HeapRecord<'a>) -> Result<(), HeapError>,
-) -> Result<(), HeapError> {
-    check_id_size(id_size)?;
-    walk_segment(buf, segment, id_size, visit)
-}
-
-fn walk_segment<'a>(
-    buf: &'a [u8],
-    segment: Range<usize>,
-    id_size: u8,
-    visit: &mut dyn FnMut(usize, HeapRecord<'a>) -> Result<(), HeapError>,
-) -> Result<(), HeapError> {
-    if segment.start > segment.end || segment.end > buf.len() {
-        return Err(truncated(buf));
-    }
-    let mut r = Reader::new(&buf[..segment.end], segment.start, id_size);
-    while r.pos() < segment.end {
-        let at = r.pos();
-        let record = read_sub_record(&mut r)?;
-        visit(at, record)?;
-    }
-    Ok(())
-}
-
-/// Reads the sub-record whose tag is at `at`, as given by [`Record::Heap`].
-pub fn record_at(buf: &[u8], at: usize, id_size: u8) -> Result<HeapRecord<'_>, HeapError> {
-    check_id_size(id_size)?;
-    read_sub_record(&mut Reader::new(buf, at, id_size))
-}
-
-fn read_sub_record<'a>(r: &mut Reader<'a>) -> Result<HeapRecord<'a>, HeapError> {
-    let at = r.pos();
-    let tag = r.u1()?;
-    // (kind, carries a thread serial, bytes after it)
-    let root = match tag {
-        0xFF => Some((HeapRootKind::Unknown, false, 0)),
-        0x01 => Some((HeapRootKind::JniGlobal, false, usize::from(r.id_size()))),
-        0x02 => Some((HeapRootKind::JniLocal, true, 4)),
-        0x03 => Some((HeapRootKind::JavaFrame, true, 4)),
-        0x04 => Some((HeapRootKind::NativeStack, true, 0)),
-        0x05 => Some((HeapRootKind::StickyClass, false, 0)),
-        0x06 => Some((HeapRootKind::ThreadBlock, true, 0)),
-        0x07 => Some((HeapRootKind::MonitorUsed, false, 0)),
-        0x08 => Some((HeapRootKind::ThreadObject, true, 4)),
-        _ => None,
-    };
-    if let Some((kind, has_serial, trailing)) = root {
-        let id = r.id()?;
-        let thread_serial = if has_serial { Some(r.u4()?) } else { None };
-        r.skip(trailing)?;
-        return Ok(HeapRecord::Root { kind, id, thread_serial });
-    }
-    match tag {
-        0x20 => read_class_dump(r).map(HeapRecord::Class),
-        0x21 => {
-            let id = r.id()?;
-            r.skip(4)?; // stack trace serial
-            let class_id = r.id()?;
-            let len = r.u4()? as usize;
-            Ok(HeapRecord::Instance { id, class_id, data: r.bytes(len)? })
-        }
-        0x22 => {
-            let id = r.id()?;
-            r.skip(4)?;
-            let len = r.u4()?;
-            let class_id = r.id()?;
-            let size = (len as usize).checked_mul(usize::from(r.id_size())).ok_or_else(|| truncated(r.buf()))?;
-            Ok(HeapRecord::ObjectArray { id, class_id, len, data: r.bytes(size)? })
-        }
-        0x23 => {
-            let id = r.id()?;
-            r.skip(4)?;
-            let len = r.u4()?;
-            let ty = read_type(r)?;
-            if ty == BasicType::Object {
-                return Err(HeapError::UnknownType { ty: ty as u8, at: (r.pos() - 1) as u64 });
-            }
-            let size = (len as usize).checked_mul(ty.hprof_size(r.id_size())).ok_or_else(|| truncated(r.buf()))?;
-            Ok(HeapRecord::PrimitiveArray { id, ty, len, data: r.bytes(size)? })
-        }
-        tag => Err(HeapError::UnknownSubRecord { tag, at: at as u64 }),
-    }
-}
-
-fn read_type(r: &mut Reader<'_>) -> Result<BasicType, HeapError> {
-    let at = r.pos();
-    let ty = r.u1()?;
-    BasicType::from_u8(ty).ok_or(HeapError::UnknownType { ty, at: at as u64 })
-}
-
-fn read_class_dump(r: &mut Reader<'_>) -> Result<ClassDump, HeapError> {
-    let id_size = r.id_size();
-    let id = r.id()?;
-    r.skip(4)?; // stack trace serial
-    let super_id = r.id()?;
-    let loader_id = r.id()?;
-    r.skip(4 * usize::from(id_size))?; // signers, protection domain, 2 reserved
-    r.skip(4)?; // instance size
-
-    for _ in 0..r.u2()? {
-        r.skip(2)?; // constant pool index
-        let ty = read_type(r)?;
-        r.skip(ty.hprof_size(id_size))?;
-    }
-
-    let mut statics = Vec::new();
-    let mut static_bytes = 0;
-    for _ in 0..r.u2()? {
-        let name = r.id()?;
-        let ty = read_type(r)?;
-        if ty == BasicType::Object {
-            statics.push((name, r.id()?));
-        } else {
-            r.skip(ty.hprof_size(id_size))?;
-            static_bytes += ty.heap_size(id_size);
-        }
-    }
-
-    let mut fields = Vec::new();
-    for _ in 0..r.u2()? {
-        let name = r.id()?;
-        fields.push((name, read_type(r)?));
-    }
-    Ok(ClassDump { id, super_id, loader_id, statics, static_bytes, fields })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::testing::{HprofWriter, MiniHeap};
-    use proptest::prelude::*;
-
-    fn collect(bytes: &[u8]) -> Result<Vec<Record<'_>>, HeapError> {
-        let header = parse_header(bytes)?;
-        let mut out = Vec::new();
-        scan(bytes, &header, &mut |r| {
-            out.push(r);
-            Ok(())
-        })?;
-        Ok(out)
-    }
-
-    fn segment_of(bytes: &[u8]) -> Range<usize> {
-        collect(bytes)
-            .unwrap()
-            .into_iter()
-            .find_map(|r| if let Record::Segment(s) = r { Some(s) } else { None })
-            .expect("a segment")
-    }
-
-    fn all_kinds(w: &mut HprofWriter) {
-        w.string(1, "Node")
-            .string(2, "next")
-            .load_class(0x100, 1)
-            .class(0x100, 0, &[(2, BasicType::Object), (3, BasicType::Long)], &[(2, 0x10)])
-            .instance(0x10, 0x100, &[0u8; 16])
-            .obj_array(0x20, 0x100, &[0x10, 0])
-            .prim_array(0x30, BasicType::Int, 3)
-            .root(HeapRootKind::JavaFrame, 0x10)
-            .root(HeapRootKind::StickyClass, 0x100);
-    }
-
-    #[test]
-    fn parses_header() {
-        let header = parse_header(&MiniHeap::new().bytes()).unwrap();
-        assert_eq!((header.version.as_str(), header.id_size, header.body_start), ("JAVA PROFILE 1.0.2", 8, 31));
-
-        let mut old = b"JAVA PROFILE 1.0.1\0".to_vec();
-        old.extend_from_slice(&[0, 0, 0, 4, 0, 0, 0, 1, 0, 0, 0, 2]);
-        let header = parse_header(&old).unwrap();
-        assert_eq!(
-            (header.version.as_str(), header.id_size, header.timestamp_ms),
-            ("JAVA PROFILE 1.0.1", 4, (1 << 32) + 2)
-        );
-
-        let bad_size = b"JAVA PROFILE 1.0.2\0\0\0\0\x03\0\0\0\0\0\0\0\0";
-        assert!(matches!(parse_header(bad_size), Err(HeapError::UnsupportedIdSize(3))));
-        assert!(matches!(parse_header(b"GIF89a"), Err(HeapError::NotHprof)));
-        assert!(matches!(parse_header(b""), Err(HeapError::NotHprof)));
-        assert!(matches!(parse_header(b"JAVA PROFILE 1.0.3\0\0\0\0\x08"), Err(HeapError::NotHprof)));
-        assert!(matches!(parse_header(b"JAVA PROFILE 1.0.2\0\0\0"), Err(HeapError::Truncated { at: 21 })));
-    }
-
-    #[test]
-    fn scans_every_record_kind() {
-        let mut w = HprofWriter::new();
-        all_kinds(&mut w);
-        let bytes = w.finish();
-        let records = collect(&bytes).unwrap();
-
-        let (mut utf8, mut loads, mut segments) = (0, 0, 0);
-        let (mut classes, mut instances, mut obj_arrays, mut prim_arrays, mut roots) = (0, 0, 0, 0, 0);
-        for record in &records {
-            match record {
-                Record::Utf8 { .. } => utf8 += 1,
-                Record::LoadClass { class_id, name_id } => {
-                    loads += 1;
-                    assert_eq!((*class_id, *name_id), (0x100, 1));
-                }
-                Record::Segment(_) => segments += 1,
-                Record::Heap { record, .. } => match record {
-                    HeapRecord::Class(c) => {
-                        classes += 1;
-                        assert_eq!((c.id, c.super_id, c.loader_id), (0x100, 0, 0));
-                        assert_eq!(c.statics, [(2, 0x10)]);
-                        assert_eq!(c.fields, [(2, BasicType::Object), (3, BasicType::Long)]);
-                    }
-                    HeapRecord::Instance { id, class_id, data } => {
-                        instances += 1;
-                        assert_eq!((*id, *class_id, data.len()), (0x10, 0x100, 16));
-                    }
-                    HeapRecord::ObjectArray { id, class_id, len, data } => {
-                        obj_arrays += 1;
-                        assert_eq!((*id, *class_id, *len, data.len()), (0x20, 0x100, 2, 16));
-                    }
-                    HeapRecord::PrimitiveArray { id, ty, len, data } => {
-                        prim_arrays += 1;
-                        assert_eq!((*id, *ty, *len, data.len()), (0x30, BasicType::Int, 3, 12));
-                    }
-                    HeapRecord::Root { kind, id, thread_serial } => {
-                        roots += 1;
-                        match kind {
-                            HeapRootKind::JavaFrame => assert_eq!((*id, *thread_serial), (0x10, Some(1))),
-                            HeapRootKind::StickyClass => assert_eq!((*id, *thread_serial), (0x100, None)),
-                            other => panic!("unexpected root {other:?}"),
-                        }
-                    }
-                },
-            }
-        }
-        assert_eq!((utf8, loads, segments), (2, 1, 1));
-        assert_eq!((classes, instances, obj_arrays, prim_arrays, roots), (1, 1, 1, 1, 2));
-        assert!(matches!(&records[3], Record::Segment(s) if s.end <= bytes.len()), "segment precedes its contents");
-    }
-
-    #[test]
-    fn root_kinds_carry_the_thread_serial_they_have() {
-        let kinds = [
-            (HeapRootKind::Unknown, false),
-            (HeapRootKind::JniGlobal, false),
-            (HeapRootKind::JniLocal, true),
-            (HeapRootKind::JavaFrame, true),
-            (HeapRootKind::NativeStack, true),
-            (HeapRootKind::StickyClass, false),
-            (HeapRootKind::ThreadBlock, true),
-            (HeapRootKind::MonitorUsed, false),
-            (HeapRootKind::ThreadObject, true),
-        ];
-        let mut w = HprofWriter::new();
-        for (i, (kind, _)) in kinds.iter().enumerate() {
-            w.root_in_thread(*kind, 0x40 + i as u64, 7);
-            w.root(*kind, 0x80 + i as u64);
-        }
-        let bytes = w.finish();
-        let mut seen = Vec::new();
-        for r in collect(&bytes).unwrap() {
-            if let Record::Heap { record: HeapRecord::Root { kind, id, thread_serial }, .. } = r {
-                seen.push((kind, id, thread_serial));
-            }
-        }
-        assert_eq!(seen.len(), kinds.len() * 2);
-        for (i, (kind, carries)) in kinds.iter().enumerate() {
-            let explicit = seen[2 * i];
-            let default = seen[2 * i + 1];
-            assert_eq!(explicit, (*kind, 0x40 + i as u64, carries.then_some(7)));
-            assert_eq!(default, (*kind, 0x80 + i as u64, carries.then_some(1)));
-        }
-    }
-
-    #[test]
-    fn primitive_arrays_expose_their_contents() {
-        let mut w = HprofWriter::new();
-        w.prim_bytes(0x1, BasicType::Char, &[0, b'h', 0, 0xE9]).prim_bytes(0x2, BasicType::Byte, b"v42");
-        let bytes = w.finish();
-        let arrays: Vec<_> = collect(&bytes)
-            .unwrap()
-            .into_iter()
-            .filter_map(|r| match r {
-                Record::Heap { record: HeapRecord::PrimitiveArray { ty, len, data, .. }, .. } => {
-                    Some((ty, len, data.to_vec()))
-                }
-                _ => None,
-            })
-            .collect();
-        assert_eq!(arrays, [(BasicType::Char, 2, vec![0, b'h', 0, 0xE9]), (BasicType::Byte, 3, b"v42".to_vec())]);
-    }
-
-    #[test]
-    fn mini_heap_builds_strings_and_defines_object_and_class() {
-        let mut heap = MiniHeap::new();
-        heap.string(0x10, "v42", true).string(0x20, "hé", false);
-        let bytes = heap.bytes();
-        let records = collect(&bytes).unwrap();
-        let names: Vec<_> = records
-            .iter()
-            .filter_map(|r| {
-                if let Record::Utf8 { text, .. } = r { Some(String::from_utf8_lossy(text).into_owned()) } else { None }
-            })
-            .collect();
-        assert!(names.iter().any(|n| n == "java/lang/Object") && names.iter().any(|n| n == "java/lang/Class"));
-        let arrays: Vec<_> = records
-            .iter()
-            .filter_map(|r| match r {
-                Record::Heap { record: HeapRecord::PrimitiveArray { data, .. }, .. } => Some(data.to_vec()),
-                _ => None,
-            })
-            .collect();
-        assert_eq!(arrays, [b"v42".to_vec(), vec![b'h', 0, 0xE9, 0]]);
-        let coders: Vec<_> = records
-            .iter()
-            .filter_map(|r| match r {
-                Record::Heap { record: HeapRecord::Instance { id, data, .. }, .. } => Some((*id, data[8])),
-                _ => None,
-            })
-            .collect();
-        assert_eq!(coders, [(0x10, 0), (0x20, 1)]);
-    }
-
-    #[test]
-    fn mini_heap_lays_out_fields_class_first_then_super() {
-        let mut heap = MiniHeap::new();
-        heap.class("A", Some("java.lang.Object"), &[("a", BasicType::Int)])
-            .class("B", Some("A"), &[("b", BasicType::Object), ("c", BasicType::Byte)])
-            .object(0x10, "B", &[("a", 7), ("b", 0x99), ("c", 0x1FF)]);
-        let bytes = heap.bytes();
-        let data = collect(&bytes)
-            .unwrap()
-            .into_iter()
-            .find_map(|r| match r {
-                Record::Heap { record: HeapRecord::Instance { data, .. }, .. } => Some(data.to_vec()),
-                _ => None,
-            })
-            .unwrap();
-        assert_eq!(data, [0, 0, 0, 0, 0, 0, 0, 0x99, 0xFF, 0, 0, 0, 7]);
-    }
-
-    #[test]
-    fn record_at_reads_back_an_instance() {
-        let mut w = HprofWriter::new();
-        all_kinds(&mut w);
-        let bytes = w.finish();
-        let at = collect(&bytes)
-            .unwrap()
-            .into_iter()
-            .find_map(|r| match r {
-                Record::Heap { at, record: HeapRecord::Instance { .. } } => Some(at),
-                _ => None,
-            })
-            .unwrap();
-        match record_at(&bytes, at, 8).unwrap() {
-            HeapRecord::Instance { id, class_id, data } => assert_eq!((id, class_id, data.len()), (0x10, 0x100, 16)),
-            other => panic!("expected an instance, got {other:?}"),
-        }
-        assert!(matches!(record_at(&bytes, bytes.len(), 8), Err(HeapError::Truncated { .. })));
-        assert!(matches!(record_at(&bytes, at, 3), Err(HeapError::UnsupportedIdSize(3))));
-    }
-
-    #[test]
-    fn scan_segment_visits_the_same_records_scan_does() {
-        let mut w = HprofWriter::new();
-        all_kinds(&mut w);
-        let bytes = w.finish();
-        let from_scan: Vec<_> = collect(&bytes)
-            .unwrap()
-            .into_iter()
-            .filter_map(|r| if let Record::Heap { at, record } = r { Some((at, record)) } else { None })
-            .collect();
-        let mut from_segment = Vec::new();
-        scan_segment(&bytes, segment_of(&bytes), 8, &mut |at, record| {
-            from_segment.push((at, record));
-            Ok(())
-        })
-        .unwrap();
-        assert_eq!(from_scan.len(), 6);
-        assert_eq!(from_scan, from_segment);
-    }
-
-    #[test]
-    fn visitor_errors_stop_the_scan() {
-        let bytes = MiniHeap::new().bytes();
-        let header = parse_header(&bytes).unwrap();
-        let mut calls = 0;
-        let result = scan(&bytes, &header, &mut |_| {
-            calls += 1;
-            Err(HeapError::Cancelled)
-        });
-        assert!(matches!(result, Err(HeapError::Cancelled)));
-        assert_eq!(calls, 1);
-    }
-
-    #[test]
-    fn both_heap_dump_tags_are_segments() {
-        let bytes = MiniHeap::new().bytes();
-        let segment = segment_of(&bytes);
-        let mut old_style = bytes.clone();
-        old_style[segment.start - 9] = 0x0C;
-        assert_eq!(segment_of(&old_style), segment);
-    }
-
-    #[test]
-    fn id_size_4_dump_parses() {
-        let mut w = HprofWriter::with_id_size(4);
-        w.string(1, "Node")
-            .load_class(0x100, 1)
-            .class(0x100, 0, &[(2, BasicType::Object), (3, BasicType::Long)], &[(2, 0x10)])
-            .instance(0x10, 0x100, &[0u8; 12])
-            .obj_array(0x20, 0x100, &[0x10, 0, 0xFFFF_FFFF])
-            .prim_array(0x30, BasicType::Short, 5)
-            .root(HeapRootKind::ThreadObject, 0x10);
-        let bytes = w.finish();
-        let header = parse_header(&bytes).unwrap();
-        assert_eq!((header.id_size, header.body_start), (4, 31));
-        let records: Vec<_> = collect(&bytes)
-            .unwrap()
-            .into_iter()
-            .filter_map(|r| if let Record::Heap { record, .. } = r { Some(record) } else { None })
-            .collect();
-        assert_eq!(records.len(), 5);
-        match &records[0] {
-            HeapRecord::Class(c) => {
-                assert_eq!((c.id, c.statics.as_slice(), c.fields.len()), (0x100, &[(2, 0x10)][..], 2));
-            }
-            other => panic!("expected the class, got {other:?}"),
-        }
-        assert!(matches!(&records[1], HeapRecord::Instance { id: 0x10, class_id: 0x100, data } if data.len() == 12));
-        assert!(
-            matches!(&records[2], HeapRecord::ObjectArray { len: 3, data, .. } if data.len() == 12 && data[8..] == [0xFF; 4])
-        );
-        assert!(
-            matches!(&records[3], HeapRecord::PrimitiveArray { ty: BasicType::Short, len: 5, data, .. } if data.len() == 10)
-        );
-        assert!(matches!(
-            &records[4],
-            HeapRecord::Root { kind: HeapRootKind::ThreadObject, id: 0x10, thread_serial: Some(1) }
-        ));
-    }
-
-    fn push_id(out: &mut Vec<u8>, v: u64) {
-        out.extend_from_slice(&v.to_be_bytes());
-    }
-
-    /// A class dump written by hand: loader, a constant-pool entry, and statics of each shape.
-    fn class_dump_bytes(last_field_type: u8) -> Vec<u8> {
-        let mut b = vec![0x20];
-        push_id(&mut b, 0x500);
-        b.extend_from_slice(&0u32.to_be_bytes());
-        for id in [0x400, 0x77, 0, 0, 0, 0] {
-            push_id(&mut b, id); // super, loader, signers, domain, 2 reserved
-        }
-        b.extend_from_slice(&24u32.to_be_bytes());
-        b.extend_from_slice(&[0, 1, 0, 7, 10, 0, 0, 0, 99]); // constant pool: one int
-        b.extend_from_slice(&[0, 3]);
-        push_id(&mut b, 0xA);
-        b.push(2);
-        push_id(&mut b, 0xBEEF); // object static
-        push_id(&mut b, 0xB);
-        b.push(10);
-        b.extend_from_slice(&5u32.to_be_bytes()); // int static
-        push_id(&mut b, 0xC);
-        b.push(11);
-        b.extend_from_slice(&6u64.to_be_bytes()); // long static
-        b.extend_from_slice(&[0, 2]);
-        push_id(&mut b, 0xD);
-        b.push(2);
-        push_id(&mut b, 0xE);
-        b.push(last_field_type);
-        b
-    }
-
-    #[test]
-    fn class_dump_reads_loader_statics_and_skips_the_constant_pool() {
-        let bytes = class_dump_bytes(11);
-        let HeapRecord::Class(c) = record_at(&bytes, 0, 8).unwrap() else { panic!("expected a class") };
-        assert_eq!((c.id, c.super_id, c.loader_id), (0x500, 0x400, 0x77));
-        assert_eq!(c.statics, [(0xA, 0xBEEF)]);
-        assert_eq!(c.static_bytes, 12);
-        assert_eq!(c.fields, [(0xD, BasicType::Object), (0xE, BasicType::Long)]);
-    }
-
-    #[test]
-    fn unknown_value_type_reports_its_offset() {
-        let bytes = class_dump_bytes(0x63);
-        let err = record_at(&bytes, 0, 8).unwrap_err();
-        assert!(matches!(err, HeapError::UnknownType { ty: 0x63, at } if at == bytes.len() as u64 - 1), "{err:?}");
-    }
-
-    #[test]
-    fn truncated_dump_reports_offset() {
-        let mut bytes = MiniHeap::new().bytes();
-        let body_start = parse_header(&bytes).unwrap().body_start as u64;
-        bytes.truncate(bytes.len() - 5);
-        let err = collect(&bytes).unwrap_err();
-        assert!(matches!(err, HeapError::Truncated { at } if at > body_start && at == bytes.len() as u64), "{err:?}");
-        assert!(err.to_string().contains(&bytes.len().to_string()));
-    }
-
-    /// HotSpot flushes whole segments, so a JVM killed while dumping leaves a file that ends
-    /// right after one, without HEAP DUMP END.
-    #[test]
-    fn a_dump_the_jvm_did_not_finish_ends_early() {
-        let mut bytes = MiniHeap::new().bytes();
-        bytes.truncate(bytes.len() - RECORD_HEADER_LEN);
-        let err = collect(&bytes).unwrap_err();
-        assert!(matches!(err, HeapError::Truncated { at } if at == bytes.len() as u64), "{err:?}");
-        assert!(err.to_string().starts_with("the dump ends early"), "{err}");
-    }
-
-    #[test]
-    fn every_prefix_is_ok_or_truncated_at_its_length() {
-        let mut heap = MiniHeap::new();
-        heap.class("N", Some("java.lang.Object"), &[("next", BasicType::Object)])
-            .object(0x10, "N", &[("next", 0x20)])
-            .string(0x20, "x", true)
-            .root(HeapRootKind::ThreadObject, 0x10);
-        let bytes = heap.bytes();
-        let header = parse_header(&bytes).unwrap();
-        let segment = segment_of(&bytes);
-        for cut in header.body_start..bytes.len() {
-            let prefix = &bytes[..cut];
-            match scan(prefix, &header, &mut |_| Ok(())) {
-                // Only a prefix without heap data is a complete (empty) dump.
-                Ok(()) => assert!(cut < segment.start, "cut at {cut} has heap data but no end"),
-                Err(HeapError::Truncated { at }) => assert_eq!(at, cut as u64, "cut at {cut}"),
-                Err(other) => panic!("cut at {cut}: {other:?}"),
-            }
-        }
-        let past_end = HprofHeader { body_start: bytes.len() + 1, ..header };
-        assert!(matches!(scan(&bytes, &past_end, &mut |_| Ok(())), Err(HeapError::Truncated { .. })));
-    }
-
-    #[test]
-    fn sub_record_overrunning_its_segment_is_truncated() {
-        let mut bytes = MiniHeap::new().bytes();
-        let segment = segment_of(&bytes);
-        let len_at = segment.start - 4;
-        let shrunk = (segment.len() as u32 - 3).to_be_bytes();
-        bytes[len_at..segment.start].copy_from_slice(&shrunk);
-        let err = collect(&bytes).unwrap_err();
-        assert!(matches!(err, HeapError::Truncated { at } if at == segment.end as u64 - 3), "{err:?}");
-    }
-
-    #[test]
-    fn unknown_sub_record_is_an_error() {
-        let mut bytes = MiniHeap::new().bytes();
-        let segment = segment_of(&bytes);
-        bytes[segment.start] = 0x99;
-        let err = collect(&bytes).unwrap_err();
-        assert!(matches!(err, HeapError::UnknownSubRecord { tag: 0x99, at } if at == segment.start as u64), "{err:?}");
-        assert!(err.to_string().contains("0x99"));
-    }
-
-    #[test]
-    fn array_lengths_larger_than_the_dump_do_not_allocate_or_panic() {
-        let mut b = vec![0x23];
-        push_id(&mut b, 1);
-        b.extend_from_slice(&0u32.to_be_bytes());
-        b.extend_from_slice(&u32::MAX.to_be_bytes());
-        b.push(11);
-        assert!(matches!(record_at(&b, 0, 8), Err(HeapError::Truncated { .. })));
-        b[0] = 0x22;
-        assert!(matches!(record_at(&b, 0, 8), Err(HeapError::Truncated { .. })));
-    }
-
-    #[test]
-    fn primitive_array_of_objects_is_an_unknown_type() {
-        let mut b = vec![0x23];
-        push_id(&mut b, 1);
-        b.extend_from_slice(&[0, 0, 0, 0, 0, 0, 0, 0]);
-        b.push(2);
-        assert!(matches!(record_at(&b, 0, 8), Err(HeapError::UnknownType { ty: 2, .. })));
-    }
-
-    #[test]
-    fn basic_type_sizes_and_names() {
-        assert_eq!(BasicType::from_u8(10), Some(BasicType::Int));
-        assert_eq!([0, 1, 3, 12, 255].map(BasicType::from_u8), [None; 5]);
-        assert_eq!((BasicType::Object.hprof_size(4), BasicType::Object.hprof_size(8)), (4, 8));
-        assert_eq!((BasicType::Object.heap_size(4), BasicType::Long.heap_size(4)), (4, 8));
-        assert_eq!((BasicType::Char.hprof_size(8), BasicType::Boolean.heap_size(8)), (2, 1));
-        assert_eq!(
-            (BasicType::Int.array_name(), BasicType::Boolean.array_name(), BasicType::Long.array_name()),
-            ("[I", "[Z", "[J")
-        );
-    }
-
-    fn sample() -> Vec<u8> {
-        let mut heap = MiniHeap::new();
-        heap.class("Node", Some("java.lang.Object"), &[("next", BasicType::Object), ("v", BasicType::Long)])
-            .class("[LNode;", Some("java.lang.Object"), &[])
-            .object(0x10, "Node", &[("next", 0x20), ("v", 5)])
-            .object(0x20, "Node", &[])
-            .array_of(0x30, "[LNode;", &[0x10, 0x20, 0])
-            .prim(0x40, BasicType::Int, 3)
-            .string(0x50, "hello", true)
-            .root(HeapRootKind::ThreadObject, 0x10)
-            .root(HeapRootKind::JniGlobal, 0x30);
-        heap.bytes()
-    }
-
-    fn with_header(id_size: u8, body: &[u8]) -> Vec<u8> {
-        let mut bytes = MAGIC_1_0_2.to_vec();
-        bytes.extend_from_slice(&u32::from(id_size).to_be_bytes());
-        bytes.extend_from_slice(&1_700_000_000_000u64.to_be_bytes());
-        bytes.extend_from_slice(body);
-        bytes
-    }
-
-    proptest! {
-        #[test]
-        fn parser_never_panics(bytes in proptest::collection::vec(any::<u8>(), 0..4096)) {
-            let _ = parse_header(&bytes).and_then(|h| scan(&bytes, &h, &mut |_| Ok(())));
-        }
-
-        /// Random bytes alone fail the magic check, so this puts a valid header in front to make
-        /// `scan` and `scan_segment` run on arbitrary record streams.
-        #[test]
-        fn random_bytes_after_a_valid_header_never_panic(
-            id_size in prop_oneof![Just(4u8), Just(8u8)],
-            body in proptest::collection::vec(any::<u8>(), 0..4096),
-        ) {
-            let bytes = with_header(id_size, &body);
-            let header = parse_header(&bytes).unwrap();
-            prop_assert_eq!(header.id_size, id_size);
-            let _ = scan(&bytes, &header, &mut |_| Ok(()));
-            let _ = scan_segment(&bytes, header.body_start..bytes.len(), id_size, &mut |_, _| Ok(()));
-            for at in header.body_start..bytes.len() {
-                let _ = record_at(&bytes, at, id_size);
-            }
-        }
-
-        /// Same, but every record has a correct length so the random bytes reach the heap-dump
-        /// segments and the sub-record parsers instead of stopping at the first bad length.
-        #[test]
-        fn random_records_after_a_valid_header_never_panic(
-            id_size in prop_oneof![Just(4u8), Just(8u8)],
-            records in proptest::collection::vec(
-                (
-                    prop_oneof![Just(0x01u8), Just(0x02), Just(0x0C), Just(0x1C), Just(0x2C), any::<u8>()],
-                    prop_oneof![
-                        Just(0x20u8), Just(0x21), Just(0x22), Just(0x23), Just(0x01), Just(0x02), Just(0x03),
-                        Just(0x04), Just(0x05), Just(0x06), Just(0x07), Just(0x08), Just(0xFF), any::<u8>()
-                    ],
-                    proptest::collection::vec(any::<u8>(), 0..96),
-                ),
-                0..12,
-            ),
-        ) {
-            let mut body = Vec::new();
-            for (tag, first, rest) in records {
-                let mut record_body = vec![first];
-                record_body.extend_from_slice(&rest);
-                body.push(tag);
-                body.extend_from_slice(&0u32.to_be_bytes());
-                body.extend_from_slice(&(record_body.len() as u32).to_be_bytes());
-                body.extend_from_slice(&record_body);
-            }
-            let bytes = with_header(id_size, &body);
-            let header = parse_header(&bytes).unwrap();
-            let mut segments = Vec::new();
-            let _ = scan(&bytes, &header, &mut |r| {
-                if let Record::Segment(s) = r {
-                    segments.push(s);
-                }
-                Ok(())
-            });
-            for s in segments {
-                let _ = scan_segment(&bytes, s, id_size, &mut |_, _| Ok(()));
-            }
-        }
-
-        #[test]
-        fn mutated_dump_never_panics(flips in proptest::collection::vec((0usize..2048, any::<u8>()), 1..16)) {
-            let pristine = sample();
-            let header = parse_header(&pristine).unwrap();
-            let segment = segment_of(&pristine);
-            let mut bytes = pristine.clone();
-            for (pos, value) in flips {
-                let at = pos % bytes.len();
-                bytes[at] = value;
-            }
-            let _ = scan(&bytes, &header, &mut |_| Ok(()));
-            for id_size in [4, 8] {
-                let _ = scan_segment(&bytes, segment.clone(), id_size, &mut |_, _| Ok(()));
-            }
-            for at in 0..bytes.len() {
-                let _ = record_at(&bytes, at, 8);
-            }
-        }
-    }
-}
@@ -1,327 +0,0 @@
-//! Maps hprof object ids (addresses) to dense `u32` indices in ascending address order.
-//!
-//! Object ids are addresses and objects are at least 8 bytes apart, so one bit per 8-byte slot
-//! ranks ids at about a byte per object. Addresses are grouped in 1 MiB chunks of
-//! [`WORDS_PER_CHUNK`] words; only chunks holding an id get words, and a dense table maps a chunk
-//! to its first word. The rank of an id is the number of set bits before its word plus the set
-//! bits below it in the word. Ids that are not multiples of 8, or that span too wide an address
-//! range for the table, use a sorted array and binary search instead.
-
-mod builder;
-
-pub(crate) use builder::ChunkHasher;
-pub use builder::IdMapBuilder;
-
-use crate::column::{Column, NONE};
-
-const SLOT_SHIFT: u32 = 3;
-const CHUNK_SLOT_BITS: u32 = 17;
-const WORD_BITS: u64 = 64;
-const WORDS_PER_CHUNK: usize = (1 << CHUNK_SLOT_BITS) / WORD_BITS as usize;
-
-// The bit table is matched in hot paths; boxing the big variant would only add
-// an indirection to save stack space `IdMap` never holds by value in bulk.
-#[allow(clippy::large_enum_variant)]
-enum Repr {
-    Bits {
-        /// Chunk number of the first table entry.
-        min_chunk: u64,
-        words: Column<u64>,
-        /// Set bits before each word.
-        wrank: Column<u32>,
-        /// Per chunk from `min_chunk` up: index of its first word, or `NONE` when it has no id.
-        table: Column<u32>,
-        /// Per chunk that has words, in word order: its offset from `min_chunk`.
-        chunk_offsets: Column<u32>,
-        len: u32,
-    },
-    Sorted(Column<u64>),
-}
-
-/// Ids ranked in ascending address order: the index of an object is its position in the order.
-pub struct IdMap {
-    repr: Repr,
-}
-
-impl IdMap {
-    pub fn len(&self) -> u32 {
-        match &self.repr {
-            Repr::Bits { len, .. } => *len,
-            Repr::Sorted(ids) => ids.len() as u32,
-        }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-
-    /// The index of `id`, or `None` when it is not in the map.
-    pub fn rank(&self, id: u64) -> Option<u32> {
-        match &self.repr {
-            Repr::Sorted(ids) => ids.binary_search(&id).ok().map(|r| r as u32),
-            Repr::Bits { min_chunk, words, wrank, table, .. } => {
-                if id & 7 != 0 {
-                    return None;
-                }
-                let slot = id >> SLOT_SHIFT;
-                let offset = (slot >> CHUNK_SLOT_BITS).checked_sub(*min_chunk)?;
-                let first = *table.get(usize::try_from(offset).ok()?)?;
-                if first == NONE {
-                    return None;
-                }
-                let w = first as usize + (slot >> 6) as usize % WORDS_PER_CHUNK;
-                let bit = slot & 63;
-                let word = words[w];
-                if word >> bit & 1 == 0 {
-                    return None;
-                }
-                Some(wrank[w] + (word & ((1u64 << bit) - 1)).count_ones())
-            }
-        }
-    }
-
-    /// The id with index `rank`. Panics when `rank >= len()`.
-    pub fn id_at(&self, rank: u32) -> u64 {
-        match &self.repr {
-            Repr::Sorted(ids) => ids[rank as usize],
-            Repr::Bits { words, wrank, len, .. } => {
-                assert!(rank < *len, "rank {rank} out of range for {len} ids");
-                let w = wrank.partition_point(|&before| before <= rank) - 1;
-                let mut word = words[w];
-                for _ in 0..rank - wrank[w] {
-                    word &= word - 1;
-                }
-                (self.word_first_slot(w) + u64::from(word.trailing_zeros())) << SLOT_SHIFT
-            }
-        }
-    }
-
-    /// All ids in ascending order.
-    pub fn ids(&self) -> impl Iterator<Item = u64> + '_ {
-        Ids { map: self, next: 0, slot_base: 0, rest: 0 }
-    }
-
-    /// Bytes of all the columns, in RAM or on disk.
-    pub fn column_bytes(&self) -> u64 {
-        match &self.repr {
-            Repr::Sorted(ids) => std::mem::size_of_val(&**ids) as u64,
-            Repr::Bits { words, wrank, table, chunk_offsets, .. } => {
-                (std::mem::size_of_val(&**words)
-                    + std::mem::size_of_val(&**wrank)
-                    + std::mem::size_of_val(&**table)
-                    + std::mem::size_of_val(&**chunk_offsets)) as u64
-            }
-        }
-    }
-
-    /// Slot number of bit 0 of word `w` (bitmap layout only).
-    fn word_first_slot(&self, w: usize) -> u64 {
-        let Repr::Bits { min_chunk, chunk_offsets, .. } = &self.repr else {
-            unreachable!("sorted layout has no words")
-        };
-        let chunk = min_chunk + u64::from(chunk_offsets[w / WORDS_PER_CHUNK]);
-        (chunk << CHUNK_SLOT_BITS) + (w % WORDS_PER_CHUNK) as u64 * WORD_BITS
-    }
-}
-
-struct Ids<'a> {
-    map: &'a IdMap,
-    /// Next word (bitmap layout) or next id (sorted layout).
-    next: usize,
-    slot_base: u64,
-    /// Bits of the current word not yielded yet.
-    rest: u64,
-}
-
-impl Iterator for Ids<'_> {
-    type Item = u64;
-
-    fn next(&mut self) -> Option<u64> {
-        match &self.map.repr {
-            Repr::Sorted(ids) => {
-                let id = *ids.get(self.next)?;
-                self.next += 1;
-                Some(id)
-            }
-            Repr::Bits { words, .. } => loop {
-                if self.rest != 0 {
-                    let bit = u64::from(self.rest.trailing_zeros());
-                    self.rest &= self.rest - 1;
-                    return Some((self.slot_base + bit) << SLOT_SHIFT);
-                }
-                self.rest = *words.get(self.next)?;
-                self.slot_base = self.map.word_first_slot(self.next);
-                self.next += 1;
-            },
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use ide_core::CancellationToken;
-
-    use super::*;
-    use crate::column::Store;
-
-    /// Deterministic generator so failures replay; the crate has no `rand`.
-    struct XorShift(u64);
-
-    impl XorShift {
-        fn next(&mut self) -> u64 {
-            self.0 ^= self.0 << 13;
-            self.0 ^= self.0 >> 7;
-            self.0 ^= self.0 << 17;
-            self.0
-        }
-    }
-
-    fn build(ids: &[u64], store: &Store) -> IdMap {
-        let mut builder = IdMapBuilder::new();
-        for &id in ids {
-            builder.insert(id);
-        }
-        builder.build(store, &CancellationToken::new()).unwrap()
-    }
-
-    fn assert_matches_model(map: &IdMap, model: &[u64]) {
-        assert_eq!(map.len() as usize, model.len());
-        assert_eq!(map.ids().collect::<Vec<_>>(), model);
-        for (rank, &id) in model.iter().enumerate() {
-            assert_eq!(map.rank(id), Some(rank as u32), "rank of {id:#x}");
-            assert_eq!(map.id_at(rank as u32), id, "id at {rank}");
-            for near in [id.wrapping_sub(8), id.wrapping_add(8), id.wrapping_add(1), id.wrapping_add(4)] {
-                if model.binary_search(&near).is_err() {
-                    assert_eq!(map.rank(near), None, "{near:#x} was never inserted");
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn rank_follows_address_order() {
-        let map = build(&[0x2000, 0x1000, 0x1010, 0x7_0000_0000], &Store::Ram);
-        assert_eq!(map.len(), 4);
-        assert_eq!(
-            [0x1000, 0x1010, 0x2000, 0x7_0000_0000].map(|id| map.rank(id)),
-            [Some(0), Some(1), Some(2), Some(3)]
-        );
-        assert_eq!(map.rank(0x1008), None);
-        assert_eq!(map.rank(0), None);
-        assert_eq!(map.id_at(2), 0x2000);
-        assert_eq!(map.ids().collect::<Vec<_>>(), [0x1000, 0x1010, 0x2000, 0x7_0000_0000]);
-    }
-
-    #[test]
-    fn unaligned_ids_use_sorted_fallback() {
-        let map = build(&[0x2000, 0x1004, 0x1000, 0x1010, 0x7_0000_0000], &Store::Ram);
-        assert_eq!(
-            [0x1000, 0x1004, 0x1010, 0x2000, 0x7_0000_0000].map(|id| map.rank(id)),
-            [Some(0), Some(1), Some(2), Some(3), Some(4)]
-        );
-        assert_eq!(map.rank(0x1008), None);
-        assert_eq!(map.id_at(1), 0x1004);
-    }
-
-    #[test]
-    fn sparse_wide_span_uses_fallback() {
-        let map = build(&[0x1000 + (1 << 50), 0x1000], &Store::Ram);
-        assert_eq!(map.rank(0x1000), Some(0));
-        assert_eq!(map.rank(0x1000 + (1 << 50)), Some(1));
-        assert_eq!(map.rank(0x1008), None);
-        assert!(map.column_bytes() < 64, "a two-id map must not allocate a chunk table");
-    }
-
-    #[test]
-    fn ten_million_ids_cost_about_a_byte_each() {
-        let mut builder = IdMapBuilder::new();
-        for i in 0..10_000_000u64 {
-            builder.insert(0x7_0000_0000 + i * 32);
-        }
-        let map = builder.build(&Store::Ram, &CancellationToken::new()).unwrap();
-        assert_eq!(map.len(), 10_000_000);
-        assert!(map.column_bytes() < 16_000_000, "{} bytes", map.column_bytes());
-        assert_eq!(map.rank(0x7_0000_0000 + 9_999_999 * 32), Some(9_999_999));
-        assert_eq!(map.id_at(5_000_000), 0x7_0000_0000 + 5_000_000 * 32);
-    }
-
-    #[test]
-    fn empty_map_and_duplicates() {
-        let map = build(&[], &Store::Ram);
-        assert!(map.is_empty());
-        assert_eq!(map.rank(0x1000), None);
-        assert_eq!(map.ids().count(), 0);
-        let map = build(&[0x1000, 0x1000, 0x1008, 0x1000], &Store::Ram);
-        assert_eq!(map.len(), 2);
-        assert_eq!(map.rank(0x1008), Some(1));
-    }
-
-    #[test]
-    fn chunk_boundaries_and_gaps_between_chunks() {
-        let ids = [0, 0xF_FFF8, 0x10_0000, 0x10_0008, 0x50_0000, 0x1_0000_0000];
-        let mut model = ids.to_vec();
-        model.sort_unstable();
-        let map = build(&ids, &Store::Ram);
-        assert_matches_model(&map, &model);
-    }
-
-    #[test]
-    fn ids_outside_the_populated_chunks_are_absent() {
-        let ids = [0x30_0000, 0x30_0008, 0x70_0000];
-        let map = build(&ids, &Store::Ram);
-        assert_matches_model(&map, &ids);
-        // Chunk 5 lies between the lowest and highest chunk but holds nothing.
-        assert_eq!(map.rank(0x50_0000), None);
-        // Chunk 1 is below the lowest populated chunk.
-        assert_eq!(map.rank(0x10_0000), None);
-        // Chunk 9 is past the last table entry.
-        assert_eq!(map.rank(0x900_0000), None);
-        assert_eq!(map.rank(u64::MAX - 7), None);
-    }
-
-    #[test]
-    fn highest_address_round_trips() {
-        let map = build(&[0xFFFF_FFFF_FFFF_FFF8], &Store::Ram);
-        assert_eq!(map.rank(0xFFFF_FFFF_FFFF_FFF8), Some(0));
-        assert_eq!(map.id_at(0), 0xFFFF_FFFF_FFFF_FFF8);
-        let map = build(&[0, 0xFFFF_FFFF_FFFF_FFF8], &Store::Ram);
-        assert_matches_model(&map, &[0, 0xFFFF_FFFF_FFFF_FFF8]);
-    }
-
-    #[test]
-    fn random_ids_match_a_sorted_model_in_ram_and_on_disk() {
-        for seed in 1..=8u64 {
-            let mut rng = XorShift(seed.wrapping_mul(0x9E37_79B9_7F4A_7C15) | 1);
-            let aligned = seed % 4 != 0;
-            let wide = seed % 3 == 0;
-            let ids: Vec<u64> = (0..3000)
-                .map(|_| {
-                    let r = rng.next();
-                    let base = if wide { (r >> 20) << 12 } else { 0x6_0000_0000 + (r % (6 << 20)) };
-                    if aligned { base & !7 } else { base }
-                })
-                .collect();
-            let mut model = ids.clone();
-            model.sort_unstable();
-            model.dedup();
-            let dir = tempfile::tempdir().unwrap();
-            for store in [Store::Ram, Store::Dir(dir.path().to_path_buf())] {
-                assert_matches_model(&build(&ids, &store), &model);
-            }
-        }
-    }
-
-    #[test]
-    fn dir_store_keeps_the_index_columns_under_stable_names() {
-        let dir = tempfile::tempdir().unwrap();
-        let map = build(&[0x1000, 0x2000], &Store::Dir(dir.path().to_path_buf()));
-        let mut names: Vec<_> =
-            std::fs::read_dir(dir.path()).unwrap().map(|e| e.unwrap().file_name().into_string().unwrap()).collect();
-        names.sort();
-        assert_eq!(names, ["ids.bits.u64", "ids.chunks.u32", "ids.table.u32", "ids.wrank.u32"]);
-        assert_eq!(map.rank(0x2000), Some(1));
-        let dir = tempfile::tempdir().unwrap();
-        build(&[0x1004], &Store::Dir(dir.path().to_path_buf()));
-        assert!(dir.path().join("ids.sorted.u64").exists());
-    }
-}
@@ -1,409 +0,0 @@
-//! Collects object ids in any order and lays them out as an [`IdMap`].
-
-use std::cmp::Reverse;
-use std::collections::{BinaryHeap, HashMap};
-use std::hash::{BuildHasherDefault, Hasher};
-
-use ide_core::CancellationToken;
-
-use super::{CHUNK_SLOT_BITS, IdMap, Repr, SLOT_SHIFT, WORD_BITS, WORDS_PER_CHUNK};
-use crate::column::{NONE, Store};
-use crate::error::HeapError;
-use crate::files::{IDS_BITS_FILE, IDS_CHUNKS_FILE, IDS_SORTED_FILE, IDS_TABLE_FILE, IDS_WRANK_FILE};
-
-/// Widest chunk range the dense table covers (256 MiB of table at most).
-const MAX_CHUNK_SPAN: u64 = 1 << 26;
-/// Chunks whose first word index still fits in the table's `u32`.
-const MAX_CHUNKS: usize = (NONE as usize - 1) / WORDS_PER_CHUNK;
-/// Largest object count: `NONE` and the one after it stay free as sentinels for the columns above.
-const MAX_IDS: u64 = NONE as u64 - 2;
-
-const CHUNK_BYTES: u64 = (WORDS_PER_CHUNK * size_of::<u64>()) as u64;
-/// The bitmaps may take this much before any id is inserted, then this many bytes per distinct id.
-/// A heap that fits in 4 GiB of address space never reaches the base allowance whatever the
-/// insertion order; sparse input (one id per chunk) is moved to plain `u64` ids, 8 bytes each,
-/// after at most `BITMAP_BASE_BYTES + BITMAP_BYTES_PER_ID * ids` of bitmaps, so builder memory is
-/// bounded by the number of ids rather than by the address range they spread over.
-const BITMAP_BASE_BYTES: u64 = 64 << 20;
-const BITMAP_BYTES_PER_ID: u64 = 32;
-
-/// Longest stretch of work between two looks at the cancellation token.
-const CHECK_EVERY: usize = 1 << 20;
-
-/// Chunk numbers are already well spread by a multiplicative hash; SipHash would dominate the
-/// per-insert cost on a 100M-object heap. The product keeps the low zero bits of its input, so
-/// the high half is folded down for the bucket index. The graph builder keys class and string
-/// ids (addresses) with it for the same reason.
-#[derive(Default)]
-pub(crate) struct ChunkHasher(u64);
-
-impl Hasher for ChunkHasher {
-    fn finish(&self) -> u64 {
-        self.0 ^ (self.0 >> 32)
-    }
-
-    fn write(&mut self, bytes: &[u8]) {
-        for &b in bytes {
-            self.write_u64(self.0.rotate_left(8) ^ u64::from(b));
-        }
-    }
-
-    fn write_u64(&mut self, n: u64) {
-        self.0 = n.wrapping_mul(0x9E37_79B9_7F4A_7C15);
-    }
-}
-
-struct BitChunks {
-    /// Chunk number → position in `words`.
-    index: HashMap<u64, usize, BuildHasherDefault<ChunkHasher>>,
-    words: Vec<Box<[u64]>>,
-    min: u64,
-    max: u64,
-    /// The chunk of the previous insert; ids usually arrive in runs.
-    last: Option<(u64, usize)>,
-    distinct: u64,
-}
-
-impl BitChunks {
-    fn new() -> Self {
-        Self { index: HashMap::default(), words: Vec::new(), min: u64::MAX, max: 0, last: None, distinct: 0 }
-    }
-
-    /// `false` when the id's chunk does not fit the dense table or the bitmap budget; the id is
-    /// then not recorded and the caller moves to plain ids.
-    fn insert(&mut self, id: u64) -> bool {
-        let slot = id >> SLOT_SHIFT;
-        let chunk = slot >> CHUNK_SLOT_BITS;
-        let at = match self.last {
-            Some((c, at)) if c == chunk => at,
-            _ => match self.index.get(&chunk) {
-                Some(&at) => at,
-                None => {
-                    let (min, max) = (self.min.min(chunk), self.max.max(chunk));
-                    let bitmap_bytes = (self.words.len() as u64 + 1) * CHUNK_BYTES;
-                    if self.words.len() >= MAX_CHUNKS
-                        || max - min >= MAX_CHUNK_SPAN
-                        || bitmap_bytes > BITMAP_BASE_BYTES + BITMAP_BYTES_PER_ID * self.distinct
-                    {
-                        return false;
-                    }
-                    (self.min, self.max) = (min, max);
-                    self.words.push(vec![0u64; WORDS_PER_CHUNK].into_boxed_slice());
-                    self.index.insert(chunk, self.words.len() - 1);
-                    self.words.len() - 1
-                }
-            },
-        };
-        self.last = Some((chunk, at));
-        let word = &mut self.words[at][(slot >> 6) as usize % WORDS_PER_CHUNK];
-        let bit = 1u64 << (slot & 63);
-        if *word & bit == 0 {
-            *word |= bit;
-            self.distinct += 1;
-        }
-        true
-    }
-
-    /// `(chunk number, position in words)` in ascending address order.
-    fn sorted_chunks(&self) -> Vec<(u64, usize)> {
-        let mut chunks: Vec<_> = self.index.iter().map(|(&chunk, &at)| (chunk, at)).collect();
-        chunks.sort_unstable();
-        chunks
-    }
-
-    /// The recorded ids, ascending.
-    fn ids(&self) -> BitIds<'_> {
-        BitIds { chunks: self.sorted_chunks(), words: &self.words, chunk: 0, word: 0, base: 0, rest: 0 }
-    }
-}
-
-struct BitIds<'a> {
-    chunks: Vec<(u64, usize)>,
-    words: &'a [Box<[u64]>],
-    chunk: usize,
-    word: usize,
-    /// Slot number of bit 0 of the word `rest` came from.
-    base: u64,
-    rest: u64,
-}
-
-impl Iterator for BitIds<'_> {
-    type Item = u64;
-
-    fn next(&mut self) -> Option<u64> {
-        loop {
-            if self.rest != 0 {
-                let bit = u64::from(self.rest.trailing_zeros());
-                self.rest &= self.rest - 1;
-                return Some((self.base + bit) << SLOT_SHIFT);
-            }
-            let &(chunk, at) = self.chunks.get(self.chunk)?;
-            self.rest = self.words[at][self.word];
-            self.base = (chunk << CHUNK_SLOT_BITS) + self.word as u64 * WORD_BITS;
-            self.word += 1;
-            if self.word == WORDS_PER_CHUNK {
-                self.word = 0;
-                self.chunk += 1;
-            }
-        }
-    }
-}
-
-pub struct IdMapBuilder {
-    bits: BitChunks,
-    /// Set once an id cannot go into `bits`; every later id goes here, and `bits` keeps what it
-    /// had. Unsorted, with duplicates.
-    plain: Option<Vec<u64>>,
-    max_ids: u64,
-}
-
-impl Default for IdMapBuilder {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl IdMapBuilder {
-    pub fn new() -> Self {
-        Self::with_limit(MAX_IDS)
-    }
-
-    /// `max_ids` is a parameter so tests can reach the too-large path without billions of inserts.
-    fn with_limit(max_ids: u64) -> Self {
-        Self { bits: BitChunks::new(), plain: None, max_ids }
-    }
-
-    /// Inserting an id twice is the same as once.
-    pub fn insert(&mut self, id: u64) {
-        match &mut self.plain {
-            Some(plain) => plain.push(id),
-            None => {
-                if id & 7 != 0 || !self.bits.insert(id) {
-                    self.plain = Some(vec![id]);
-                }
-            }
-        }
-    }
-
-    /// Fails with [`HeapError::TooLarge`] when there are more than `u32::MAX - 2` distinct ids,
-    /// and with [`HeapError::Cancelled`] when `cancel` fires (checked at least every `1 << 20`
-    /// steps).
-    pub fn build(self, store: &Store, cancel: &CancellationToken) -> Result<IdMap, HeapError> {
-        match self.plain {
-            None if self.bits.words.is_empty() => sorted_map(store, &[]),
-            None => bit_map(&self.bits, store, self.max_ids, cancel),
-            Some(plain) => merged_map(&self.bits, plain, store, self.max_ids, cancel),
-        }
-    }
-
-    #[cfg(test)]
-    fn allocated_bytes(&self) -> u64 {
-        self.bits.words.len() as u64 * CHUNK_BYTES
-            + self.plain.as_ref().map_or(0, |p| (p.capacity() * size_of::<u64>()) as u64)
-    }
-}
-
-fn check(cancel: &CancellationToken) -> Result<(), HeapError> {
-    if cancel.is_cancelled() { Err(HeapError::Cancelled) } else { Ok(()) }
-}
-
-fn sorted_map(store: &Store, ids: &[u64]) -> Result<IdMap, HeapError> {
-    let mut column = store.column(IDS_SORTED_FILE, ids.len(), 0u64)?;
-    column.copy_from_slice(ids);
-    Ok(IdMap { repr: Repr::Sorted(column) })
-}
-
-fn bit_map(bits: &BitChunks, store: &Store, max_ids: u64, cancel: &CancellationToken) -> Result<IdMap, HeapError> {
-    if bits.distinct > max_ids {
-        return Err(HeapError::TooLarge);
-    }
-    let chunks = bits.sorted_chunks();
-    let span = (bits.max - bits.min + 1) as usize;
-    let mut words = store.column(IDS_BITS_FILE, chunks.len() * WORDS_PER_CHUNK, 0u64)?;
-    let mut wrank = store.column(IDS_WRANK_FILE, chunks.len() * WORDS_PER_CHUNK, 0u32)?;
-    let mut table = store.column(IDS_TABLE_FILE, span, NONE)?;
-    let mut chunk_offsets = store.column(IDS_CHUNKS_FILE, chunks.len(), 0u32)?;
-    let mut before = 0u32;
-    for (ordinal, &(chunk, at)) in chunks.iter().enumerate() {
-        check(cancel)?;
-        let first = ordinal * WORDS_PER_CHUNK;
-        let offset = (chunk - bits.min) as usize;
-        table[offset] = first as u32;
-        chunk_offsets[ordinal] = offset as u32;
-        for (w, &word) in bits.words[at].iter().enumerate() {
-            words[first + w] = word;
-            wrank[first + w] = before;
-            before += word.count_ones();
-        }
-    }
-    Ok(IdMap { repr: Repr::Bits { min_chunk: bits.min, words, wrank, table, chunk_offsets, len: before } })
-}
-
-enum Source<'a> {
-    Bits(BitIds<'a>),
-    Run(std::iter::Copied<std::slice::Iter<'a, u64>>),
-}
-
-impl Iterator for Source<'_> {
-    type Item = u64;
-
-    fn next(&mut self) -> Option<u64> {
-        match self {
-            Source::Bits(it) => it.next(),
-            Source::Run(it) => it.next(),
-        }
-    }
-}
-
-/// Sorts `plain` in runs and merges the runs with the ids already in `bits` (itself a sorted
-/// source), dropping duplicates. A single `sort_unstable` of a very large vector could not be
-/// interrupted.
-fn merged_map(
-    bits: &BitChunks,
-    mut plain: Vec<u64>,
-    store: &Store,
-    max_ids: u64,
-    cancel: &CancellationToken,
-) -> Result<IdMap, HeapError> {
-    for run in plain.chunks_mut(CHECK_EVERY) {
-        check(cancel)?;
-        run.sort_unstable();
-    }
-    let mut sources = vec![Source::Bits(bits.ids())];
-    sources.extend(plain.chunks(CHECK_EVERY).map(|run| Source::Run(run.iter().copied())));
-    let mut heap = BinaryHeap::with_capacity(sources.len());
-    for (i, source) in sources.iter_mut().enumerate() {
-        if let Some(id) = source.next() {
-            heap.push(Reverse((id, i)));
-        }
-    }
-
-    let upper_bound = bits.distinct as usize + plain.len();
-    let mut merged = store.scratch::<u64>(upper_bound, 0)?;
-    let mut count = 0usize;
-    let mut steps = 0usize;
-    while let Some(Reverse((id, i))) = heap.pop() {
-        steps += 1;
-        if steps.is_multiple_of(CHECK_EVERY) {
-            check(cancel)?;
-        }
-        if let Some(next) = sources[i].next() {
-            heap.push(Reverse((next, i)));
-        }
-        if count > 0 && merged[count - 1] == id {
-            continue;
-        }
-        if count as u64 >= max_ids {
-            return Err(HeapError::TooLarge);
-        }
-        merged[count] = id;
-        count += 1;
-    }
-
-    let mut column = store.column(IDS_SORTED_FILE, count, 0u64)?;
-    for (to, from) in column.chunks_mut(CHECK_EVERY).zip(merged[..count].chunks(CHECK_EVERY)) {
-        check(cancel)?;
-        to.copy_from_slice(from);
-    }
-    Ok(IdMap { repr: Repr::Sorted(column) })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn insert_all(builder: &mut IdMapBuilder, ids: &[u64]) {
-        for &id in ids {
-            builder.insert(id);
-        }
-    }
-
-    #[test]
-    fn too_many_ids_is_too_large() {
-        // Dense layout, then the merged layout (one unaligned id); the duplicate does not count.
-        for unaligned in [false, true] {
-            let filled = |limit| {
-                let mut builder = IdMapBuilder::with_limit(limit);
-                insert_all(&mut builder, &[0x1000, 0x1008, 0x1010, 0x1010]);
-                if unaligned {
-                    builder.insert(0x1_0004);
-                }
-                builder
-            };
-            let distinct = if unaligned { 4 } else { 3 };
-            let map = filled(distinct).build(&Store::Ram, &CancellationToken::new()).unwrap();
-            assert_eq!(u64::from(map.len()), distinct);
-            let err = filled(distinct - 1).build(&Store::Ram, &CancellationToken::new()).err().unwrap();
-            assert!(matches!(err, HeapError::TooLarge), "{err}");
-        }
-    }
-
-    #[test]
-    fn cancelled_build_returns_cancelled() {
-        let cancelled = CancellationToken::new();
-        cancelled.cancel();
-        let mut dense = IdMapBuilder::new();
-        insert_all(&mut dense, &[0x1000, 0x1008, 0x20_0000]);
-        assert!(matches!(dense.build(&Store::Ram, &cancelled), Err(HeapError::Cancelled)));
-
-        let mut merged = IdMapBuilder::new();
-        insert_all(&mut merged, &[0x1000, 0x1004, 0x20_0000]);
-        assert!(matches!(merged.build(&Store::Ram, &cancelled), Err(HeapError::Cancelled)));
-
-        let mut ok = IdMapBuilder::new();
-        insert_all(&mut ok, &[0x1000, 0x1004]);
-        assert_eq!(ok.build(&Store::Ram, &CancellationToken::new()).unwrap().len(), 2);
-    }
-
-    #[test]
-    fn sparse_ids_do_not_amplify_builder_memory() {
-        const IDS: u64 = 2_000_000;
-        let mut builder = IdMapBuilder::new();
-        let mut peak = 0;
-        for i in 0..IDS {
-            builder.insert(0x1_0000_0000 + (i << 20));
-            if i % 1024 == 0 {
-                peak = peak.max(builder.allocated_bytes());
-            }
-        }
-        peak = peak.max(builder.allocated_bytes());
-        // Bitmaps up to the budget, plus the plain ids' vector, which may have doubled its capacity.
-        let budget = BITMAP_BASE_BYTES + (BITMAP_BYTES_PER_ID + 2 * size_of::<u64>() as u64) * IDS;
-        assert!(peak <= budget, "peak {peak} bytes, budget {budget}");
-        // One bitmap per id would have taken 16 KiB each.
-        assert!(peak < IDS * CHUNK_BYTES / 100, "peak {peak} bytes");
-        assert!(builder.plain.is_some(), "sparse input must have left the bitmaps");
-
-        let map = builder.build(&Store::Ram, &CancellationToken::new()).unwrap();
-        assert_eq!(map.len() as u64, IDS);
-        assert_eq!(map.rank(0x1_0000_0000 + (1_234_567 << 20)), Some(1_234_567));
-        assert_eq!(map.rank(0x1_0000_0000 + (1_234_567 << 20) + 8), None);
-    }
-
-    #[test]
-    fn dense_input_in_any_order_stays_in_bitmaps() {
-        // 4 GiB of address space is the base allowance; random order must not trip the budget.
-        let mut state = 0x2545_F491_4F6C_DD1Du64;
-        let mut builder = IdMapBuilder::new();
-        for _ in 0..300_000 {
-            state ^= state << 13;
-            state ^= state >> 7;
-            state ^= state << 17;
-            builder.insert((0x7_0000_0000 + (state % (4 << 30))) & !7);
-        }
-        assert!(builder.plain.is_none());
-        assert!(builder.allocated_bytes() <= BITMAP_BASE_BYTES);
-    }
-
-    #[test]
-    fn chunk_hasher_spreads_chunks_that_share_low_zero_bits() {
-        let buckets: std::collections::HashSet<u64> = (0..1024u64)
-            .map(|i| {
-                let mut hasher = ChunkHasher::default();
-                hasher.write_u64(i << 12);
-                hasher.finish() & 1023
-            })
-            .collect();
-        assert!(buckets.len() > 500, "{} buckets for 1024 keys", buckets.len());
-    }
-}
@@ -1,109 +0,0 @@
-//! The result of analyzing a heap dump: per-object columns, the class table and the summary.
-
-mod fields;
-mod path;
-mod queries;
-mod rows;
-
-use std::collections::HashMap;
-use std::path::Path;
-
-use memmap2::Mmap;
-use serde::{Deserialize, Serialize};
-
-use crate::column::Column;
-use crate::error::HeapError;
-use crate::files::SUMMARY_FILE;
-use crate::graph::ClassInfo;
-use crate::hprof::HeapRootKind;
-use crate::ids::IdMap;
-use crate::shallow::SizeSource;
-
-pub(crate) use self::fields::{id_value, instance_fields};
-pub use self::rows::{
-    HeapClassRow, HeapEdge, HeapObjectPage, HeapObjectRef, HeapObjectRow, HeapPathStep, HeapRootPath, MAX_PAGE,
-};
-
-/// Counts over instances and arrays; class objects (class dumps) are left out.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub struct HeapSummary {
-    /// `reachable_objects + unreachable_objects`.
-    pub objects: u64,
-    pub reachable_objects: u64,
-    pub reachable_bytes: u64,
-    pub unreachable_objects: u64,
-    pub unreachable_bytes: u64,
-    /// Class dumps in the dump.
-    pub classes: u32,
-    pub weak_edges_skipped: u64,
-    pub size_source: SizeSource,
-    pub analysis_ms: u32,
-}
-
-/// One row of the class table, for one type slot.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct ClassStat {
-    /// [`crate::display_name`] of the class (`long[]` for a primitive array slot).
-    pub name: String,
-    /// Reachable instances.
-    pub count: u64,
-    /// Shallow bytes of the reachable instances.
-    pub shallow: u64,
-    /// Bytes the reachable instances retain together: the sum of the retained sizes of those
-    /// with no instance of the same type above them in the dominator tree.
-    pub retained: u64,
-    pub unreachable_count: u64,
-}
-
-/// Columns are indexed by node: objects `0..root`, then the super-root `root`. Columns of the
-/// objects only (`types`, `offsets`) have no entry for the root.
-pub struct HeapIndex {
-    /// The dump, for [`crate::record_at`] at `offsets[v]`.
-    pub hprof: Mmap,
-    pub ids: IdMap,
-    /// Type slot of each object, as in [`crate::HeapGraph::types`].
-    pub types: Column<u32>,
-    pub offsets: Column<u64>,
-    /// Shallow size in units of 8 bytes, rounded up.
-    pub shallow8: Column<u32>,
-    /// Retained bytes; 0 for unreachable objects, every reachable byte for the root.
-    pub retained: Column<u64>,
-    /// Immediate dominator; [`crate::NONE`] for unreachable objects, `root` for the root.
-    pub idom: Column<u32>,
-    /// Children of node `v` in the dominator tree are `kids[kids_start[v]..kids_start[v + 1]]`,
-    /// by retained size descending, then by node.
-    pub kids_start: Column<u32>,
-    pub kids: Column<u32>,
-    /// Parent on a shortest path from the root (BFS over strong edges); [`crate::NONE`] for
-    /// unreachable objects, `root` for the root.
-    pub gc_parent: Column<u32>,
-    /// By type slot: class slots, then the primitive array slots.
-    pub classes: Vec<ClassStat>,
-    /// By class slot, as in [`crate::HeapGraph::classes`].
-    pub class_info: Vec<ClassInfo>,
-    /// Type slot of class objects.
-    pub class_slot: u32,
-    /// Object → kind and thread serial of its first root record.
-    pub roots: HashMap<u32, (HeapRootKind, Option<u32>)>,
-    /// Thread serial → thread object.
-    pub thread_objects: HashMap<u32, u32>,
-    pub id_size: u8,
-    pub summary: HeapSummary,
-}
-
-impl HeapIndex {
-    /// The super-root, whose children in both trees are the rooted objects.
-    pub fn root(&self) -> u32 {
-        self.ids.len()
-    }
-}
-
-pub(crate) fn write_summary(dir: &Path, summary: &HeapSummary) -> Result<(), HeapError> {
-    let json = serde_json::to_vec_pretty(summary).map_err(std::io::Error::from)?;
-    std::fs::write(dir.join(SUMMARY_FILE), json)?;
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests;
@@ -1,41 +0,0 @@
-//! Named field values of an instance record.
-
-use super::HeapIndex;
-use crate::hprof::BasicType;
-
-pub(crate) struct FieldValue<'a> {
-    pub(crate) name: &'a str,
-    pub(crate) ty: BasicType,
-    /// Big-endian, as in the dump.
-    pub(crate) bytes: &'a [u8],
-    /// `java.lang.ref.Reference.referent`, which the graph leaves out.
-    pub(crate) weak: bool,
-}
-
-/// The fields of an instance of class slot `class` whose record holds `data`: the class's own,
-/// then each superclass's, as HotSpot lays them out. Stops where `data` ends.
-pub(crate) fn instance_fields<'a>(index: &'a HeapIndex, class: u32, data: &'a [u8]) -> Vec<FieldValue<'a>> {
-    let mut out = Vec::new();
-    let mut base = 0usize;
-    let mut cursor = Some(class);
-    // Super chains end (their cycles are cut), so this is only a bound on corrupt input.
-    for _ in 0..index.class_info.len() {
-        let Some(info) = cursor.and_then(|c| index.class_info.get(c as usize)) else { break };
-        for (k, (name, ty)) in info.fields.iter().enumerate() {
-            let size = ty.hprof_size(index.id_size);
-            let Some(bytes) = base.checked_add(size).and_then(|end| data.get(base..end)) else { return out };
-            out.push(FieldValue { name, ty: *ty, bytes, weak: info.weak_field == Some(k) });
-            base += size;
-        }
-        cursor = info.super_index;
-    }
-    out
-}
-
-/// A 4- or 8-byte big-endian id.
-pub(crate) fn id_value(bytes: &[u8]) -> Option<u64> {
-    match *bytes {
-        [a, b, c, d] => Some(u64::from(u32::from_be_bytes([a, b, c, d]))),
-        _ => Some(u64::from_be_bytes(bytes.try_into().ok()?)),
-    }
-}
@@ -1,105 +0,0 @@
-//! Paths to GC roots, along the BFS tree of `gc_parent`.
-
-use super::{HeapEdge, HeapIndex, HeapObjectRef, HeapPathStep, HeapRootPath, id_value, instance_fields};
-use crate::column::NONE;
-use crate::hprof::{BasicType, HeapRecord, HeapRootKind};
-use crate::strings::{char_array_text, string_preview};
-
-const THREAD_NAME_CHARS: usize = 100;
-
-/// Steps a long path keeps at each end: one deep in a long linked list would otherwise send
-/// every node over IPC.
-const PATH_END_STEPS: u32 = 500;
-
-impl HeapIndex {
-    /// From `object` up to its GC root, each step with how the next one holds it; past 1000
-    /// steps, only the 500 at each end. `None` for an unreachable object or a ref that names no
-    /// object.
-    pub fn path_to_root(&self, object: HeapObjectRef) -> Option<HeapRootPath> {
-        let root = self.root();
-        let mut v = object.0;
-        if v >= root || self.gc_parent[v as usize] == NONE {
-            return None;
-        }
-        let len = self.path_len(v)?;
-        let end = PATH_END_STEPS;
-        let cut = len > 2 * end;
-        let mut steps = Vec::with_capacity(len.min(2 * end) as usize);
-        for i in 0..len {
-            let parent = self.gc_parent[v as usize];
-            if !cut || i < end || i >= len - end {
-                let via = if parent == root { self.root_edge(v) } else { self.edge(parent, v) };
-                steps.push(HeapPathStep { object: self.object_row(HeapObjectRef(v))?, via });
-            }
-            v = parent;
-        }
-        let omitted = if cut { len - 2 * end } else { 0 };
-        Some(HeapRootPath { steps, omitted, omitted_after: if cut { end } else { 0 } })
-    }
-
-    /// Steps from `v` to the root; `None` when `gc_parent` leads nowhere.
-    fn path_len(&self, mut v: u32) -> Option<u32> {
-        let root = self.root();
-        // A BFS tree has no cycles; the bound only stops a corrupt column from looping.
-        for len in 1..=root {
-            let parent = self.gc_parent[v as usize];
-            if parent == root {
-                return Some(len);
-            }
-            if parent > root {
-                return None;
-            }
-            v = parent;
-        }
-        None
-    }
-
-    fn root_edge(&self, v: u32) -> HeapEdge {
-        let (kind, serial) = self.roots.get(&v).copied().unwrap_or((HeapRootKind::Unknown, None));
-        let thread = serial.and_then(|s| self.thread_objects.get(&s)).and_then(|&t| self.thread_name(t));
-        HeapEdge::Root { root: kind, thread }
-    }
-
-    /// `Thread.name`: a String, or a `char[]` before JDK 9.
-    fn thread_name(&self, thread: u32) -> Option<String> {
-        let Some(HeapRecord::Instance { data, .. }) = self.record(thread) else { return None };
-        let fields = instance_fields(self, *self.types.get(thread as usize)?, data);
-        let name = fields.iter().find(|f| f.name == "name" && f.ty == BasicType::Object)?;
-        let target = self.ids.rank(id_value(name.bytes)?)?;
-        string_preview(self, target, THREAD_NAME_CHARS).or_else(|| char_array_text(self, target, THREAD_NAME_CHARS))
-    }
-
-    /// How `parent` refers to `child`, checked in the order the graph's edges were made. A strong
-    /// edge from `parent` always exists; the empty field name only covers a dump that changed.
-    fn edge(&self, parent: u32, child: u32) -> HeapEdge {
-        self.find_edge(parent, self.ids.id_at(child)).unwrap_or(HeapEdge::Field { name: String::new() })
-    }
-
-    fn find_edge(&self, parent: u32, child_id: u64) -> Option<HeapEdge> {
-        match self.record(parent)? {
-            HeapRecord::Instance { data, .. } => {
-                let class = self.types[parent as usize];
-                let field = instance_fields(self, class, data)
-                    .into_iter()
-                    .find(|f| !f.weak && f.ty == BasicType::Object && id_value(f.bytes) == Some(child_id));
-                match field {
-                    Some(f) => Some(HeapEdge::Field { name: f.name.to_owned() }),
-                    None => (self.class_info.get(class as usize)?.id == child_id).then_some(HeapEdge::ClassOf),
-                }
-            }
-            HeapRecord::ObjectArray { data, .. } => {
-                let index =
-                    data.chunks_exact(usize::from(self.id_size)).position(|item| id_value(item) == Some(child_id))?;
-                Some(HeapEdge::Element { index: u32::try_from(index).ok()? })
-            }
-            HeapRecord::Class(dump) if dump.super_id == child_id => Some(HeapEdge::SuperClass),
-            HeapRecord::Class(dump) if dump.loader_id == child_id => Some(HeapEdge::ClassLoader),
-            HeapRecord::Class(_) => {
-                let info = self.class_info.get(self.class_of_object(parent)?)?;
-                let (name, _) = info.statics.iter().find(|(_, object)| *object == child_id)?;
-                Some(HeapEdge::Static { name: name.clone() })
-            }
-            HeapRecord::Root { .. } | HeapRecord::PrimitiveArray { .. } => None,
-        }
-    }
-}
@@ -1,164 +0,0 @@
-//! Class table rows, pages of the dominator tree and single object rows.
-
-use std::cmp::Reverse;
-use std::collections::{BinaryHeap, HashMap};
-
-use super::{HeapClassRow, HeapIndex, HeapObjectPage, HeapObjectRef, HeapObjectRow, HeapSummary, MAX_PAGE};
-use crate::column::NONE;
-use crate::hprof::HeapRecord;
-use crate::strings::string_preview;
-
-const PREVIEW_CHARS: usize = 100;
-
-impl HeapIndex {
-    pub fn summary(&self) -> &HeapSummary {
-        &self.summary
-    }
-
-    /// Types that have objects, by retained size descending, then by name.
-    pub fn class_rows(&self) -> Vec<HeapClassRow> {
-        let class_slots = &self.classes[..self.class_info.len().min(self.classes.len())];
-        let mut names: HashMap<&str, u32> = HashMap::with_capacity(class_slots.len());
-        for class in class_slots {
-            *names.entry(class.name.as_str()).or_default() += 1;
-        }
-        let mut rows: Vec<HeapClassRow> = self
-            .classes
-            .iter()
-            .enumerate()
-            .filter(|(_, c)| c.count > 0 || c.unreachable_count > 0)
-            .map(|(slot, c)| HeapClassRow {
-                class_index: slot as u32,
-                name: c.name.clone(),
-                count: c.count,
-                shallow: c.shallow,
-                retained: c.retained,
-                unreachable_count: c.unreachable_count,
-                // Primitive array slots have no class dump and so no second loader.
-                ambiguous: slot < class_slots.len() && names[c.name.as_str()] > 1,
-            })
-            .collect();
-        rows.sort_by(|a, b| b.retained.cmp(&a.retained).then_with(|| a.name.cmp(&b.name)));
-        rows
-    }
-
-    /// A page of objects by retained size descending, then by index:
-    ///
-    /// - no `parent`, no `class_index`: the children of the super-root, class objects left out;
-    /// - `parent`: its children in the dominator tree, of type `class_index` if given;
-    /// - `class_index` only: every reachable object of that type.
-    ///
-    /// `limit` is clamped to [`MAX_PAGE`]. A `parent` or `class_index` that names nothing gives an
-    /// empty page.
-    pub fn dominated(
-        &self,
-        parent: Option<HeapObjectRef>,
-        class_index: Option<u32>,
-        offset: u32,
-        limit: u32,
-    ) -> HeapObjectPage {
-        let limit = limit.min(MAX_PAGE);
-        let root = self.root();
-        if class_index.is_some_and(|c| c as usize >= self.classes.len()) {
-            return HeapObjectPage { rows: Vec::new(), total: 0 };
-        }
-        match (parent, class_index) {
-            (Some(HeapObjectRef(p)), _) if p >= root => HeapObjectPage { rows: Vec::new(), total: 0 },
-            (Some(HeapObjectRef(p)), class) => self.page(
-                self.children(p).filter(|&v| class.is_none_or(|c| self.types[v as usize] == c)),
-                offset,
-                limit,
-            ),
-            (None, None) => {
-                self.page(self.children(root).filter(|&v| self.types[v as usize] != self.class_slot), offset, limit)
-            }
-            (None, Some(class)) => self.largest_of(class, offset, limit),
-        }
-    }
-
-    /// `None` for a ref that names no object, the super-root included.
-    pub fn object_row(&self, object: HeapObjectRef) -> Option<HeapObjectRow> {
-        let v = object.0;
-        if v >= self.root() {
-            return None;
-        }
-        let i = v as usize;
-        let slot = self.types[i];
-        let preview = if slot == self.class_slot {
-            self.class_of_object(v).and_then(|c| self.classes.get(c)).map(|c| c.name.clone())
-        } else {
-            string_preview(self, v, PREVIEW_CHARS)
-        };
-        Some(HeapObjectRow {
-            object,
-            class_name: self.classes.get(slot as usize).map(|c| c.name.clone()).unwrap_or_default(),
-            address: format!("{:#x}", self.ids.id_at(v)),
-            shallow: u64::from(self.shallow8[i]) * 8,
-            retained: self.retained[i],
-            has_children: self.kids_start[i + 1] > self.kids_start[i],
-            preview,
-        })
-    }
-
-    /// The record of object `v`, or `None` when it cannot be read.
-    pub(crate) fn record(&self, v: u32) -> Option<HeapRecord<'_>> {
-        let at = usize::try_from(*self.offsets.get(v as usize)?).ok()?;
-        crate::hprof::record_at(&self.hprof, at, self.id_size).ok()
-    }
-
-    /// The class slot a class object stands for.
-    pub(crate) fn class_of_object(&self, v: u32) -> Option<usize> {
-        if v >= self.root() {
-            return None;
-        }
-        let id = self.ids.id_at(v);
-        self.class_info.iter().position(|c| c.id == id && c.id != 0)
-    }
-
-    /// Children of node `v` in the dominator tree, already in page order.
-    fn children(&self, v: u32) -> impl Iterator<Item = u32> + '_ {
-        let v = v as usize;
-        self.kids[self.kids_start[v] as usize..self.kids_start[v + 1] as usize].iter().copied()
-    }
-
-    fn page(&self, objects: impl Iterator<Item = u32>, offset: u32, limit: u32) -> HeapObjectPage {
-        let mut rows = Vec::new();
-        let mut total = 0u32;
-        for v in objects {
-            if total >= offset && total - offset < limit {
-                rows.extend(self.object_row(HeapObjectRef(v)));
-            }
-            total = total.saturating_add(1);
-        }
-        HeapObjectPage { rows, total }
-    }
-
-    /// Scans every object: the top `offset + limit` stay in a heap whose top is the smallest.
-    fn largest_of(&self, class: u32, offset: u32, limit: u32) -> HeapObjectPage {
-        let count = self.classes[class as usize].count;
-        let total = u32::try_from(count).unwrap_or(u32::MAX);
-        let keep = match offset.checked_add(limit) {
-            Some(keep) if offset < total && limit > 0 => keep.min(total) as usize,
-            _ => return HeapObjectPage { rows: Vec::new(), total },
-        };
-        let mut top: BinaryHeap<Reverse<(u64, Reverse<u32>)>> = BinaryHeap::with_capacity(keep + 1);
-        for v in 0..self.root() {
-            let i = v as usize;
-            if self.types[i] != class || self.idom[i] == NONE {
-                continue;
-            }
-            top.push(Reverse((self.retained[i], Reverse(v))));
-            if top.len() > keep {
-                top.pop();
-            }
-        }
-        // Ascending `Reverse` order is descending retained, then ascending index.
-        let rows = top
-            .into_sorted_vec()
-            .into_iter()
-            .skip(offset as usize)
-            .filter_map(|Reverse((_, Reverse(v)))| self.object_row(HeapObjectRef(v)))
-            .collect();
-        HeapObjectPage { rows, total }
-    }
-}
@@ -1,95 +0,0 @@
-//! What the index queries return over IPC.
-
-use serde::{Deserialize, Serialize};
-
-use crate::hprof::HeapRootKind;
-
-/// Most rows one page of [`crate::HeapIndex::dominated`] returns.
-pub const MAX_PAGE: u32 = 500;
-
-/// An object of one snapshot: its index in the [`crate::HeapIndex`] columns. Any value may
-/// arrive over IPC; queries answer an index that names no object with nothing.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, specta::Type)]
-#[serde(transparent)]
-pub struct HeapObjectRef(pub u32);
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub struct HeapClassRow {
-    /// Type slot, as `classIndex` in [`crate::HeapIndex::dominated`].
-    pub class_index: u32,
-    pub name: String,
-    pub count: u64,
-    pub shallow: u64,
-    pub retained: u64,
-    pub unreachable_count: u64,
-    /// Another class has the same name (several class loaders): nothing joined by name, such as a
-    /// second snapshot, can tell them apart.
-    pub ambiguous: bool,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub struct HeapObjectRow {
-    pub object: HeapObjectRef,
-    pub class_name: String,
-    /// The object's hprof id in hex, `0x1300`.
-    pub address: String,
-    pub shallow: u64,
-    pub retained: u64,
-    /// Has children in the dominator tree.
-    pub has_children: bool,
-    /// The text of a `java.lang.String`, or the name of the class a class object stands for.
-    pub preview: Option<String>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub struct HeapObjectPage {
-    pub rows: Vec<HeapObjectRow>,
-    /// Rows of every page together.
-    pub total: u32,
-}
-
-/// How an object is held by the next step of a path to a GC root.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(tag = "kind", rename_all = "camelCase", rename_all_fields = "camelCase")]
-pub enum HeapEdge {
-    /// An instance field; the name is empty when the dump does not show which one.
-    Field {
-        name: String,
-    },
-    Element {
-        index: u32,
-    },
-    Static {
-        name: String,
-    },
-    /// From an instance to its class.
-    ClassOf,
-    SuperClass,
-    ClassLoader,
-    /// `thread` is the name of the thread whose root it is, when the dump has it.
-    Root {
-        root: HeapRootKind,
-        thread: Option<String>,
-    },
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub struct HeapPathStep {
-    pub object: HeapObjectRow,
-    /// How the next step holds this object; on the last step, the root.
-    pub via: HeapEdge,
-}
-
-/// A path from an object up to its GC root. A long one keeps only the steps nearest each end.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub struct HeapRootPath {
-    pub steps: Vec<HeapPathStep>,
-    /// Steps left out between `steps[omitted_after - 1]` and `steps[omitted_after]`; 0 for none.
-    pub omitted: u32,
-    pub omitted_after: u32,
-}
@@ -1,336 +0,0 @@
-use super::*;
-use crate::hprof::BasicType;
-use crate::test_index::{analyzed, analyzed_bytes, obj, slot};
-use crate::testing::{HprofWriter, MiniHeap, sample, sample_with_string};
-
-const H: u64 = 0x1000;
-const N1: u64 = 0x1100;
-const N3: u64 = 0x1300;
-const L: u64 = 0x1400;
-const W: u64 = 0x1600;
-const N4: u64 = 0x1700;
-
-fn addresses(page: &HeapObjectPage) -> Vec<&str> {
-    page.rows.iter().map(|r| r.address.as_str()).collect()
-}
-
-fn retained(page: &HeapObjectPage) -> Vec<u64> {
-    page.rows.iter().map(|r| r.retained).collect()
-}
-
-fn path(index: &HeapIndex, addr: u64) -> Option<Vec<(String, HeapEdge)>> {
-    let path = index.path_to_root(obj(index, addr))?;
-    assert_eq!((path.omitted, path.omitted_after), (0, 0));
-    Some(path.steps.into_iter().map(|s| (s.object.address, s.via)).collect())
-}
-
-fn field(name: &str) -> HeapEdge {
-    HeapEdge::Field { name: name.to_owned() }
-}
-
-fn root(root: HeapRootKind, thread: Option<&str>) -> HeapEdge {
-    HeapEdge::Root { root, thread: thread.map(str::to_owned) }
-}
-
-#[test]
-fn top_level_dominators_sorted_by_retained() {
-    let index = analyzed(&sample());
-    let page = index.dominated(None, None, 0, 10);
-    assert_eq!(addresses(&page), ["0x1000", "0x1300", "0x1600"]);
-    assert_eq!(retained(&page), [72, 56, 24]);
-    // The class objects, rooted as sticky classes, are left out.
-    assert_eq!(page.total, 3);
-    assert_eq!(addresses(&index.dominated(None, None, 1, 1)), ["0x1300"]);
-}
-
-#[test]
-fn children_of_holder() {
-    let index = analyzed(&sample());
-    let page = index.dominated(Some(obj(&index, H)), None, 0, 10);
-    assert_eq!(addresses(&page), ["0x1100", "0x1200"]);
-    assert_eq!(retained(&page), [24, 24]);
-    assert_eq!(page.total, 2);
-    assert!(page.rows.iter().all(|r| !r.has_children && r.class_name == "Node"));
-    let n3 = index.object_row(obj(&index, N3)).unwrap();
-    assert!(n3.has_children);
-    assert_eq!(index.dominated(Some(n3.object), None, 0, 10).rows[0].class_name, "long[]");
-}
-
-#[test]
-fn largest_of_class() {
-    let index = analyzed(&sample());
-    let node = slot(&index, "Node");
-    let page = index.dominated(None, Some(node), 0, 2);
-    assert_eq!(addresses(&page), ["0x1300", "0x1100"]);
-    assert_eq!(retained(&page), [56, 24]);
-    assert_eq!(page.total, 3);
-    assert_eq!(addresses(&index.dominated(None, Some(node), 2, 2)), ["0x1200"]);
-    assert!(index.dominated(None, Some(node), 3, 2).rows.is_empty());
-    // Within a parent's children.
-    assert_eq!(addresses(&index.dominated(Some(obj(&index, H)), Some(node), 1, 5)), ["0x1200"]);
-    assert_eq!(index.dominated(Some(obj(&index, H)), Some(slot(&index, "Holder")), 0, 5).total, 0);
-}
-
-#[test]
-fn object_row_describes_object() {
-    let index = analyzed(&sample());
-    let row = index.object_row(obj(&index, N3)).unwrap();
-    assert_eq!(
-        row,
-        HeapObjectRow {
-            object: obj(&index, N3),
-            class_name: "Node".to_owned(),
-            address: "0x1300".to_owned(),
-            shallow: 24,
-            retained: 56,
-            has_children: true,
-            preview: None,
-        }
-    );
-    let unreachable = index.object_row(obj(&index, N4)).unwrap();
-    assert_eq!((unreachable.retained, unreachable.has_children), (0, false));
-
-    let holder = &index.class_info[slot(&index, "Holder") as usize];
-    let class_object = obj(&index, holder.id);
-    let row = index.object_row(class_object).unwrap();
-    assert_eq!((row.class_name.as_str(), row.preview.as_deref()), ("java.lang.Class", Some("Holder")));
-}
-
-#[test]
-fn refs_that_name_no_object_answer_nothing() {
-    let index = analyzed(&sample());
-    let node = slot(&index, "Node");
-    for bad in [index.root(), index.root() + 1, u32::MAX] {
-        let bad = HeapObjectRef(bad);
-        assert_eq!(index.object_row(bad), None);
-        assert_eq!(index.path_to_root(bad), None);
-        assert_eq!(index.dominated(Some(bad), None, 0, 10), HeapObjectPage { rows: Vec::new(), total: 0 });
-        assert_eq!(index.dominated(Some(bad), Some(node), 0, 10).total, 0);
-    }
-    for bad in [index.classes.len() as u32, u32::MAX] {
-        assert_eq!(index.dominated(None, Some(bad), 0, 10).total, 0);
-    }
-}
-
-#[test]
-fn path_to_root_names_fields_and_root() {
-    let index = analyzed(&sample());
-    assert_eq!(
-        path(&index, L),
-        Some(vec![("0x1400".to_owned(), field("next")), ("0x1300".to_owned(), root(HeapRootKind::JavaFrame, None))])
-    );
-    assert_eq!(
-        path(&index, N1),
-        Some(vec![("0x1100".to_owned(), field("a")), ("0x1000".to_owned(), root(HeapRootKind::JniGlobal, None))])
-    );
-    assert_eq!(path(&index, W), Some(vec![("0x1600".to_owned(), root(HeapRootKind::JniGlobal, None))]));
-    assert_eq!(path(&index, N4), None);
-}
-
-/// A rooted linked list of `len` Nodes from `0x100000`, each held by the next one's `next`.
-fn chain(len: u64) -> HeapIndex {
-    let mut heap = sample();
-    for i in 0..len {
-        let next = if i == 0 { 0 } else { 0x10_0000 + (i - 1) * 0x20 };
-        heap.object(0x10_0000 + i * 0x20, "Node", &[("next", next)]);
-    }
-    heap.root(HeapRootKind::JniGlobal, 0x10_0000 + (len - 1) * 0x20);
-    analyzed(&heap)
-}
-
-#[test]
-fn path_of_an_object_deep_in_a_linked_list_keeps_both_ends() {
-    let index = chain(3000);
-    let path = index.path_to_root(obj(&index, 0x10_0000)).unwrap();
-    assert_eq!((path.steps.len(), path.omitted, path.omitted_after), (1000, 2000, 500));
-    let address = |i: usize| path.steps[i].object.address.clone();
-    assert_eq!([address(0), address(499)], ["0x100000", "0x103e60"]);
-    // The step after the gap is the one 2000 nodes further up.
-    assert_eq!([address(500), address(999)], ["0x113880", "0x1176e0"]);
-    assert_eq!(path.steps[999].via, root(HeapRootKind::JniGlobal, None));
-    assert!(path.steps[..999].iter().all(|s| s.via == field("next")));
-}
-
-#[test]
-fn path_of_exactly_a_thousand_steps_is_whole() {
-    let index = chain(1000);
-    let path = index.path_to_root(obj(&index, 0x10_0000)).unwrap();
-    assert_eq!((path.steps.len(), path.omitted, path.omitted_after), (1000, 0, 0));
-}
-
-#[test]
-fn path_skips_the_weak_referent() {
-    let mut heap = sample();
-    heap.object(0x1c00, "java.lang.ref.WeakReference", &[("referent", 0x1d00), ("queue", 0x1d00)])
-        .object(0x1d00, "Node", &[])
-        .root(HeapRootKind::JniGlobal, 0x1c00);
-    let index = analyzed(&heap);
-    assert_eq!(path(&index, 0x1d00).unwrap()[0].1, field("queue"));
-}
-
-/// Kid extends Base, loaded by loader `0x300`; Base's static `cache` holds X; K is a rooted Kid;
-/// `0x700` is a rooted `Object[] { null, Y }`. No class is rooted on its own.
-fn class_edges_heap() -> Vec<u8> {
-    let mut w = HprofWriter::new();
-    let names = [(1, "Base"), (2, "Kid"), (3, "Ldr"), (4, "[Ljava/lang/Object;"), (5, "cache")];
-    for (id, name) in names {
-        w.string(id, name);
-    }
-    for (class, name) in [(0x100, 1), (0x200, 2), (0x400, 3), (0x800, 4)] {
-        w.load_class(class, name);
-    }
-    w.class(0x100, 0, &[], &[(5, 0x500)])
-        .class_with_loader(0x200, 0x100, 0x300, &[], &[])
-        .class(0x400, 0, &[], &[])
-        .class(0x800, 0, &[], &[])
-        .instance(0x300, 0x400, &[])
-        .instance(0x500, 0x400, &[])
-        .instance(0x600, 0x200, &[])
-        .obj_array(0x700, 0x800, &[0, 0x900])
-        .instance(0x900, 0x400, &[])
-        .root(HeapRootKind::JniGlobal, 0x600)
-        .root(HeapRootKind::JniGlobal, 0x700);
-    w.finish()
-}
-
-#[test]
-fn path_names_statics_supers_loaders_classes_and_elements() {
-    let index = analyzed_bytes(&class_edges_heap());
-    let k = ("0x600".to_owned(), root(HeapRootKind::JniGlobal, None));
-    assert_eq!(
-        path(&index, 0x500),
-        Some(vec![
-            ("0x500".to_owned(), HeapEdge::Static { name: "cache".to_owned() }),
-            ("0x100".to_owned(), HeapEdge::SuperClass),
-            ("0x200".to_owned(), HeapEdge::ClassOf),
-            k.clone(),
-        ])
-    );
-    assert_eq!(
-        path(&index, 0x300),
-        Some(vec![("0x300".to_owned(), HeapEdge::ClassLoader), ("0x200".to_owned(), HeapEdge::ClassOf), k])
-    );
-    assert_eq!(
-        path(&index, 0x900),
-        Some(vec![
-            ("0x900".to_owned(), HeapEdge::Element { index: 1 }),
-            ("0x700".to_owned(), root(HeapRootKind::JniGlobal, None))
-        ])
-    );
-}
-
-fn with_main_thread(mut heap: MiniHeap, name: impl FnOnce(&mut MiniHeap, u64)) -> MiniHeap {
-    heap.class("java.lang.Thread", Some("java.lang.Object"), &[("name", BasicType::Object)]);
-    name(&mut heap, 0x2000);
-    heap.object(0x2100, "java.lang.Thread", &[("name", 0x2000)]).root_in_thread(HeapRootKind::ThreadObject, 0x2100, 1);
-    heap
-}
-
-#[test]
-fn thread_name_on_java_frame_root() {
-    let heap = with_main_thread(sample_with_string(), |h, at| {
-        h.string(at, "main", true);
-    });
-    let index = analyzed(&heap);
-    let steps = path(&index, L).unwrap();
-    assert_eq!(steps.last().unwrap().1, root(HeapRootKind::JavaFrame, Some("main")));
-    // A JNI global carries no thread.
-    assert_eq!(path(&index, H).unwrap()[0].1, root(HeapRootKind::JniGlobal, None));
-}
-
-#[test]
-fn jdk8_thread_name_is_a_char_array() {
-    let heap = with_main_thread(sample(), |h, at| {
-        let utf16: Vec<u8> = "main".encode_utf16().flat_map(u16::to_be_bytes).collect();
-        h.prim_bytes(at, BasicType::Char, &utf16);
-    });
-    let index = analyzed(&heap);
-    assert_eq!(path(&index, N3).unwrap()[0].1, root(HeapRootKind::JavaFrame, Some("main")));
-}
-
-#[test]
-fn page_limit_is_clamped() {
-    let mut heap = MiniHeap::new();
-    heap.class("Node", Some("java.lang.Object"), &[("next", BasicType::Object)]);
-    for k in 0..600u64 {
-        let addr = 0x10_0000 + k * 0x100;
-        heap.object(addr, "Node", &[]).root(HeapRootKind::JniGlobal, addr);
-    }
-    let index = analyzed(&heap);
-    let node = slot(&index, "Node");
-    let page = index.dominated(None, Some(node), 0, 10_000);
-    assert_eq!((page.rows.len(), page.total), (MAX_PAGE as usize, 600));
-    let top = index.dominated(None, None, 0, 10_000);
-    assert_eq!((top.rows.len(), top.total), (MAX_PAGE as usize, 600));
-    assert_eq!(index.dominated(None, None, 550, 10_000).rows.len(), 50);
-    for (offset, limit) in [(u32::MAX, u32::MAX), (u32::MAX - 10, 100), (599, u32::MAX)] {
-        let page = index.dominated(None, Some(node), offset, limit);
-        assert_eq!((page.rows.len(), page.total), (usize::from(offset == 599), 600), "{offset} {limit}");
-        assert!(index.dominated(None, None, offset, limit).rows.len() <= 1);
-    }
-}
-
-#[test]
-fn class_rows_skip_empty_slots() {
-    let index = analyzed(&sample());
-    let rows = index.class_rows();
-    let node = rows.iter().find(|r| r.name == "Node").unwrap();
-    assert_eq!(
-        (node.class_index, node.count, node.shallow, node.retained, node.unreachable_count, node.ambiguous),
-        (slot(&index, "Node"), 3, 72, 104, 1, false)
-    );
-    assert!(rows.iter().all(|r| r.count + r.unreachable_count > 0));
-    assert!(!rows.iter().any(|r| r.name == "boolean[]"));
-    assert!(rows.windows(2).all(|p| p[0].retained >= p[1].retained));
-    assert_eq!(index.summary().objects, 8);
-}
-
-#[test]
-fn class_rows_mark_names_of_several_classes() {
-    let mut heap = sample();
-    // `object` takes the class defined last under a name, so each Foo gets one instance.
-    heap.class("Foo", Some("java.lang.Object"), &[])
-        .object(0x3000, "Foo", &[])
-        .class("Foo", Some("java.lang.Object"), &[])
-        .object(0x3100, "Foo", &[])
-        .object(0x3200, "Foo", &[]);
-    let index = analyzed(&heap);
-    let rows = index.class_rows();
-    let foos: Vec<_> = rows.iter().filter(|r| r.name == "Foo").collect();
-    assert_eq!(foos.len(), 2);
-    assert!(foos.iter().all(|r| r.ambiguous));
-    let mut counts: Vec<u64> = foos.iter().map(|r| r.unreachable_count).collect();
-    counts.sort_unstable();
-    assert_eq!(counts, [1, 2]);
-    assert!(rows.iter().filter(|r| r.name != "Foo").all(|r| !r.ambiguous));
-}
-
-#[test]
-fn ipc_shapes() {
-    assert_eq!(json(&HeapObjectRef(7)), "7");
-    assert_eq!(json(&HeapEdge::ClassOf), r#"{"kind":"classOf"}"#);
-    assert_eq!(json(&HeapEdge::Element { index: 2 }), r#"{"kind":"element","index":2}"#);
-    assert_eq!(
-        json(&root(HeapRootKind::JavaFrame, Some("main"))),
-        r#"{"kind":"root","root":"javaFrame","thread":"main"}"#
-    );
-    let row = HeapClassRow {
-        class_index: 1,
-        name: "A".to_owned(),
-        count: 2,
-        shallow: 3,
-        retained: 4,
-        unreachable_count: 5,
-        ambiguous: false,
-    };
-    assert_eq!(
-        json(&row),
-        r#"{"classIndex":1,"name":"A","count":2,"shallow":3,"retained":4,"unreachableCount":5,"ambiguous":false}"#
-    );
-    let back: HeapObjectRef = serde_json::from_str("4294967295").unwrap();
-    assert_eq!(back, HeapObjectRef(u32::MAX));
-}
-
-fn json(value: &impl serde::Serialize) -> String {
-    serde_json::to_string(value).unwrap()
-}
@@ -1,44 +0,0 @@
-//! HotSpot `.hprof` heap-dump reading and analysis for the debugger's JVM Memory view.
-
-mod analysis;
-mod column;
-mod compare;
-mod disk;
-mod dominators;
-mod error;
-mod files;
-mod graph;
-mod hprof;
-mod ids;
-mod index;
-mod names;
-mod progress;
-mod reader;
-mod registry;
-mod shallow;
-mod strings;
-#[cfg(test)]
-mod test_index;
-/// Fixture builders shared by this crate's tests and by dependants' tests and benches; not API.
-#[doc(hidden)]
-pub mod testing;
-
-pub use analysis::{AnalyzeOptions, analyze};
-pub use column::{Column, NONE, Pod, Store};
-pub use compare::{HeapClassDiff, compare};
-pub use disk::{DISK_MARGIN, capture_need, create_snapshot_dir, free_bytes, index_need, remove_stale, snapshots_root};
-pub use dominators::{Dominators, dominators};
-pub use error::HeapError;
-pub use graph::{ClassInfo, HeapGraph, PRIM_SLOTS, build_graph};
-pub use hprof::{
-    BasicType, ClassDump, HeapRecord, HeapRootKind, HprofHeader, Record, parse_header, record_at, scan, scan_segment,
-};
-pub use ids::{IdMap, IdMapBuilder};
-pub use index::{
-    ClassStat, HeapClassRow, HeapEdge, HeapIndex, HeapObjectPage, HeapObjectRef, HeapObjectRow, HeapPathStep,
-    HeapRootPath, HeapSummary, MAX_PAGE,
-};
-pub use names::display_name;
-pub use progress::HeapPhase;
-pub use registry::{HeapOrigin, HeapRegistry, HeapSnapshotId, HeapSnapshotInfo, OpenSnapshot};
-pub use shallow::{HistogramEntry, ShallowModel, SizeSource, VmLayout};
@@ -1,66 +0,0 @@
-//! Class names in the form the JVM's class histogram and the UI use.
-
-/// The Java source form of an hprof class name (`java/util/HashMap$Node`, `[Ljava/lang/String;`),
-/// as `ide_jvm_attach::display_class_name` writes it, plus `+0x` → `/0x` for hidden classes,
-/// which the histogram spells with a slash. Names that already use dots pass through unchanged.
-pub fn display_name(hprof_name: &str) -> String {
-    let dotted = hprof_name.replace('/', ".");
-    let dims = dotted.bytes().take_while(|&b| b == b'[').count();
-    let shown = if dims == 0 { dotted } else { array_name(&dotted, dims) };
-    // After the slash replacement, or the new slash would become a dot.
-    shown.replace("+0x", "/0x")
-}
-
-/// `[[I` → `int[][]`; a descriptor that is not one stays as it is.
-fn array_name(dotted: &str, dims: usize) -> String {
-    let element = &dotted[dims..];
-    let base = match element {
-        "Z" => "boolean",
-        "B" => "byte",
-        "C" => "char",
-        "S" => "short",
-        "I" => "int",
-        "J" => "long",
-        "F" => "float",
-        "D" => "double",
-        _ => match element.strip_prefix('L').and_then(|e| e.strip_suffix(';')) {
-            Some(class) => class,
-            None => return dotted.to_owned(),
-        },
-    };
-    format!("{base}{}", "[]".repeat(dims))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn display_names() {
-        for (hprof, shown) in [
-            ("[Z", "boolean[]"),
-            ("[J", "long[]"),
-            ("[[D", "double[][]"),
-            ("[Ljava/lang/String;", "java.lang.String[]"),
-            ("java/util/HashMap$Node", "java.util.HashMap$Node"),
-            ("Gen$$Lambda+0x0000007800000a00", "Gen$$Lambda/0x0000007800000a00"),
-        ] {
-            assert_eq!(display_name(hprof), shown, "{hprof}");
-        }
-    }
-
-    #[test]
-    fn dotted_names_and_hidden_class_arrays() {
-        for (hprof, shown) in [
-            ("java.lang.String", "java.lang.String"),
-            ("[Ljava.lang.Object;", "java.lang.Object[]"),
-            ("[[Lpkg.Gen$$Lambda+0x0000007800000a00;", "pkg.Gen$$Lambda/0x0000007800000a00[][]"),
-            ("[Ljava.lang.String", "[Ljava.lang.String"),
-            ("[Q", "[Q"),
-            ("0x7f00", "0x7f00"),
-            ("", ""),
-        ] {
-            assert_eq!(display_name(hprof), shown, "{hprof}");
-        }
-    }
-}
@@ -1,103 +0,0 @@
-//! Phases of a heap analysis and the progress/cancellation checks every long pass makes.
-
-use ide_core::CancellationToken;
-use serde::{Deserialize, Serialize};
-
-use crate::error::HeapError;
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub enum HeapPhase {
-    Reading,
-    Linking,
-    Dominators,
-    Retained,
-    Paths,
-    Saving,
-}
-
-/// Longest stretch of work between two progress reports (and looks at the cancellation token).
-pub(crate) const CHECK_EVERY: u64 = 1 << 20;
-
-/// The caller's progress callback plus the token, looked at right after every report so a callback
-/// that cancels stops the work before the next step.
-pub(crate) struct Progress<'a> {
-    report: &'a dyn Fn(HeapPhase, u64, u64) -> Result<(), HeapError>,
-    cancel: &'a CancellationToken,
-}
-
-impl<'a> Progress<'a> {
-    pub(crate) fn new(
-        report: &'a dyn Fn(HeapPhase, u64, u64) -> Result<(), HeapError>,
-        cancel: &'a CancellationToken,
-    ) -> Self {
-        Self { report, cancel }
-    }
-
-    pub(crate) fn report(&self, phase: HeapPhase, done: u64, total: u64) -> Result<(), HeapError> {
-        (self.report)(phase, done, total)?;
-        self.check()
-    }
-
-    pub(crate) fn token(&self) -> &'a CancellationToken {
-        self.cancel
-    }
-
-    /// Looks at the token without reporting.
-    pub(crate) fn check(&self) -> Result<(), HeapError> {
-        if self.cancel.is_cancelled() { Err(HeapError::Cancelled) } else { Ok(()) }
-    }
-
-    /// Looks at the token at step 0 and reports every [`CHECK_EVERY`] steps after it. Step 0 does
-    /// not report: a loop starts right after its phase's own report.
-    pub(crate) fn step(&self, step: u64, phase: HeapPhase, done: u64, total: u64) -> Result<(), HeapError> {
-        if step == 0 {
-            self.check()
-        } else if step.is_multiple_of(CHECK_EVERY) {
-            self.report(phase, done, total)
-        } else {
-            Ok(())
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::cell::RefCell;
-
-    use super::*;
-
-    #[test]
-    fn steps_check_at_zero_and_report_every_check_interval() {
-        let calls = RefCell::new(Vec::new());
-        let report = |phase, done, total| {
-            calls.borrow_mut().push((phase, done, total));
-            Ok(())
-        };
-        let cancel = CancellationToken::new();
-        let progress = Progress::new(&report, &cancel);
-        for step in [0, 1, CHECK_EVERY - 1, CHECK_EVERY, CHECK_EVERY + 1, 3 * CHECK_EVERY] {
-            progress.step(step, HeapPhase::Linking, step, 9).unwrap();
-        }
-        assert_eq!(*calls.borrow(), [(HeapPhase::Linking, CHECK_EVERY, 9), (HeapPhase::Linking, 3 * CHECK_EVERY, 9)]);
-
-        cancel.cancel();
-        assert!(matches!(progress.step(0, HeapPhase::Linking, 0, 9), Err(HeapError::Cancelled)));
-        assert!(matches!(progress.report(HeapPhase::Saving, 1, 1), Err(HeapError::Cancelled)));
-        assert_eq!(calls.borrow().last(), Some(&(HeapPhase::Saving, 1, 1)), "reports before it looks at the token");
-    }
-
-    #[test]
-    fn report_errors_pass_through() {
-        let report = |_, _, _| Err(HeapError::NotEnoughDiskSpace { needed: 2, available: 1 });
-        let cancel = CancellationToken::new();
-        let progress = Progress::new(&report, &cancel);
-        assert!(matches!(progress.report(HeapPhase::Linking, 0, 1), Err(HeapError::NotEnoughDiskSpace { .. })));
-    }
-
-    #[test]
-    fn phases_serialize_in_camel_case() {
-        assert_eq!(serde_json::to_string(&HeapPhase::Dominators).unwrap(), "\"dominators\"");
-        assert_eq!(serde_json::from_str::<HeapPhase>("\"saving\"").unwrap(), HeapPhase::Saving);
-    }
-}
@@ -1,92 +0,0 @@
-use crate::error::HeapError;
-
-/// Big-endian cursor over a dump. Every read is bounds-checked; running off `buf` yields
-/// `Truncated` at `buf.len()`, so callers bound a record by slicing `buf` to its end.
-pub(crate) struct Reader<'a> {
-    buf: &'a [u8],
-    pos: usize,
-    id_size: u8,
-}
-
-impl<'a> Reader<'a> {
-    pub(crate) fn new(buf: &'a [u8], pos: usize, id_size: u8) -> Self {
-        Self { buf, pos, id_size }
-    }
-
-    pub(crate) fn pos(&self) -> usize {
-        self.pos
-    }
-
-    pub(crate) fn id_size(&self) -> u8 {
-        self.id_size
-    }
-
-    pub(crate) fn buf(&self) -> &'a [u8] {
-        self.buf
-    }
-
-    pub(crate) fn bytes(&mut self, n: usize) -> Result<&'a [u8], HeapError> {
-        let end = self.pos.checked_add(n).filter(|&end| end <= self.buf.len());
-        let Some(end) = end else {
-            return Err(HeapError::Truncated { at: self.buf.len() as u64 });
-        };
-        let slice = &self.buf[self.pos..end];
-        self.pos = end;
-        Ok(slice)
-    }
-
-    pub(crate) fn skip(&mut self, n: usize) -> Result<(), HeapError> {
-        self.bytes(n).map(|_| ())
-    }
-
-    fn array<const N: usize>(&mut self) -> Result<[u8; N], HeapError> {
-        let mut out = [0u8; N];
-        out.copy_from_slice(self.bytes(N)?);
-        Ok(out)
-    }
-
-    pub(crate) fn u1(&mut self) -> Result<u8, HeapError> {
-        Ok(self.array::<1>()?[0])
-    }
-
-    pub(crate) fn u2(&mut self) -> Result<u16, HeapError> {
-        Ok(u16::from_be_bytes(self.array()?))
-    }
-
-    pub(crate) fn u4(&mut self) -> Result<u32, HeapError> {
-        Ok(u32::from_be_bytes(self.array()?))
-    }
-
-    pub(crate) fn u8(&mut self) -> Result<u64, HeapError> {
-        Ok(u64::from_be_bytes(self.array()?))
-    }
-
-    /// `id_size` is 4 or 8; the public entry points reject anything else before building a reader.
-    pub(crate) fn id(&mut self) -> Result<u64, HeapError> {
-        if self.id_size == 4 { self.u4().map(u64::from) } else { self.u8() }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn reads_big_endian_and_ids_of_both_sizes() {
-        let buf = [1, 0, 2, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 5];
-        let mut r = Reader::new(&buf, 0, 8);
-        assert_eq!((r.u1().unwrap(), r.u2().unwrap(), r.u4().unwrap(), r.u8().unwrap()), (1, 2, 3, 4));
-        assert_eq!(r.pos(), 15);
-        assert_eq!(Reader::new(&buf[15..], 0, 4).id().unwrap(), 5);
-    }
-
-    #[test]
-    fn running_off_the_end_reports_the_buffer_end() {
-        let buf = [0u8; 6];
-        let mut r = Reader::new(&buf, 4, 8);
-        assert!(matches!(r.u4(), Err(HeapError::Truncated { at: 6 })));
-        assert_eq!(r.pos(), 4, "a failed read does not advance");
-        assert!(matches!(r.skip(usize::MAX), Err(HeapError::Truncated { at: 6 })));
-        assert!(matches!(Reader::new(&buf, 99, 8).u1(), Err(HeapError::Truncated { at: 6 })));
-    }
-}
@@ -1,163 +0,0 @@
-//! The heap snapshots that are open in this process.
-
-use std::collections::BTreeMap;
-use std::path::{Path, PathBuf};
-use std::sync::{Arc, Mutex, MutexGuard, PoisonError};
-
-use ide_core::process::process_alive;
-use ide_core::{DebugSessionId, IpcPath};
-use serde::{Deserialize, Serialize};
-
-use crate::disk::remove_stale;
-use crate::index::{HeapIndex, HeapSummary};
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, specta::Type)]
-#[serde(transparent)]
-pub struct HeapSnapshotId(pub u32);
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(tag = "kind", rename_all = "camelCase", rename_all_fields = "camelCase")]
-pub enum HeapOrigin {
-    /// Dumped from a live debug session.
-    Captured { session: DebugSessionId, pid: u32, java_version: String, taken_while_suspended: bool, dump_ms: u32 },
-    /// An `.hprof` the user opened; it is never deleted.
-    File { path: IpcPath },
-}
-
-impl HeapOrigin {
-    /// Text identifying the snapshot in the UI: the process id of a capture, the file name of a
-    /// file. The capture time is `created_ms`, which the UI formats in local time.
-    pub fn label(&self) -> String {
-        match self {
-            HeapOrigin::Captured { pid, .. } => pid.to_string(),
-            HeapOrigin::File { path } => path.file_name().unwrap_or(path.as_os_str()).to_string_lossy().into_owned(),
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub struct HeapSnapshotInfo {
-    pub id: HeapSnapshotId,
-    pub label: String,
-    pub origin: HeapOrigin,
-    pub summary: HeapSummary,
-    /// Unix time in milliseconds when the snapshot was opened.
-    pub created_ms: u64,
-}
-
-/// An analyzed snapshot together with the directory that holds its files. Dropping it unmaps the
-/// index and then removes the directory, dump included for a capture; a dump opened from a file
-/// is outside the directory and stays.
-pub struct OpenSnapshot {
-    pub info: HeapSnapshotInfo,
-    /// `None` only while dropping, so the mappings are gone before the directory is deleted
-    /// (Windows cannot delete a mapped file).
-    index: Option<HeapIndex>,
-    /// Holds the index files and the dump of a capture.
-    pub dir: PathBuf,
-    pub dump: PathBuf,
-    /// Set by [`HeapRegistry::insert`] once `dir` is known to be one of the registry's own.
-    remove_dir: bool,
-}
-
-impl OpenSnapshot {
-    /// The directory is not removed on drop until the snapshot is in a [`HeapRegistry`] whose
-    /// root holds it.
-    pub fn new(info: HeapSnapshotInfo, index: HeapIndex, dir: PathBuf, dump: PathBuf) -> Self {
-        Self { info, index: Some(index), dir, dump, remove_dir: false }
-    }
-
-    pub fn index(&self) -> &HeapIndex {
-        self.index.as_ref().expect("the index is only taken while dropping")
-    }
-}
-
-impl Drop for OpenSnapshot {
-    fn drop(&mut self) {
-        drop(self.index.take());
-        if !self.remove_dir {
-            return;
-        }
-        // The user's own dump that happens to sit inside `dir` (an opened file is analyzed from a
-        // private copy, which goes with the directory).
-        if matches!(&self.info.origin, HeapOrigin::File { path } if **path == self.dump)
-            && self.dump.starts_with(&self.dir)
-        {
-            return;
-        }
-        // A link is not followed: only a real directory is deleted.
-        if std::fs::symlink_metadata(&self.dir).is_ok_and(|meta| meta.file_type().is_dir())
-            && let Err(err) = std::fs::remove_dir_all(&self.dir)
-        {
-            tracing::warn!(dir = %self.dir.display(), %err, "could not remove a heap snapshot directory");
-        }
-    }
-}
-
-struct State {
-    next_id: u32,
-    open: BTreeMap<u32, Arc<OpenSnapshot>>,
-}
-
-/// The open snapshots, shared between threads. Ids are never reused within a process.
-pub struct HeapRegistry {
-    root: PathBuf,
-    state: Mutex<State>,
-}
-
-impl HeapRegistry {
-    /// Registry for snapshot directories under `root`; first removes the directories there that
-    /// belong to processes that no longer exist.
-    pub fn new(root: PathBuf) -> Self {
-        remove_stale(&root, process_alive);
-        Self { root, state: Mutex::new(State { next_id: 1, open: BTreeMap::new() }) }
-    }
-
-    pub fn root(&self) -> &Path {
-        &self.root
-    }
-
-    fn state(&self) -> MutexGuard<'_, State> {
-        self.state.lock().unwrap_or_else(PoisonError::into_inner)
-    }
-
-    /// Registers the snapshot that `make` builds for a fresh id. `make` runs outside the lock.
-    pub fn insert(&self, make: impl FnOnce(HeapSnapshotId) -> OpenSnapshot) -> HeapSnapshotInfo {
-        let id = {
-            let mut state = self.state();
-            let id = state.next_id;
-            state.next_id = id.saturating_add(1);
-            HeapSnapshotId(id)
-        };
-        let mut snapshot = make(id);
-        snapshot.info.id = id;
-        snapshot.remove_dir = snapshot.dir.file_name().is_some() && snapshot.dir.parent() == Some(self.root.as_path());
-        if !snapshot.remove_dir {
-            tracing::warn!(dir = %snapshot.dir.display(), "heap snapshot directory is outside the registry root; keeping it");
-        }
-        let info = snapshot.info.clone();
-        self.state().open.insert(id.0, Arc::new(snapshot));
-        info
-    }
-
-    pub fn get(&self, id: HeapSnapshotId) -> Option<Arc<OpenSnapshot>> {
-        self.state().open.get(&id.0).cloned()
-    }
-
-    /// Forgets the snapshot; its directory goes once the last query using it lets go. `false` for
-    /// an id that is not open.
-    pub fn close(&self, id: HeapSnapshotId) -> bool {
-        // Bound first so the lock is released before the snapshot may be dropped: that deletes files.
-        let removed = self.state().open.remove(&id.0);
-        removed.is_some()
-    }
-
-    /// In the order the snapshots were opened.
-    pub fn list(&self) -> Vec<HeapSnapshotInfo> {
-        self.state().open.values().map(|snapshot| snapshot.info.clone()).collect()
-    }
-}
-
-#[cfg(test)]
-mod tests;
@@ -1,265 +0,0 @@
-use std::sync::Arc;
-
-use ide_core::{CancellationToken, DebugSessionId};
-
-use super::*;
-use crate::analysis::{AnalyzeOptions, analyze};
-use crate::disk::create_snapshot_dir;
-use crate::error::HeapError;
-use crate::progress::HeapPhase;
-use crate::testing::sample;
-
-fn no_progress(_: HeapPhase, _: u64, _: u64) -> Result<(), HeapError> {
-    Ok(())
-}
-
-fn captured() -> HeapOrigin {
-    HeapOrigin::Captured {
-        session: DebugSessionId(7),
-        pid: 4242,
-        java_version: "21.0.2".into(),
-        taken_while_suspended: true,
-        dump_ms: 35,
-    }
-}
-
-fn external(path: &Path) -> HeapOrigin {
-    HeapOrigin::File { path: IpcPath(path.to_path_buf()) }
-}
-
-/// A snapshot whose index files are mapped from `dir`, like a real one: `dump` is analyzed in
-/// place and `dir` receives the columns.
-fn open_in(dir: &Path, dump: &Path, origin: HeapOrigin) -> impl FnOnce(HeapSnapshotId) -> OpenSnapshot {
-    let dir = dir.to_path_buf();
-    let dump = dump.to_path_buf();
-    move |id| {
-        std::fs::write(&dump, sample().bytes()).unwrap();
-        let index = analyze(&dump, &dir, AnalyzeOptions::default(), &no_progress, &CancellationToken::new()).unwrap();
-        let info = HeapSnapshotInfo {
-            id,
-            label: origin.label(),
-            origin,
-            summary: index.summary.clone(),
-            created_ms: 1_700_000_000_000,
-        };
-        OpenSnapshot::new(info, index, dir, dump)
-    }
-}
-
-/// Inserts a captured snapshot with its own directory under the registry's root.
-fn insert_captured(registry: &HeapRegistry) -> (HeapSnapshotInfo, PathBuf) {
-    let dir = create_snapshot_dir(registry.root()).unwrap();
-    let dump = dir.join("dump.hprof");
-    let info = registry.insert(open_in(&dir, &dump, captured()));
-    (info, dir)
-}
-
-fn names(dir: &Path) -> Vec<String> {
-    let mut names: Vec<_> =
-        std::fs::read_dir(dir).unwrap().map(|e| e.unwrap().file_name().into_string().unwrap()).collect();
-    names.sort();
-    names
-}
-
-#[test]
-fn closing_snapshot_removes_dir() {
-    let root = tempfile::tempdir().unwrap();
-    let registry = HeapRegistry::new(root.path().to_path_buf());
-    let (info, dir) = insert_captured(&registry);
-    assert!(dir.join("dump.hprof").exists() && dir.join("summary.json").exists());
-    assert!(registry.close(info.id));
-    assert!(!dir.exists());
-    assert!(!registry.close(info.id));
-    assert!(registry.get(info.id).is_none());
-}
-
-#[test]
-fn external_dump_is_never_deleted() {
-    let root = tempfile::tempdir().unwrap();
-    let outside = tempfile::tempdir().unwrap();
-    let dump = outside.path().join("app.hprof");
-    let registry = HeapRegistry::new(root.path().to_path_buf());
-    let dir = create_snapshot_dir(registry.root()).unwrap();
-    let info = registry.insert(open_in(&dir, &dump, external(&dump)));
-    assert_eq!(info.label, "app.hprof");
-    assert!(dir.join("summary.json").exists());
-    assert!(registry.close(info.id));
-    assert!(!dir.exists());
-    assert!(dump.exists());
-}
-
-#[test]
-fn a_dump_inside_the_dir_of_a_file_snapshot_keeps_the_dir() {
-    let root = tempfile::tempdir().unwrap();
-    let registry = HeapRegistry::new(root.path().to_path_buf());
-    let dir = create_snapshot_dir(registry.root()).unwrap();
-    let dump = dir.join("opened.hprof");
-    let info = registry.insert(open_in(&dir, &dump, external(&dump)));
-    assert!(registry.close(info.id));
-    assert!(dump.exists());
-}
-
-#[test]
-fn a_dir_outside_the_root_is_never_deleted() {
-    let root = tempfile::tempdir().unwrap();
-    let elsewhere = tempfile::tempdir().unwrap();
-    let registry = HeapRegistry::new(root.path().to_path_buf());
-    let dump = elsewhere.path().join("dump.hprof");
-    let info = registry.insert(open_in(elsewhere.path(), &dump, captured()));
-    assert!(registry.close(info.id));
-    assert!(dump.exists());
-    // Neither the root itself nor a path that climbs out of it counts as a snapshot dir.
-    let sneaky = root.path().join("..").join(elsewhere.path().file_name().unwrap());
-    let info = registry.insert(open_in(&sneaky, &dump, captured()));
-    assert!(registry.close(info.id));
-    assert!(dump.exists());
-}
-
-#[cfg(unix)]
-#[test]
-fn a_symlinked_dir_is_not_followed() {
-    let root = tempfile::tempdir().unwrap();
-    let outside = tempfile::tempdir().unwrap();
-    let dump = outside.path().join("dump.hprof");
-    let link = root.path().join("link");
-    std::os::unix::fs::symlink(outside.path(), &link).unwrap();
-    let registry = HeapRegistry::new(root.path().to_path_buf());
-    let info = registry.insert(open_in(&link, &dump, captured()));
-    assert!(registry.close(info.id));
-    assert!(dump.exists());
-}
-
-#[test]
-fn ids_are_never_reused() {
-    let root = tempfile::tempdir().unwrap();
-    let registry = HeapRegistry::new(root.path().to_path_buf());
-    let (first, _) = insert_captured(&registry);
-    assert!(registry.close(first.id));
-    let (second, _) = insert_captured(&registry);
-    let (third, _) = insert_captured(&registry);
-    assert!(first.id.0 < second.id.0 && second.id.0 < third.id.0);
-}
-
-#[test]
-fn the_registry_decides_the_id_in_the_info() {
-    let root = tempfile::tempdir().unwrap();
-    let registry = HeapRegistry::new(root.path().to_path_buf());
-    let dir = create_snapshot_dir(registry.root()).unwrap();
-    let dump = dir.join("dump.hprof");
-    let make = open_in(&dir, &dump, captured());
-    let info = registry.insert(|id| {
-        let mut snapshot = make(id);
-        snapshot.info.id = HeapSnapshotId(u32::MAX);
-        snapshot
-    });
-    assert_ne!(info.id, HeapSnapshotId(u32::MAX));
-    assert_eq!(registry.get(info.id).unwrap().info.id, info.id);
-}
-
-#[test]
-fn list_is_in_opening_order_and_get_shares_the_snapshot() {
-    let root = tempfile::tempdir().unwrap();
-    let registry = HeapRegistry::new(root.path().to_path_buf());
-    let (a, _) = insert_captured(&registry);
-    let (b, _) = insert_captured(&registry);
-    let (c, _) = insert_captured(&registry);
-    assert!(registry.close(b.id));
-    assert_eq!(registry.list(), [a.clone(), c.clone()]);
-    let one = registry.get(a.id).unwrap();
-    let two = registry.get(a.id).unwrap();
-    assert!(Arc::ptr_eq(&one, &two));
-    assert_eq!(one.info, a);
-    assert_eq!(one.index().summary, a.summary);
-}
-
-#[test]
-fn a_snapshot_in_use_keeps_its_dir_until_the_last_holder_lets_go() {
-    let root = tempfile::tempdir().unwrap();
-    let registry = HeapRegistry::new(root.path().to_path_buf());
-    let (info, dir) = insert_captured(&registry);
-    let held = registry.get(info.id).unwrap();
-    assert!(registry.close(info.id));
-    assert!(registry.get(info.id).is_none() && registry.list().is_empty());
-    assert!(dir.exists());
-    drop(held);
-    assert!(!dir.exists());
-}
-
-#[test]
-fn dropping_the_registry_removes_the_open_snapshots() {
-    let root = tempfile::tempdir().unwrap();
-    let registry = HeapRegistry::new(root.path().to_path_buf());
-    let (_, dir) = insert_captured(&registry);
-    drop(registry);
-    assert!(!dir.exists());
-    assert!(names(root.path()).is_empty());
-}
-
-#[cfg(unix)]
-#[test]
-fn new_clears_dirs_whose_owner_died() {
-    let root = tempfile::tempdir().unwrap();
-    let mut child = std::process::Command::new("true").spawn().unwrap();
-    let dead = child.id();
-    child.wait().unwrap();
-    let dead_dir = root.path().join("dead");
-    std::fs::create_dir(&dead_dir).unwrap();
-    std::fs::write(dead_dir.join("owner"), dead.to_string()).unwrap();
-    let live_dir = create_snapshot_dir(root.path()).unwrap();
-    let registry = HeapRegistry::new(root.path().to_path_buf());
-    assert!(!dead_dir.exists());
-    assert!(live_dir.exists());
-    assert_eq!(registry.root(), root.path());
-}
-
-#[test]
-fn concurrent_inserts_get_distinct_ids() {
-    let root = tempfile::tempdir().unwrap();
-    let registry = Arc::new(HeapRegistry::new(root.path().to_path_buf()));
-    let handles: Vec<_> = (0..6)
-        .map(|_| {
-            let registry = registry.clone();
-            std::thread::spawn(move || (0..3).map(|_| insert_captured(&registry).0.id).collect::<Vec<_>>())
-        })
-        .collect();
-    let mut ids: Vec<_> = handles.into_iter().flat_map(|h| h.join().unwrap()).collect();
-    ids.sort_by_key(|id| id.0);
-    ids.dedup();
-    assert_eq!(ids.len(), 18);
-    assert_eq!(registry.list().len(), 18);
-    for id in ids {
-        assert!(registry.close(id));
-    }
-    assert!(names(root.path()).is_empty());
-}
-
-#[test]
-fn labels_name_the_pid_or_the_file() {
-    assert_eq!(captured().label(), "4242");
-    assert_eq!(external(Path::new("/tmp/dumps/app.hprof")).label(), "app.hprof");
-    assert_eq!(external(Path::new("/")).label(), "/");
-}
-
-#[test]
-fn origin_and_info_serialize_as_the_ui_expects() {
-    let value = serde_json::to_value(captured()).unwrap();
-    assert_eq!(
-        value,
-        serde_json::json!({
-            "kind": "captured", "session": 7, "pid": 4242, "javaVersion": "21.0.2",
-            "takenWhileSuspended": true, "dumpMs": 35
-        })
-    );
-    assert_eq!(serde_json::to_value(external(Path::new("/a/b.hprof"))).unwrap()["path"], "/a/b.hprof");
-    assert_eq!(serde_json::to_value(HeapSnapshotId(3)).unwrap(), serde_json::json!(3));
-    let back: HeapOrigin = serde_json::from_value(value).unwrap();
-    assert_eq!(back, captured());
-}
-
-// `HeapRegistry::get` hands out `Arc<OpenSnapshot>` to query threads.
-const _: fn() = || {
-    fn check<T: Send + Sync>() {}
-    check::<HeapIndex>();
-    check::<OpenSnapshot>();
-    check::<HeapRegistry>();
-};
@@ -1,265 +0,0 @@
-//! Shallow sizes: the bytes each object takes in the JVM heap, from the object layout rules, the
-//! JVM's own class histogram, or the distances between object addresses in the dump.
-
-mod layout;
-mod mirrors;
-
-use std::collections::HashMap;
-
-use ide_core::CancellationToken;
-use serde::{Deserialize, Serialize};
-
-pub use self::layout::VmLayout;
-use self::mirrors::{Mirrors, injected_by_table};
-use crate::error::HeapError;
-use crate::graph::{ClassInfo, HeapGraph};
-use crate::hprof::BasicType;
-use crate::names::display_name;
-use crate::progress::CHECK_EVERY;
-
-/// How far past the layout size an address gap may be and still count as an object size.
-const GAP_SLACK: u64 = 64;
-/// Share of the instance types that can have a gap (two or more instances), in tenths, that must
-/// take their size from address gaps for the sizes to be reported as coming from them.
-const GAP_TRUST_TENTHS: usize = 9;
-
-/// Where the sizes of instances came from.
-///
-/// Class objects (mirrors) are approximate in every case: HotSpot leaves the fields it injects
-/// into `java.lang.Class` out of the dump, so their layout size is short by a fixed amount per
-/// mirror. With a histogram that amount is fitted to its `java.lang.Class` row; otherwise (or when
-/// the fit is rejected) it comes from a table measured per JDK and reference size, within a few
-/// bytes per mirror, or is 32 when the JDK is unknown.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub enum SizeSource {
-    /// The JVM's class histogram from the capture.
-    Jvm,
-    /// The smallest distance between neighbouring objects of a type, in a dump the IDE did not
-    /// capture.
-    AddressGaps,
-    Layout,
-}
-
-/// A row of the JVM's class histogram.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct HistogramEntry {
-    /// Display form: `java.lang.String`, `int[]`, `Gen$$Lambda/0x…`.
-    pub name: String,
-    pub instances: u64,
-    pub bytes: u64,
-}
-
-enum TypeSize {
-    Fixed(u64),
-    ObjectArray,
-    /// Class objects are sized one by one; this is for an instance of `java.lang.Class` that is
-    /// not a class object.
-    ClassObject(u64),
-}
-
-/// Shallow size of every object of a [`HeapGraph`]. Instances of a type share one size; arrays
-/// follow the layout; class objects add their statics to the size of `java.lang.Class`.
-pub struct ShallowModel {
-    pub source: SizeSource,
-    layout: VmLayout,
-    /// Per type slot of a class; primitive array slots follow and have no entry.
-    types: Vec<TypeSize>,
-    /// `(node, size)` of each class object, by node.
-    class_objects: Vec<(u32, u64)>,
-    /// Per class slot: another class has the same display name.
-    ambiguous: Vec<bool>,
-}
-
-impl ShallowModel {
-    /// `histogram` is the JVM's class histogram of the same stop as the dump, when the IDE captured
-    /// it. Without it, sizes come from address gaps where they agree with the layout.
-    ///
-    /// A name shared by several classes (several class loaders) never takes a histogram size,
-    /// since the name is the only link between the dump and the histogram; see
-    /// [`Self::is_ambiguous`]. `java.lang.Class` never does either, because mirror sizes vary with
-    /// their statics; the histogram only tells how many bytes HotSpot adds to each mirror.
-    pub fn new(
-        graph: &HeapGraph,
-        layout: VmLayout,
-        histogram: Option<&[HistogramEntry]>,
-        cancel: &CancellationToken,
-    ) -> Result<Self, HeapError> {
-        if cancel.is_cancelled() {
-            return Err(HeapError::Cancelled);
-        }
-        let classes = &graph.classes;
-        let field_bytes = field_bytes(classes, layout);
-        let by_layout: Vec<u64> = field_bytes.iter().map(|&bytes| layout.instance_size(bytes)).collect();
-        let names: Vec<String> = classes.iter().map(|c| display_name(&c.name)).collect();
-        let ambiguous = ambiguous_names(&names);
-
-        let class_slot = graph.class_slot as usize;
-        let mirrors = Mirrors::collect(graph, by_layout[class_slot], layout);
-        let mut fitted = None;
-        if let Some(rows) = histogram
-            && !ambiguous[class_slot]
-        {
-            let mut class_rows = rows.iter().filter(|row| row.name == names[class_slot]);
-            if let (Some(row), None) = (class_rows.next(), class_rows.next()) {
-                fitted = mirrors.fit_injected(graph, layout, by_layout[class_slot], row, cancel)?;
-            }
-        }
-        let injected = fitted.unwrap_or_else(|| injected_by_table(layout));
-
-        let mut types: Vec<TypeSize> = classes
-            .iter()
-            .enumerate()
-            .map(|(slot, class)| {
-                if class.name.starts_with('[') {
-                    TypeSize::ObjectArray
-                } else if slot == class_slot {
-                    TypeSize::ClassObject(layout.align(by_layout[slot] + injected))
-                } else {
-                    TypeSize::Fixed(by_layout[slot])
-                }
-            })
-            .collect();
-        let source = match histogram {
-            Some(rows) => {
-                apply_histogram(&mut types, &names, &ambiguous, rows);
-                SizeSource::Jvm
-            }
-            None => apply_address_gaps(&mut types, graph, &by_layout, cancel)?,
-        };
-        Ok(Self { source, layout, types, class_objects: mirrors.sizes(layout, injected), ambiguous })
-    }
-
-    /// Shallow size of `object` (a node of the graph); 0 for the super-root.
-    pub fn size_of(&self, graph: &HeapGraph, object: u32) -> u64 {
-        let Some(&slot) = graph.types.get(object as usize) else { return 0 };
-        match self.types.get(slot as usize) {
-            Some(&TypeSize::Fixed(size)) => size,
-            Some(TypeSize::ObjectArray) => self.array_size(BasicType::Object, graph.lens[object as usize]),
-            Some(&TypeSize::ClassObject(fallback)) => self
-                .class_objects
-                .binary_search_by_key(&object, |&(node, _)| node)
-                .map_or(fallback, |at| self.class_objects[at].1),
-            None => match graph.prim_type(slot) {
-                Some(ty) => self.array_size(ty, graph.lens[object as usize]),
-                None => 0,
-            },
-        }
-    }
-
-    /// Whether another class has the same display name as the class in `slot`. Sizes of such
-    /// classes come from the layout, and anything joined to them by name (histogram rows, a
-    /// second snapshot) cannot tell them apart.
-    pub fn is_ambiguous(&self, slot: u32) -> bool {
-        self.ambiguous.get(slot as usize).copied().unwrap_or(false)
-    }
-
-    fn array_size(&self, ty: BasicType, len: u32) -> u64 {
-        self.layout.array_size(ty, u64::from(len))
-    }
-}
-
-/// Bytes of instance fields per class, its superclasses included. Super chains always end
-/// (`ClassInfo::super_index` has its cycles cut).
-fn field_bytes(classes: &[ClassInfo], layout: VmLayout) -> Vec<u64> {
-    let mut total: Vec<Option<u64>> = vec![None; classes.len()];
-    let mut path = Vec::new();
-    for start in 0..classes.len() {
-        let mut cursor = Some(start);
-        let mut below = 0;
-        while let Some(c) = cursor {
-            if let Some(known) = total[c] {
-                below = known;
-                break;
-            }
-            path.push(c);
-            cursor = classes[c].super_index.map(|s| s as usize);
-        }
-        while let Some(c) = path.pop() {
-            let own: u64 = classes[c].fields.iter().map(|(_, ty)| ty.heap_size(layout.ref_size)).sum();
-            below += own;
-            total[c] = Some(below);
-        }
-    }
-    total.into_iter().map(Option::unwrap_or_default).collect()
-}
-
-fn ambiguous_names(names: &[String]) -> Vec<bool> {
-    let mut counts: HashMap<&str, u32> = HashMap::with_capacity(names.len());
-    for name in names {
-        *counts.entry(name).or_default() += 1;
-    }
-    names.iter().map(|name| counts[name.as_str()] > 1).collect()
-}
-
-/// `bytes / instances` for each plain class with a histogram row of its name. A name that is
-/// ambiguous in the dump or repeated in the histogram, or a row that is not a whole number of
-/// objects, keeps its layout size.
-fn apply_histogram(types: &mut [TypeSize], names: &[String], ambiguous: &[bool], rows: &[HistogramEntry]) {
-    let mut per_object: HashMap<&str, Option<u64>> = HashMap::with_capacity(rows.len());
-    for row in rows {
-        let size = row.bytes.checked_div(row.instances).filter(|&s| s > 0 && row.bytes % row.instances == 0);
-        per_object.entry(&row.name).and_modify(|seen| *seen = None).or_insert(size);
-    }
-    for (slot, ty) in types.iter_mut().enumerate() {
-        if let TypeSize::Fixed(size) = ty
-            && !ambiguous[slot]
-            && let Some(&Some(from_histogram)) = per_object.get(names[slot].as_str())
-        {
-            *size = from_histogram;
-        }
-    }
-}
-
-/// Takes the smallest distance from an instance to the next object in address order as the size
-/// of its type, for types with two or more instances where that distance is no smaller than the
-/// layout size and at most [`GAP_SLACK`] bigger. The result says [`SizeSource::AddressGaps`] when
-/// nine in ten of the types with two or more instances did; types with one instance have no gap
-/// to measure, so they neither count for nor against.
-fn apply_address_gaps(
-    types: &mut [TypeSize],
-    graph: &HeapGraph,
-    by_layout: &[u64],
-    cancel: &CancellationToken,
-) -> Result<SizeSource, HeapError> {
-    let slots = types.len();
-    let mut instances = vec![0u32; slots];
-    let mut smallest_gap = vec![u64::MAX; slots];
-    let mut ids = graph.ids.ids();
-    let mut current = ids.next();
-    let mut object = 0usize;
-    while let Some(id) = current {
-        if (object as u64).is_multiple_of(CHECK_EVERY) && cancel.is_cancelled() {
-            return Err(HeapError::Cancelled);
-        }
-        let next = ids.next();
-        let slot = graph.types[object] as usize;
-        if matches!(types.get(slot), Some(TypeSize::Fixed(_))) {
-            instances[slot] = instances[slot].saturating_add(1);
-            if let Some(next) = next.filter(|&n| n > id) {
-                smallest_gap[slot] = smallest_gap[slot].min(next - id);
-            }
-        }
-        current = next;
-        object += 1;
-    }
-
-    let (mut measurable, mut by_gap) = (0usize, 0usize);
-    for (slot, ty) in types.iter_mut().enumerate() {
-        let TypeSize::Fixed(size) = ty else { continue };
-        if instances[slot] < 2 {
-            continue;
-        }
-        measurable += 1;
-        let gap = smallest_gap[slot];
-        if (by_layout[slot]..=by_layout[slot] + GAP_SLACK).contains(&gap) {
-            *size = gap;
-            by_gap += 1;
-        }
-    }
-    let trusted = measurable > 0 && by_gap * 10 >= measurable * GAP_TRUST_TENTHS;
-    Ok(if trusted { SizeSource::AddressGaps } else { SizeSource::Layout })
-}
-
-#[cfg(test)]
-mod tests;
@@ -1,113 +0,0 @@
-//! The object layout rules of the JVM that wrote a dump.
-
-use std::collections::HashMap;
-
-use crate::hprof::BasicType;
-
-/// Object layout of the JVM that wrote the dump.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct VmLayout {
-    pub header: u8,
-    /// Bytes of a reference: 4 with compressed oops.
-    pub ref_size: u8,
-    /// Offset of the length field of an array.
-    pub length_offset: u8,
-    /// JDK 21 and older put array elements at the next 8-byte boundary after the length, later
-    /// JDKs at the next boundary of the element size.
-    pub legacy_array_base: bool,
-    pub alignment: u16,
-    /// The JDK the flags came from; `None` when nothing is known about the JVM.
-    pub java_major: Option<u32>,
-}
-
-impl VmLayout {
-    pub const DEFAULT: VmLayout = VmLayout {
-        header: 12,
-        ref_size: 4,
-        length_offset: 12,
-        legacy_array_base: false,
-        alignment: 8,
-        java_major: None,
-    };
-
-    /// `flags` is the output of `VM.flags`, which lists the flags set on this run. Compressed oops
-    /// are off by default and only switched on by ergonomics, so `-XX:+UseCompressedOops` is
-    /// printed exactly when references take 4 bytes; a heap too big for them prints no such flag.
-    /// Before JDK 15 compressed class pointers follow the same rule; with `java_major: None` (JDK
-    /// unknown) they follow the JDK 15+ rule and the array base that of the newest JDKs. Flags
-    /// without any `-XX:` option (an external dump) give [`Self::DEFAULT`] with the array base of
-    /// `java_major` and an unknown JDK, since the reference size is a guess.
-    /// An `ObjectAlignmentInBytes` that is not a power of two in `8..=256` is ignored.
-    pub fn from_vm_flags(flags: &str, java_major: Option<u32>) -> Self {
-        let legacy_array_base = java_major.map_or(Self::DEFAULT.legacy_array_base, |major| major <= 21);
-        let flags = parse_flags(flags);
-        if flags.is_empty() {
-            return VmLayout { legacy_array_base, ..Self::DEFAULT };
-        }
-        let on = |name: &str| flags.get(name) == Some(&"true");
-        let compressed_classes = if java_major.is_none_or(|major| major >= 15) {
-            flags.get("UseCompressedClassPointers") != Some(&"false")
-        } else {
-            on("UseCompressedClassPointers")
-        };
-        let (header, length_offset) = if on("UseCompactObjectHeaders") {
-            (8, 8)
-        } else if compressed_classes {
-            (12, 12)
-        } else {
-            (16, 16)
-        };
-        let alignment = flags
-            .get("ObjectAlignmentInBytes")
-            .and_then(|v| v.parse::<u16>().ok())
-            .filter(|a| (8..=256).contains(a) && a.is_power_of_two())
-            .unwrap_or(Self::DEFAULT.alignment);
-        VmLayout {
-            header,
-            ref_size: if on("UseCompressedOops") { 4 } else { 8 },
-            length_offset,
-            legacy_array_base,
-            alignment,
-            java_major,
-        }
-    }
-
-    /// Size of an instance whose fields (its class and every superclass) take `field_bytes`.
-    pub fn instance_size(&self, field_bytes: u64) -> u64 {
-        let smallest = if self.header == 8 { 8 } else { 16 };
-        self.align(u64::from(self.header) + field_bytes).max(smallest)
-    }
-
-    pub fn array_size(&self, ty: BasicType, len: u64) -> u64 {
-        let element = ty.heap_size(self.ref_size);
-        let base_alignment = if self.legacy_array_base { 8 } else { element };
-        let base = align_to(u64::from(self.length_offset) + 4, base_alignment);
-        self.align(base + element * len)
-    }
-
-    /// `value` rounded up to the object alignment.
-    pub(super) fn align(&self, value: u64) -> u64 {
-        align_to(value, u64::from(self.alignment))
-    }
-}
-
-fn align_to(value: u64, to: u64) -> u64 {
-    value.div_ceil(to.max(1)) * to.max(1)
-}
-
-/// `-XX:+Name` / `-XX:-Name` / `-XX:Name=value` tokens by name; booleans become `"true"` / `"false"`.
-/// A flag given twice keeps its last value, as in the JVM.
-fn parse_flags(flags: &str) -> HashMap<&str, &str> {
-    let mut parsed = HashMap::new();
-    for token in flags.split_whitespace() {
-        let Some(body) = token.strip_prefix("-XX:") else { continue };
-        if let Some(name) = body.strip_prefix('+') {
-            parsed.insert(name, "true");
-        } else if let Some(name) = body.strip_prefix('-') {
-            parsed.insert(name, "false");
-        } else if let Some((name, value)) = body.split_once('=') {
-            parsed.insert(name, value);
-        }
-    }
-    parsed
-}
Автор	SHA1	Повідомлення	Дата
l0ng-ai	fd827aaa5d	chore(deps): update rustix for RUSTSEC-2026-0486	2026-11-11 17:43:39 +08:00
l0ng-ai	cfb5a26f38	test(i18n): allow untranslated framework and JDK names	2026-11-11 17:42:21 +08:00
l0ng-ai	721ef3b1a5	chore: unblock acceptance checks on current main	2026-11-11 17:34:33 +08:00
l0ng-ai	b0f043d8d8	fix(windows): preserve inherited error mode and verify child inheritance	2026-11-11 17:29:50 +08:00
l0ng-ai	8c328610ee	Merge remote-tracking branch 'origin/main' into review/pr2550	2026-11-11 17:27:26 +08:00
l0ng-ai	0b0586a71a	fix(windows): don't show system error boxes for processes that fail to load A broken python.exe found while detecting interpreters made Windows show a modal "System Error" box ("VCRUNTIME140.dll was not found"). The app now sets SEM_FAILCRITICALERRORS \| SEM_NOOPENFILEERRORBOX at startup; child processes inherit the error mode, so such a probe fails with an exit code. Fixes #1161	2026-11-10 23:28:53 +08:00