feat(plugins): commit workflow API for plugins

Plugin API 1.3 adds what commit-message generators and before-commit checks need: - `menu = "commit.message"`: a plugin command, with the plugin's icon, in the toolbar above the commit message of the Commit tool window and the Commit dialog. - `commit.pending-commit()` (`vcs.read`): what Commit would commit right now, per file its repository, path, status and a `git diff` of only the included files and changed blocks against HEAD (1 MiB in all), plus the message, Amend and a revision. The diff is made by the same selection the commit uses, in a copy of the index, so the index and the working tree stay as they are; unsaved editors of the included files are saved first, as Commit does. Only in trusted projects. - `commit.set-commit-message(revision, message)` (`vcs.write`): replaces the message only while the draft is still at that revision, so text the user typed meanwhile is never overwritten (`stale`). - `[[contributes.commitChecks]]` and the optional `commit-checker` export (worlds `plugin-commit-checks` / `commit-checks`): checks listed in Commit Options (on by default, `vcs.commit.disabledPluginChecks` turns them off) and run after the IDE's own; their problems, optionally with a location, stop the commit until Commit Anyway. The window answers the host through `CommitRequested` / `plugin_answer_commit`, also for remote windows. The Rust SDK gains `host::pending_commit`, `host::set_commit_message`, `openidea_plugin::commit` and their mock; a `commit` test fixture exercises them. All components are rebuilt for the WIT change. Refs #1650
2026-11-15 22:25:48 +02:00 · 2026-11-07 16:12:10 +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
@@ -3,6 +3,3 @@ contact_links:
  - name: Download the latest release
    url: https://github.com/l0ng-ai/openidea/releases/latest
    about: Many problems are already fixed. Please check the latest version before reporting.
-  - name: Report a security vulnerability
-    url: https://github.com/l0ng-ai/openidea/security/advisories/new
-    about: Please report security problems privately, not in a public issue.
@@ -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=271.2085.0
-GRADLE=8.14.3
-INTELEPHENSE=1.18.5
-# The JDK projects compile against (JAVA_HOME): library navigation opens its sources.
-JAVA=21
@@ -98,12 +98,12 @@ jobs:
      # Test fixtures write LF files; keep Git from converting them on checkout.
      - run: git config --global core.autocrlf false
      - run: cargo nextest run --workspace --no-fail-fast
-      # nextest ran export_bindings, which rewrites src/bindings.ts and the command snapshot.
-      - name: Bindings and command snapshot are up to date
+      # nextest ran export_bindings, which rewrites src/bindings.ts.
+      - name: Bindings are up to date
        if: runner.os == 'Linux'
-        run: git diff --exit-code src/bindings.ts src-tauri/tests/commands.snap
+        run: git diff --exit-code src/bindings.ts

-  # The remote development server ships as a static Linux binary (release-build.yml):
+  # The remote development server ships as a static Linux binary (release.yml):
  # keep that build working.
  server:
    name: Remote server (linux musl)
@@ -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,15 @@ 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

 jobs:
  smoke:
@@ -46,14 +54,11 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        language: [typescript, python, rust, go, java, kotlin, php, c, cpp]
-    # C/C++ debug with GDB, whose DAP interpreter needs 14+: 22.04 ships 12.1, 24.04 ships 15.
-    runs-on: ${{ (matrix.language == 'c' || matrix.language == 'cpp') && 'ubuntu-24.04' || 'ubuntu-22.04' }}
+        language: [typescript, python, rust, go, java, kotlin]
+    runs-on: ubuntu-22.04
    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.
@@ -69,12 +74,6 @@ jobs:
      - if: matrix.language == 'typescript'
        run: npm install --global "@vtsls/language-server@$VTSLS" "typescript@$TYPESCRIPT"

-      # The smoke builds the c-app fixture and debugs it with GDB's own DAP interpreter.
-      - if: matrix.language == 'c' || matrix.language == 'cpp'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gdb
-
      - if: matrix.language == 'python'
        uses: actions/setup-python@v5
        with: { python-version: "3.12" }
@@ -89,7 +88,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"
@@ -109,17 +108,10 @@ jobs:
          ln -s "$RUNNER_TEMP/kotlin-lsp/kotlin-lsp.sh" "$RUNNER_TEMP/bin/kotlin-lsp"
          echo "$RUNNER_TEMP/bin" >> "$GITHUB_PATH"

-      # Xdebug for the debug smoke; Composer installs the fixture's Pest for the run smoke.
-      - if: matrix.language == 'php'
-        uses: shivammathur/setup-php@v2
-        with: { php-version: "8.5", coverage: xdebug, tools: composer }
-      - if: matrix.language == 'php'
-        run: npm install --global "intelephense@$INTELEPHENSE"
-
      - run: cargo test --locked -p ide-host --test language_smoke --no-run
      - run: cargo test --locked -p ide-host --test language_smoke -- --ignored --exact ${{ matrix.language }}
      - if: matrix.language == 'java'
-        run: cargo test --locked -p ide-host --test project_smoke -- --ignored --exact maven_sync jdk maven_launch_classpath_uses_the_runner_jdk_classifier
+        run: cargo test --locked -p ide-host --test project_smoke -- --ignored --exact maven_sync jdk
      - if: matrix.language == 'kotlin'
        run: cargo test --locked -p ide-host --test project_smoke -- --ignored --exact gradle_sync
      - if: matrix.language == 'python'
@@ -1,119 +0,0 @@
-name: Nightly
-
-# Twice a day, builds the newest main commit that passed CI as a prerelease tagged with its own
-# version, so remote development finds the server of that version. The `nightly` release holds
-# the manifest the nightly app updates from; its tag marks the commit last built, and a run with
-# nothing newer stops there. Only the latest builds are kept.
-on:
-  schedule:
-    - cron: "17 2,14 * * *"
-  workflow_dispatch:
-    inputs:
-      force:
-        description: "Build even if nothing is newer than the last nightly"
-        type: boolean
-        default: false
-
-permissions:
-  contents: read
-
-concurrency:
-  group: nightly
-
-env:
-  GH_TOKEN: ${{ github.token }}
-  GH_REPO: ${{ github.repository }}
-
-jobs:
-  prepare:
-    permissions:
-      actions: read
-      contents: write
-    if: github.repository == 'l0ng-ai/openidea'
-    runs-on: ubuntu-latest
-    outputs:
-      sha: ${{ steps.commit.outputs.sha }}
-      tag: ${{ steps.release.outputs.tag }}
-      release_id: ${{ steps.release.outputs.id }}
-    steps:
-      - id: commit
-        env:
-          FORCE: ${{ inputs.force }}
-        run: |
-          sha="$(gh run list --workflow ci.yml --branch main --event push --status success --limit 1 \
-            --json headSha --jq '.[0].headSha // ""')"
-          if [ -z "$sha" ]; then
-            echo "::notice::no main commit has passed CI"
-            exit 0
-          fi
-          # No `nightly` tag yet (the first run): compare fails and the build goes on.
-          status="$(gh api "repos/$GH_REPO/compare/nightly...$sha" --jq .status 2>/dev/null)" || status=ahead
-          if [ "$status" != ahead ] && [ "$FORCE" != true ]; then
-            echo "::notice::$sha is not newer than the last nightly"
-            exit 0
-          fi
-          echo "sha=$sha" >> "$GITHUB_OUTPUT"
-      - uses: actions/checkout@v5
-        if: steps.commit.outputs.sha != ''
-        with: { ref: "${{ steps.commit.outputs.sha }}" }
-      - uses: actions/setup-node@v5
-        if: steps.commit.outputs.sha != ''
-        with: { node-version: 22 }
-      - uses: dtolnay/rust-toolchain@stable
-        if: steps.commit.outputs.sha != ''
-      - id: release
-        if: steps.commit.outputs.sha != ''
-        env:
-          SHA: ${{ steps.commit.outputs.sha }}
-        run: |
-          version="$(node scripts/nightly-prepare.ts "$(date -u +%Y%m%d%H%M)")"
-          tag="v$version"
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git commit -am "chore: $tag"
-          git tag "$tag"
-          git push origin "$tag"
-          id="$(gh api -X POST "repos/$GH_REPO/releases" -f tag_name="$tag" -f name="OpenIDEA Nightly $version" \
-            -F draft=true -F prerelease=true -f body="Built from $SHA." --jq .id)"
-          echo "tag=$tag" >> "$GITHUB_OUTPUT"
-          echo "id=$id" >> "$GITHUB_OUTPUT"
-
-  binaries:
-    permissions:
-      contents: write
-    needs: prepare
-    if: needs.prepare.outputs.tag != ''
-    uses: ./.github/workflows/release-build.yml
-    with:
-      tag: ${{ needs.prepare.outputs.tag }}
-      release_id: ${{ needs.prepare.outputs.release_id }}
-    secrets: inherit
-
-  publish:
-    permissions:
-      contents: write
-    needs: [prepare, binaries]
-    runs-on: ubuntu-latest
-    env:
-      TAG: ${{ needs.prepare.outputs.tag }}
-      SHA: ${{ needs.prepare.outputs.sha }}
-      KEEP: 14
-    steps:
-      - name: Publish the build
-        run: gh release edit "$TAG" --tag "$TAG" --draft=false
-      - name: Point the updater at it
-        run: |
-          gh release download "$TAG" -p latest.json -D "$RUNNER_TEMP"
-          gh release view nightly >/dev/null 2>&1 ||
-            gh release create nightly --prerelease --latest=false --target "$SHA" --title "OpenIDEA Nightly" \
-              --notes "The update manifest of the nightly builds, and the commit last built."
-          gh release upload nightly "$RUNNER_TEMP/latest.json" --clobber
-          gh api -X PATCH "repos/$GH_REPO/git/refs/tags/nightly" -f sha="$SHA" -F force=true --silent
-      # Failed builds' drafts go too, once they are this old.
-      - name: Delete old builds
-        run: |
-          gh release list --limit 200 --json tagName,createdAt --jq \
-            '[.[] | select(.tagName | contains("-nightly."))] | sort_by(.createdAt) | reverse | .[env.KEEP | tonumber:][].tagName' |
-            while read -r tag; do
-              gh release delete "$tag" --cleanup-tag --yes
-            done
@@ -22,8 +22,6 @@ env:

 jobs:
  merge:
-    # The schedule is for this repository's release; forks can still run it by hand.
-    if: github.event_name != 'schedule' || github.repository == 'l0ng-ai/openidea'
    runs-on: ubuntu-latest
    steps:
      - name: Merge the community index
@@ -1,292 +0,0 @@
-name: Release build
-
-# Builds a tag's desktop apps, remote servers and updater manifest into its draft release.
-# Stable releases (release.yml) and nightly builds (nightly.yml) both run it.
-on:
-  workflow_call:
-    inputs:
-      tag: { type: string, required: true }
-      release_id: { type: string, required: true }
-
-permissions:
-  contents: read
-
-env:
-  CARGO_TERM_COLOR: always
-  CARGO_INCREMENTAL: 0
-  TAG: ${{ inputs.tag }}
-
-jobs:
-  plugin-keys:
-    permissions: {}
-    runs-on: ubuntu-latest
-    outputs:
-      keys: ${{ steps.keys.outputs.keys }}
-    steps:
-      # The official plugins' public key (from PLUGIN_SIGNING_KEY, the seed
-      # `openidea-plugin keygen` writes), built into the app: their packages
-      # must carry its signature whatever the marketplace index lists. Without
-      # the secret the app takes the index's word, as development builds do.
-      - id: keys
-        env:
-          SIGNING_KEY: ${{ secrets.PLUGIN_SIGNING_KEY }}
-        run: |
-          if [ -n "$SIGNING_KEY" ]; then
-            seed="$(printf %s "$SIGNING_KEY" | base64 -d | od -An -tx1 | tr -d ' \n')"
-            key="$(printf '302e020100300506032b657004220420%s' "$seed" | xxd -r -p |
-              openssl pkey -inform DER -pubout -outform DER | tail -c 32 | base64)"
-            echo "keys=$key" >> "$GITHUB_OUTPUT"
-          fi
-
-  build:
-    permissions:
-      contents: write
-    needs: plugin-keys
-    name: Build (${{ matrix.name }})
-    env:
-      OPENIDEA_OFFICIAL_PLUGIN_KEYS: ${{ needs.plugin-keys.outputs.keys }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: macOS arm64
-            os: macos-latest
-            target: aarch64-apple-darwin
-          - name: macOS x64
-            os: macos-latest
-            target: x86_64-apple-darwin
-          - name: Linux x64
-            os: ubuntu-22.04
-            target: x86_64-unknown-linux-gnu
-          - name: Linux arm64
-            os: ubuntu-22.04-arm
-            target: aarch64-unknown-linux-gnu
-          - name: Windows arm64
-            os: windows-11-arm
-            target: aarch64-pc-windows-msvc
-          - name: Windows x64
-            os: windows-latest
-            target: x86_64-pc-windows-msvc
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v5
-        with: { ref: "${{ env.TAG }}" }
-      - uses: pnpm/action-setup@v5
-        with: { version: 11 }
-      - uses: actions/setup-node@v5
-        with: { node-version: 22, cache: pnpm }
-      - uses: dtolnay/rust-toolchain@stable
-        with: { targets: "${{ matrix.target }}" }
-      - uses: Swatinem/rust-cache@v2
-        with: { key: "${{ matrix.target }}", cache-on-failure: true }
-      - name: Linux deps
-        if: runner.os == 'Linux'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev libxdo-dev libssl-dev patchelf
-      - run: pnpm install --frozen-lockfile
-      # Signing is optional: only secrets that are set get exported, so forks and
-      # unconfigured repos produce unsigned builds instead of failing.
-      - name: Signing env
-        shell: bash
-        env:
-          APPLE_CERTIFICATE: ${{ runner.os == 'macOS' && secrets.APPLE_CERTIFICATE || '' }}
-          APPLE_CERTIFICATE_PASSWORD: ${{ runner.os == 'macOS' && secrets.APPLE_CERTIFICATE_PASSWORD || '' }}
-          APPLE_SIGNING_IDENTITY: ${{ runner.os == 'macOS' && secrets.APPLE_SIGNING_IDENTITY || '' }}
-          APPLE_ID: ${{ runner.os == 'macOS' && secrets.APPLE_ID || '' }}
-          APPLE_PASSWORD: ${{ runner.os == 'macOS' && secrets.APPLE_PASSWORD || '' }}
-          APPLE_TEAM_ID: ${{ runner.os == 'macOS' && secrets.APPLE_TEAM_ID || '' }}
-          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
-          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
-        run: |
-          for v in APPLE_CERTIFICATE APPLE_CERTIFICATE_PASSWORD APPLE_SIGNING_IDENTITY APPLE_ID \
-                   APPLE_PASSWORD APPLE_TEAM_ID TAURI_SIGNING_PRIVATE_KEY TAURI_SIGNING_PRIVATE_KEY_PASSWORD; do
-            [ -n "${!v}" ] && { echo "$v<<__EOF__"; echo "${!v}"; echo "__EOF__"; } >> "$GITHUB_ENV"
-          done
-          true
-      - uses: tauri-apps/tauri-action@v0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          releaseId: ${{ inputs.release_id }}
-          tagName: ${{ env.TAG }}
-          args: --target ${{ matrix.target }}
-          # The parallel builds would race on one latest.json; `updater-manifest` writes it once.
-          uploadUpdaterJson: false
-      # tauri-action notarizes the .app but not the DMG around it; notarize and
-      # staple the DMG too, then replace the uploaded asset.
-      - name: Notarize DMG
-        if: runner.os == 'macOS' && env.APPLE_ID != ''
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          for dmg in target/${{ matrix.target }}/release/bundle/dmg/*.dmg; do
-            xcrun notarytool submit "$dmg" --apple-id "$APPLE_ID" --password "$APPLE_PASSWORD" \
-              --team-id "$APPLE_TEAM_ID" --wait
-            xcrun stapler staple "$dmg"
-            # Release assets have no spaces: GitHub stored the first upload with dots.
-            asset="$RUNNER_TEMP/$(basename "$dmg" | tr ' ' .)"
-            cp "$dmg" "$asset"
-            gh release upload "$TAG" "$asset" --clobber
-          done
-      # Portable Windows builds (#1857): on Windows Tauri embeds the
-      # frontend in the exe and WebView2 is a system component, so zipping
-      # the raw exe gives an unpack-and-run alternative to the installers.
-      - name: Portable zip
-        if: runner.os == 'Windows'
-        shell: pwsh
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          $target = "${{ matrix.target }}"
-          $arch = if ($target -like "x86_64*") { "x64" } else { "arm64" }
-          $version = $env:TAG -replace '^v', ''
-          $asset = "OpenIDEA_${version}_windows_${arch}_portable.zip"
-          $dir = "target/$target/release"
-          $files = @("$dir/openidea.exe")
-          if (Test-Path "$dir/WebView2Loader.dll") {
-            $files += "$dir/WebView2Loader.dll"
-          }
-          Compress-Archive -Path $files -DestinationPath $asset -Force
-          $hash = (Get-FileHash $asset -Algorithm SHA256).Hash.ToLower()
-          "$hash  $asset" | Out-File -Encoding ascii "$asset.sha256"
-          gh release upload $env:TAG $asset "$asset.sha256" --clobber
-          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-          if ($env:TAURI_SIGNING_PRIVATE_KEY) {
-            pnpm exec tauri signer sign --app-version $version $asset
-            if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-            gh release upload $env:TAG "$asset.sig" --clobber
-            if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-          }
-
-  # The remote development server, per host platform it can run on. The desktop
-  # app downloads the one for the host (ide-tools `server`) and installs it over SSH.
-  # Linux builds are static (musl), so they run whatever the host's glibc.
-  server:
-    permissions:
-      contents: write
-    name: Server (${{ matrix.os }}-${{ matrix.arch }})
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { runner: ubuntu-22.04, target: x86_64-unknown-linux-musl, os: linux, arch: x86_64 }
-          - { runner: ubuntu-24.04-arm, target: aarch64-unknown-linux-musl, os: linux, arch: aarch64 }
-          - { runner: macos-latest, target: aarch64-apple-darwin, os: macos, arch: aarch64 }
-          - { runner: macos-latest, target: x86_64-apple-darwin, os: macos, arch: x86_64 }
-    runs-on: ${{ matrix.runner }}
-    steps:
-      - uses: actions/checkout@v5
-        with: { ref: "${{ env.TAG }}" }
-      - uses: dtolnay/rust-toolchain@stable
-        with: { targets: "${{ matrix.target }}" }
-      - uses: Swatinem/rust-cache@v2
-        with: { key: "server-${{ matrix.target }}", cache-on-failure: true }
-      - name: musl toolchain
-        if: runner.os == 'Linux'
-        run: sudo apt-get update && sudo apt-get install -y musl-tools
-      - name: Build
-        run: |
-          # musl-tools only ships `musl-gcc`; cc-rs would look for `<arch>-linux-musl-gcc`.
-          if [ "$RUNNER_OS" = Linux ]; then export CC_${TARGET//-/_}=musl-gcc; fi
-          cargo build --release --locked -p ide-host --bin openidea-server --target "$TARGET"
-        env:
-          TARGET: ${{ matrix.target }}
-      - name: Upload
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ASSET: openidea-server-${{ matrix.os }}-${{ matrix.arch }}.gz
-        run: |
-          gzip -9 -c target/${{ matrix.target }}/release/openidea-server > "$ASSET"
-          if command -v sha256sum >/dev/null; then sha256sum "$ASSET"; else shasum -a 256 "$ASSET"; fi > "$ASSET.sha256"
-          gh release upload "$TAG" "$ASSET" "$ASSET.sha256" --clobber
-
-  # The updater manifest (latest.json), built once from the signed bundles every build uploaded.
-  # Fails when a platform is missing, so a release never ships a manifest without it.
-  updater-manifest:
-    permissions:
-      contents: write
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v8
-        env:
-          RELEASE_ID: ${{ inputs.release_id }}
-        with:
-          script: |
-            const { owner, repo } = context.repo;
-            const release_id = Number(process.env.RELEASE_ID);
-            const tag = process.env.TAG;
-            const assets = await github.paginate(github.rest.repos.listReleaseAssets, { owner, repo, release_id });
-            const sigs = assets.filter((a) => a.name.endsWith(".sig"));
-            if (sigs.length === 0) {
-              core.notice("no signed bundles (TAURI_SIGNING_PRIVATE_KEY unset): skipping latest.json");
-              return;
-            }
-            // Bundle suffix → updater platform keys, as tauri-action names them.
-            // Nightly versions don't fit MSI or RPM, so those builds offer NSIS on Windows.
-            const nightly = tag.includes("-nightly.");
-            const windows = (arch, msi, nsis) => nightly
-              ? [[nsis, [`windows-${arch}`, `windows-${arch}-nsis`]]]
-              : [[msi, [`windows-${arch}`, `windows-${arch}-msi`]], [nsis, [`windows-${arch}-nsis`]]];
-            const kinds = [
-              [/_aarch64\.AppImage$/, ["linux-aarch64", "linux-aarch64-appimage"]],
-              [/_arm64\.deb$/, ["linux-aarch64-deb"]],
-              ...(nightly ? [] : [[/\.aarch64\.rpm$/, ["linux-aarch64-rpm"]]]),
-              [/_amd64\.AppImage$/, ["linux-x86_64", "linux-x86_64-appimage"]],
-              [/_amd64\.deb$/, ["linux-x86_64-deb"]],
-              ...(nightly ? [] : [[/\.x86_64\.rpm$/, ["linux-x86_64-rpm"]]]),
-              [/_aarch64\.app\.tar\.gz$/, ["darwin-aarch64", "darwin-aarch64-app"]],
-              [/_x64\.app\.tar\.gz$/, ["darwin-x86_64", "darwin-x86_64-app"]],
-              ...windows("aarch64", /_arm64_en-US\.msi$/, /_arm64-setup\.exe$/),
-              ...windows("x86_64", /_x64_en-US\.msi$/, /_x64-setup\.exe$/),
-              [/_windows_arm64_portable\.zip$/, ["windows-aarch64-portable"]],
-              [/_windows_x64_portable\.zip$/, ["windows-x86_64-portable"]],
-            ];
-            const platforms = {};
-            for (const sig of sigs) {
-              const bundle = sig.name.slice(0, -".sig".length);
-              const kind = kinds.find(([re]) => re.test(bundle));
-              if (!kind) continue;
-              const { data } = await github.rest.repos.getReleaseAsset({
-                owner, repo, asset_id: sig.id, headers: { accept: "application/octet-stream" },
-              });
-              const signature = Buffer.from(data).toString("utf8").trim();
-              const url = `https://github.com/${owner}/${repo}/releases/download/${tag}/${encodeURIComponent(bundle)}`;
-              for (const key of kind[1]) platforms[key] = { signature, url };
-            }
-            const missing = kinds.flatMap(([, keys]) => keys).filter((k) => !platforms[k]);
-            if (missing.length) {
-              core.setFailed(`latest.json would miss ${missing.join(", ")}`);
-              return;
-            }
-            // The update's notes: the release body without its Download section. That
-            // section only matters on the release page, and What's new follows it.
-            const { data: release } = await github.rest.repos.getRelease({ owner, repo, release_id });
-            const withoutDownloadSection = (body) => {
-              const kept = [];
-              let skip = 0;
-              for (const line of body.split(/\r?\n/)) {
-                const heading = /^(#{1,6})\s+(.*)$/.exec(line);
-                if (heading) {
-                  const level = heading[1].length;
-                  if (!skip && level <= 3 && /^download$/i.test(heading[2].trim())) {
-                    skip = level;
-                    continue;
-                  }
-                  if (skip && level <= skip) skip = 0;
-                }
-                if (!skip) kept.push(line);
-              }
-              return kept.join("\n").trim();
-            };
-            const notes = withoutDownloadSection(String(release.body ?? ""));
-            const manifest = { version: tag.replace(/^v/, ""), notes, pub_date: new Date().toISOString(), platforms };
-            const old = assets.find((a) => a.name === "latest.json");
-            if (old) await github.rest.repos.deleteReleaseAsset({ owner, repo, asset_id: old.id });
-            await github.rest.repos.uploadReleaseAsset({
-              owner, repo, release_id, name: "latest.json",
-              data: JSON.stringify(manifest, null, 2),
-              headers: { "content-type": "application/json" },
-            });
-            core.info(`latest.json: ${Object.keys(platforms).sort().join(", ")}`);
@@ -1,7 +1,7 @@
 name: Release
 on:
  push:
-    tags: ["v*", "!v*-nightly.*"]
+    tags: ["v*"]
  workflow_dispatch:
    inputs:
      tag:
@@ -9,7 +9,7 @@ on:
        required: true

 permissions:
-  contents: read
+  contents: write

 concurrency:
  group: release-${{ github.event.inputs.tag || github.ref_name }}
@@ -23,12 +23,10 @@ env:
 jobs:
  # Creates (or reuses) one draft release that every platform build uploads into.
  create-release:
-    if: ${{ !contains(github.event.inputs.tag || github.ref_name, '-nightly.') }}
-    permissions:
-      contents: write
    runs-on: ubuntu-latest
    outputs:
      release_id: ${{ steps.release.outputs.id }}
+      official_plugin_keys: ${{ steps.plugin-keys.outputs.keys }}
    steps:
      - uses: actions/checkout@v5
        with: { ref: "${{ env.TAG }}" }
@@ -49,6 +47,20 @@ jobs:
            echo "::error::plugin API $(api wit) ships without a snapshot ($snapshot is $(api "$snapshot")): copy wit/*.wit to $snapshot/"
            exit 1
          fi
+      # The official plugins' public key (from PLUGIN_SIGNING_KEY, the seed
+      # `openidea-plugin keygen` writes), built into the app: their packages
+      # must carry its signature whatever the marketplace index lists. Without
+      # the secret the app takes the index's word, as development builds do.
+      - id: plugin-keys
+        env:
+          SIGNING_KEY: ${{ secrets.PLUGIN_SIGNING_KEY }}
+        run: |
+          if [ -n "$SIGNING_KEY" ]; then
+            seed="$(printf %s "$SIGNING_KEY" | base64 -d | od -An -tx1 | tr -d ' \n')"
+            key="$(printf '302e020100300506032b657004220420%s' "$seed" | xxd -r -p |
+              openssl pkey -inform DER -pubout -outform DER | tail -c 32 | base64)"
+            echo "keys=$key" >> "$GITHUB_OUTPUT"
+          fi
      - id: release
        uses: actions/github-script@v8
        with:
@@ -62,26 +74,161 @@ jobs:
              core.setOutput("id", existing.id);
              return;
            }
-            // Nightly builds are prereleases: the notes span stable release to stable release.
-            const previous = releases.find((r) => !r.draft && !r.prerelease);
-            const { data: notes } = await github.rest.repos.generateReleaseNotes({
-              owner, repo, tag_name: tag, previous_tag_name: previous?.tag_name,
-            });
            const { data } = await github.rest.repos.createRelease({
              owner, repo, tag_name: tag, name: `OpenIDEA ${tag}`,
-              draft: true, prerelease: tag.includes("-"), body: notes.body,
+              draft: true, prerelease: tag.includes("-"), generate_release_notes: true,
            });
            core.setOutput("id", data.id);

-  binaries:
-    permissions:
-      contents: write
+  build:
    needs: create-release
-    uses: ./.github/workflows/release-build.yml
-    with:
-      tag: ${{ github.event.inputs.tag || github.ref_name }}
-      release_id: ${{ needs.create-release.outputs.release_id }}
-    secrets: inherit
+    name: Build (${{ matrix.name }})
+    env:
+      OPENIDEA_OFFICIAL_PLUGIN_KEYS: ${{ needs.create-release.outputs.official_plugin_keys }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: macOS arm64
+            os: macos-latest
+            target: aarch64-apple-darwin
+          - name: macOS x64
+            os: macos-latest
+            target: x86_64-apple-darwin
+          - name: Linux x64
+            os: ubuntu-22.04
+            target: x86_64-unknown-linux-gnu
+          - name: Linux arm64
+            os: ubuntu-22.04-arm
+            target: aarch64-unknown-linux-gnu
+          - name: Windows arm64
+            os: windows-11-arm
+            target: aarch64-pc-windows-msvc
+          - name: Windows x64
+            os: windows-latest
+            target: x86_64-pc-windows-msvc
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v5
+        with: { ref: "${{ env.TAG }}" }
+      - uses: pnpm/action-setup@v5
+        with: { version: 11 }
+      - uses: actions/setup-node@v5
+        with: { node-version: 22, cache: pnpm }
+      - uses: dtolnay/rust-toolchain@stable
+        with: { targets: "${{ matrix.target }}" }
+      - uses: Swatinem/rust-cache@v2
+        with: { key: "${{ matrix.target }}" }
+      - name: Linux deps
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev libxdo-dev libssl-dev patchelf
+      - run: pnpm install --frozen-lockfile
+      # Signing is optional: only secrets that are set get exported, so forks and
+      # unconfigured repos produce unsigned builds instead of failing.
+      - name: Signing env
+        shell: bash
+        env:
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
+          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
+        run: |
+          for v in APPLE_CERTIFICATE APPLE_CERTIFICATE_PASSWORD APPLE_SIGNING_IDENTITY APPLE_ID \
+                   APPLE_PASSWORD APPLE_TEAM_ID TAURI_SIGNING_PRIVATE_KEY TAURI_SIGNING_PRIVATE_KEY_PASSWORD; do
+            [ -n "${!v}" ] && { echo "$v<<__EOF__"; echo "${!v}"; echo "__EOF__"; } >> "$GITHUB_ENV"
+          done
+          true
+      - uses: tauri-apps/tauri-action@v0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          releaseId: ${{ needs.create-release.outputs.release_id }}
+          tagName: ${{ env.TAG }}
+          args: --target ${{ matrix.target }}
+          # The parallel builds would race on one latest.json; `updater-manifest` writes it once.
+          uploadUpdaterJson: false
+      # tauri-action notarizes the .app but not the DMG around it; notarize and
+      # staple the DMG too, then replace the uploaded asset.
+      - name: Notarize DMG
+        if: runner.os == 'macOS' && env.APPLE_ID != ''
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          for dmg in target/${{ matrix.target }}/release/bundle/dmg/*.dmg; do
+            xcrun notarytool submit "$dmg" --apple-id "$APPLE_ID" --password "$APPLE_PASSWORD" \
+              --team-id "$APPLE_TEAM_ID" --wait
+            xcrun stapler staple "$dmg"
+            gh release upload "$TAG" "$dmg" --clobber
+          done
+      # Portable Windows builds (#1857): on Windows Tauri embeds the
+      # frontend in the exe and WebView2 is a system component, so zipping
+      # the raw exe gives an unpack-and-run alternative to the installers.
+      - name: Portable zip
+        if: runner.os == 'Windows'
+        shell: pwsh
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          $target = "${{ matrix.target }}"
+          $arch = if ($target -like "x86_64*") { "x64" } else { "arm64" }
+          $version = $env:TAG -replace '^v', ''
+          $asset = "OpenIDEA_${version}_windows_${arch}_portable.zip"
+          $dir = "target/$target/release"
+          $files = @("$dir/openidea.exe")
+          if (Test-Path "$dir/WebView2Loader.dll") {
+            $files += "$dir/WebView2Loader.dll"
+          }
+          Compress-Archive -Path $files -DestinationPath $asset -Force
+          $hash = (Get-FileHash $asset -Algorithm SHA256).Hash.ToLower()
+          "$hash  $asset" | Out-File -Encoding ascii "$asset.sha256"
+          gh release upload $env:TAG $asset "$asset.sha256" --clobber
+
+  # The remote development server, per host platform it can run on. The desktop
+  # app downloads the one for the host (ide-tools `server`) and installs it over SSH.
+  # Linux builds are static (musl), so they run whatever the host's glibc.
+  server:
+    needs: create-release
+    name: Server (${{ matrix.os }}-${{ matrix.arch }})
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { runner: ubuntu-22.04, target: x86_64-unknown-linux-musl, os: linux, arch: x86_64 }
+          - { runner: ubuntu-24.04-arm, target: aarch64-unknown-linux-musl, os: linux, arch: aarch64 }
+          - { runner: macos-latest, target: aarch64-apple-darwin, os: macos, arch: aarch64 }
+          - { runner: macos-latest, target: x86_64-apple-darwin, os: macos, arch: x86_64 }
+    runs-on: ${{ matrix.runner }}
+    steps:
+      - uses: actions/checkout@v5
+        with: { ref: "${{ env.TAG }}" }
+      - uses: dtolnay/rust-toolchain@stable
+        with: { targets: "${{ matrix.target }}" }
+      - uses: Swatinem/rust-cache@v2
+        with: { key: "server-${{ matrix.target }}" }
+      - name: musl toolchain
+        if: runner.os == 'Linux'
+        run: sudo apt-get update && sudo apt-get install -y musl-tools
+      - name: Build
+        run: |
+          # musl-tools only ships `musl-gcc`; cc-rs would look for `<arch>-linux-musl-gcc`.
+          if [ "$RUNNER_OS" = Linux ]; then export CC_${TARGET//-/_}=musl-gcc; fi
+          cargo build --release --locked -p ide-host --bin openidea-server --target "$TARGET"
+        env:
+          TARGET: ${{ matrix.target }}
+      - name: Upload
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ASSET: openidea-server-${{ matrix.os }}-${{ matrix.arch }}.gz
+        run: |
+          gzip -9 -c target/${{ matrix.target }}/release/openidea-server > "$ASSET"
+          if command -v sha256sum >/dev/null; then sha256sum "$ASSET"; else shasum -a 256 "$ASSET"; fi > "$ASSET.sha256"
+          gh release upload "$TAG" "$ASSET" "$ASSET.sha256" --clobber

  # The official plugins, signed, and the marketplace index released apps read
  # (releases/latest/download/plugins-index.json). They are not in the
@@ -93,8 +240,6 @@ jobs:
  # openidea-plugin tool for Linux x64, which that workflow and the registry's
  # checks run.
  plugins:
-    permissions:
-      contents: write
    needs: create-release
    name: Official plugins
    runs-on: ubuntu-22.04
@@ -158,10 +303,70 @@ jobs:
          gh release upload "$TAG" "$out"/*.oiplugin "$out/plugins-index.json" \
            "$out/openidea-plugin-linux-x86_64.gz" --clobber

+  # The updater manifest (latest.json), built once from the signed bundles every build uploaded.
+  # Fails when a platform is missing, so a release never ships a manifest without it.
+  updater-manifest:
+    needs: [create-release, build]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@v8
+        env:
+          RELEASE_ID: ${{ needs.create-release.outputs.release_id }}
+        with:
+          script: |
+            const { owner, repo } = context.repo;
+            const release_id = Number(process.env.RELEASE_ID);
+            const tag = process.env.TAG;
+            const assets = await github.paginate(github.rest.repos.listReleaseAssets, { owner, repo, release_id });
+            const sigs = assets.filter((a) => a.name.endsWith(".sig"));
+            if (sigs.length === 0) {
+              core.notice("no signed bundles (TAURI_SIGNING_PRIVATE_KEY unset): skipping latest.json");
+              return;
+            }
+            // Bundle suffix → updater platform keys, as tauri-action names them.
+            const kinds = [
+              [/_aarch64\.AppImage$/, ["linux-aarch64", "linux-aarch64-appimage"]],
+              [/_arm64\.deb$/, ["linux-aarch64-deb"]],
+              [/\.aarch64\.rpm$/, ["linux-aarch64-rpm"]],
+              [/_amd64\.AppImage$/, ["linux-x86_64", "linux-x86_64-appimage"]],
+              [/_amd64\.deb$/, ["linux-x86_64-deb"]],
+              [/\.x86_64\.rpm$/, ["linux-x86_64-rpm"]],
+              [/_aarch64\.app\.tar\.gz$/, ["darwin-aarch64", "darwin-aarch64-app"]],
+              [/_x64\.app\.tar\.gz$/, ["darwin-x86_64", "darwin-x86_64-app"]],
+              [/_arm64_en-US\.msi$/, ["windows-aarch64", "windows-aarch64-msi"]],
+              [/_arm64-setup\.exe$/, ["windows-aarch64-nsis"]],
+              [/_x64_en-US\.msi$/, ["windows-x86_64", "windows-x86_64-msi"]],
+              [/_x64-setup\.exe$/, ["windows-x86_64-nsis"]],
+            ];
+            const platforms = {};
+            for (const sig of sigs) {
+              const bundle = sig.name.slice(0, -".sig".length);
+              const kind = kinds.find(([re]) => re.test(bundle));
+              if (!kind) continue;
+              const { data } = await github.rest.repos.getReleaseAsset({
+                owner, repo, asset_id: sig.id, headers: { accept: "application/octet-stream" },
+              });
+              const signature = Buffer.from(data).toString("utf8").trim();
+              const url = `https://github.com/${owner}/${repo}/releases/download/${tag}/${encodeURIComponent(bundle)}`;
+              for (const key of kind[1]) platforms[key] = { signature, url };
+            }
+            const missing = kinds.flatMap(([, keys]) => keys).filter((k) => !platforms[k]);
+            if (missing.length) {
+              core.setFailed(`latest.json would miss ${missing.join(", ")}`);
+              return;
+            }
+            const manifest = { version: tag.replace(/^v/, ""), notes: "", pub_date: new Date().toISOString(), platforms };
+            const old = assets.find((a) => a.name === "latest.json");
+            if (old) await github.rest.repos.deleteReleaseAsset({ owner, repo, asset_id: old.id });
+            await github.rest.repos.uploadReleaseAsset({
+              owner, repo, release_id, name: "latest.json",
+              data: JSON.stringify(manifest, null, 2),
+              headers: { "content-type": "application/json" },
+            });
+            core.info(`latest.json: ${Object.keys(platforms).sort().join(", ")}`);
+
  publish:
-    permissions:
-      contents: write
-    needs: [create-release, binaries, plugins]
+    needs: [create-release, build, server, plugins, updater-manifest]
    runs-on: ubuntu-latest
    steps:
      - uses: actions/github-script@v8
@@ -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,12 +9,10 @@
    "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",
+    "docs/plugins/themes.md",
    "pnpm-lock.yaml",
    "**/*.toml",
    "fixtures",
@@ -21,13 +21,11 @@ Visual style: dark, low-contrast greys, one cool accent
 - `crates/ide-host` — the `openidea-server` binary for remote development and the
  `openidea-plugin` CLI (plugin starter templates live in its `templates.rs`).
 - `wit/` — plugin interface definitions; `plugins/` — sample and bundled plugins.
-  Plugin docs: `plugins/README.md`, `plugins/themes.md`.
+  Plugin docs: `plugins/README.md`, `docs/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.
- `docs/` — the Mintlify documentation site (`docs.json` navigation, `en/` and `zh/` pages);
-  preview with `npx mint dev` in `docs/`.
+- `e2e/` — Playwright UI tests (`pnpm e2e`). `fixtures/` — sample projects per language
+  for manual and automated testing.

 ## Rules

@@ -59,12 +57,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 +79,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.

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

 [workspace.package]
-version = "0.1.45"
+version = "0.1.38"
 edition = "2024"
 rust-version = "1.96"
 license = "Apache-2.0"
@@ -42,16 +42,9 @@ ide-fonts = { path = "crates/ide-fonts" }
 ide-ssh = { path = "crates/ide-ssh" }
 ide-remote = { path = "crates/ide-remote" }
 ide-host = { path = "crates/ide-host" }
-ide-mcp = { path = "crates/ide-mcp" }
-ide-scaffold = { path = "crates/ide-scaffold" }
 ide-notebook = { path = "crates/ide-notebook" }
 ide-extension = { path = "crates/ide-extension" }
 ide-plugin = { path = "crates/ide-plugin" }
-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 +61,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,10 +80,7 @@ trash = "5"
 blake3 = "1"
 dunce = "1"
 dirs = "6"
-memmap2 = "0.9"
-zip = { version = "9.2.3", default-features = false, features = ["deflate"] }
-flate2 = "1"
-tar = "0.4"
+zip = { version = "9", default-features = false, features = ["deflate"] }

 # search, index, language
 grep-searcher = "0.1"
@@ -112,11 +101,9 @@ portable-pty = "0.9"
 reqwest = { version = "0.13", default-features = false, features = ["rustls-no-provider", "http2", "charset", "socks", "gzip", "deflate", "brotli"] }
 rustls = { version = "0.23", default-features = false, features = ["ring", "std", "tls12", "logging"] }
 rustls-platform-verifier = "0.7"
-# Until SQLx releases its libsqlite3-sys 0.39 update (RUSTSEC-2026-0459).
-sqlx = { version = "0.9", git = "https://github.com/l0ng-ai/sqlx", rev = "9894985a1babc7e6bc0437da4fd43e3143184073", default-features = false, features = ["runtime-tokio", "tls-rustls-ring-webpki", "sqlite", "postgres", "mysql"] }
+sqlx = { version = "0.9", default-features = false, features = ["runtime-tokio", "tls-rustls-ring-webpki", "sqlite", "postgres", "mysql"] }
 tiberius = { version = "0.13", default-features = false, features = ["tds73", "rustls", "sql-browser-tokio"] }
-# Pure-Rust thin Oracle driver; pinned to the beta until it stabilizes.
-oracledb = "=26.0.0-beta.5"
+oracle = { version = "0.6", default-features = false }
 bb8 = "0.9"
 uuid = { version = "1", features = ["v4"] }
 # OS credential stores
@@ -142,9 +129,7 @@ debug = false

 [profile.release]
 codegen-units = 1
-# Thin LTO: fat LTO's whole-program link outgrew the 16 GB release runners
-# (Linux arm64 was killed mid-link from v0.1.39 on).
-lto = "thin"
+lto = true
 opt-level = 3
 # Unwind, so a panic fails one task or command instead of quitting the IDE.
 panic = "unwind"
@@ -9,15 +9,9 @@
  The IDE you know, rebuilt in Rust.
 </p>

-<p align="center">
-  English · <a href="README.zh-CN.md">简体中文</a> · <a href="README.tr.md">Türkçe</a>
-</p>
-
 <p align="center">
  <a href="https://github.com/l0ng-ai/openidea/releases/latest"><b>Download</b></a>
  &nbsp;·&nbsp;
-  <a href="https://openidea.sh">Docs</a>
-  &nbsp;·&nbsp;
  <a href="#benchmark">Benchmark</a>
  &nbsp;·&nbsp;
  <a href="#plugins">Plugins</a>
@@ -31,7 +25,9 @@ OpenIDEA brings the IntelliJ IDEA way of working — its keymap, its tool window
 its search-everything habits — to a native app with a Rust core.

 Editor, code insight, debugger, Git, terminal, database and HTTP clients,
-for 60+ languages. Builds for macOS, Windows and Linux.
+for 60+ languages. Builds for macOS, Windows and Linux. On Windows, if you'd
+rather skip the installer, each release also ships a portable zip — unpack it
+and run `openidea.exe`.

 ## Benchmark

@@ -60,7 +56,7 @@ themes, file icons and languages. They run as sandboxed WebAssembly components;
 themes, icon themes and languages need no code at all.

 Install them from Settings › Plugins, or start your own with
-`openidea-plugin new` — see [Writing OpenIDEA plugins](https://openidea.sh/en/plugins) and
+`openidea-plugin new` — see [Writing OpenIDEA plugins](plugins/README.md) and
 the [official plugins](plugins/official). The plugin API is still a preview.

 ## Community
@@ -68,12 +64,20 @@ the [official plugins](plugins/official). The plugin API is still a preview.
 - [Discord](https://discord.gg/2Zy4yn7gP) — questions, feedback and release news.
 - WeChat group — scan to join:

-  <img src=".github/assets/wechat-group.png" alt="WeChat group QR code" width="200">
+  <img src="docs/assets/wechat-group.png" alt="WeChat group QR code" width="200">

- Contributing: see [CONTRIBUTING.md](CONTRIBUTING.md) and the [contributor docs](https://openidea.sh/en/contribute/setup).
+### Contributors
+
+<a href="https://github.com/l0ng-ai/openidea/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=l0ng-ai/openidea&max=100" alt="OpenIDEA contributors">
+</a>

 ## License

 [Apache 2.0](LICENSE). Bundled third-party assets are listed in [`THIRD_PARTY_LICENSES.md`](THIRD_PARTY_LICENSES.md).

+Database tool window notes, including Oracle Instant Client setup, are in
+[`docs/databases.md`](docs/databases.md).
+Java language server choices and their capabilities are in [`docs/java.md`](docs/java.md).
+
 <sub>Not affiliated with JetBrains. IntelliJ IDEA is a trademark of JetBrains s.r.o.</sub>
@@ -1,79 +0,0 @@
-<p align="center">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="src-tauri/icons/source/openidea-wordmark-dark.svg">
-    <img src="src-tauri/icons/source/openidea-wordmark.svg" alt="OpenIDEA" height="56">
-  </picture>
-</p>
-
-<p align="center">
-  Bildiğin IDE, Rust ile yeniden yazıldı.
-</p>
-
-<p align="center">
-  <a href="README.md">English</a> · <a href="README.zh-CN.md">简体中文</a> · Türkçe
-</p>
-
-<p align="center">
-  <a href="https://github.com/l0ng-ai/openidea/releases/latest"><b>İndir</b></a>
-  &nbsp;·&nbsp;
-  <a href="https://openidea.sh">Belgeler</a>
-  &nbsp;·&nbsp;
-  <a href="#performans-karşılaştırması">Performans</a>
-  &nbsp;·&nbsp;
-  <a href="#eklentiler">Eklentiler</a>
-  &nbsp;·&nbsp;
-  <a href="#topluluk">Topluluk</a>
-</p>
-
-https://github.com/user-attachments/assets/234dd54c-1255-4b3a-b35c-533d78d737c0
-
-OpenIDEA, IntelliJ IDEA'nın çalışma biçimini (kısayol tuşlarını, araç pencerelerini,
-her şeyi arama alışkanlığını) çekirdeği Rust ile yazılmış yerel bir uygulamaya taşır.
-
-Editör, kod analizi, hata ayıklayıcı (debugger), Git, terminal, veritabanı ve HTTP istemcileri;
-60'tan fazla dil için. macOS, Windows ve Linux sürümleri var.
-
-## Performans karşılaştırması
-
-[freqtrade](https://github.com/freqtrade/freqtrade) projesini (Python, ~770 dosya)
-önbellekler hazırken açma, 5 çalıştırmanın ortancası:
-
-|                                    | OpenIDEA              | IntelliJ IDEA 2026.2.3 |
-| ---------------------------------- | --------------------- | ---------------------- |
-| Projeyle pencerenin açılması       | **0,9 sn**            | 3,1 sn                 |
-| Hazır (CPU sakinleşti)             | **1,1 sn**            | 13,2 sn                |
-| Bellek (USS, tüm işlemler)         | **169 MB**            | 2011 MB                |
-| Hazır olana kadar CPU süresi       | **2,4 sn**            | 47,9 sn                |
-| Boştayken CPU                      | Bir çekirdeğin **%4**'ü | Bir çekirdeğin %7'si |
-| Kapanma                            | **0,3 sn**            | 5,9 sn                 |
-
-`main` dalından derlenmiş bir OpenIDEA sürümü ve varsayılan ayar ve eklentilerle IDEA;
-Windows 11, 32 çekirdekli AMD, 62 GB RAM.
-IDEA, Python'u daha derinlemesine analiz eder; yani "hazır" iki tarafta aynı işi ifade etmez.
-İkisi de dışarıdan, aynı yöntemle ölçüldü: kendi makinende ve projelerinde denemek için
-[`perf/compare`](perf/compare) klasörüne bak.
-
-## Eklentiler
-
-Eklentiler; eylemler, kod tamamlama, hızlı düzeltmeler, araç pencereleri, özel editörler,
-temalar, dosya simgeleri ve diller ekler. Korumalı (sandbox) WebAssembly bileşenleri olarak çalışırlar;
-temalar, simge temaları ve diller için hiç kod yazmak gerekmez.
-
-Eklentileri Ayarlar › Eklentiler (Settings › Plugins) bölümünden kur ya da
-`openidea-plugin new` ile kendininkini başlat. Ayrıntılar için [OpenIDEA eklentisi yazmak](https://openidea.sh/en/plugins) sayfasına ve
-[resmi eklentilere](plugins/official) bak. Eklenti API'si hâlâ önizleme aşamasında.
-
-## Topluluk
-
- [Discord](https://discord.gg/2Zy4yn7gP): sorular, geri bildirim ve sürüm haberleri.
- WeChat grubu, katılmak için kodu okut:
-
-  <img src=".github/assets/wechat-group.png" alt="WeChat grubu QR kodu" width="200">
-
- Katkıda bulunmak için: [CONTRIBUTING.md](CONTRIBUTING.md) ve [katkıcı belgeleri](https://openidea.sh/en/contribute/setup).
-
-## Lisans
-
-[Apache 2.0](LICENSE). Pakete dahil üçüncü taraf varlıklar [`THIRD_PARTY_LICENSES.md`](THIRD_PARTY_LICENSES.md) dosyasında listelenir.
-
-<sub>JetBrains ile bağlantılı değildir. IntelliJ IDEA, JetBrains s.r.o.'nun ticari markasıdır.</sub>
@@ -1,88 +0,0 @@
-<p align="center">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="src-tauri/icons/source/openidea-wordmark-dark.svg">
-    <img src="src-tauri/icons/source/openidea-wordmark.svg" alt="OpenIDEA" height="56">
-  </picture>
-</p>
-
-<p align="center">
-  你熟悉的 IDE，用 Rust 重新打造。
-</p>
-
-<p align="center">
-  <a href="README.md">English</a> · 简体中文
-</p>
-
-<p align="center">
-  <a href="https://github.com/l0ng-ai/openidea/releases/latest"><b>下载</b></a>
-  &nbsp;·&nbsp;
-  <a href="https://openidea.sh/zh">文档</a>
-  &nbsp;·&nbsp;
-  <a href="#性能对比">性能对比</a>
-  &nbsp;·&nbsp;
-  <a href="#插件">插件</a>
-  &nbsp;·&nbsp;
-  <a href="#社区">社区</a>
-  &nbsp;·&nbsp;
-  <a href="#赞助">赞助</a>
-</p>
-
-https://github.com/user-attachments/assets/234dd54c-1255-4b3a-b35c-533d78d737c0
-
-OpenIDEA 把 IntelliJ IDEA 的使用方式（快捷键、工具窗口、随处搜索的习惯）带到一个以 Rust
-为核心的原生桌面应用里。
-
-编辑器、代码洞察、调试器、Git、终端、数据库客户端和 HTTP 客户端，支持 60 多种语言。
-提供 macOS、Windows 和 Linux 版本。
-
-## 性能对比
-
-在缓存已预热的情况下打开 [freqtrade](https://github.com/freqtrade/freqtrade)（Python，约 770 个文件），
-取 5 次运行的中位数：
-
-|                       | OpenIDEA       | IntelliJ IDEA 2026.2.3 |
-| --------------------- | -------------- | ---------------------- |
-| 显示项目窗口          | **0.9 s**      | 3.1 s                  |
-| 就绪（CPU 平稳）      | **1.1 s**      | 13.2 s                 |
-| 内存（USS，所有进程） | **169 MB**     | 2011 MB                |
-| 就绪前消耗的 CPU 时间 | **2.4 s**      | 47.9 s                 |
-| 空闲 CPU              | 单核的 **4 %** | 单核的 7 %             |
-| 退出                  | **0.3 s**      | 5.9 s                  |
-
-测试使用 `main` 分支的 OpenIDEA release 构建，以及默认设置和插件的 IDEA，环境为 Windows 11、
-32 核 AMD、62 GB 内存。IDEA 对 Python 的分析更深入，所以两边的“就绪”并不代表完成了同样多的工作。
-两者都以相同方式从外部测量：可以用 [`perf/compare`](perf/compare) 在自己的机器和项目上复现。
-
-## 插件
-
-插件可以添加操作、补全、快速修复、工具窗口、自定义编辑器、主题、文件图标和语言。插件以沙箱化的
-WebAssembly 组件运行；主题、图标主题和语言无需编写代码。
-
-在“设置 › 插件”中安装，或用 `openidea-plugin new` 创建自己的插件：参见
-[编写 OpenIDEA 插件](https://openidea.sh/zh/plugins)和[官方插件](plugins/official)。插件 API 目前仍是预览版。
-
-## 社区
-
- [Discord](https://discord.gg/2Zy4yn7gP)：提问、反馈和版本发布消息。
- 微信群，扫码加入：
-
-  <img src=".github/assets/wechat-group.png" alt="微信群二维码" width="200">
-
- 参与贡献：参见 [CONTRIBUTING.md](CONTRIBUTING.md) 和[贡献者文档](https://openidea.sh/zh/contribute/setup)。
-
-## 赞助
-
-如果 OpenIDEA 帮你节省了时间，可以通过支付宝或微信支付支持它的开发。
-
-<table>
-  <tr>
-    <td align="center"><img src=".github/assets/sponsor-alipay.png" alt="支付宝收款码" width="200"><br>支付宝</td>
-    <td align="center"><img src=".github/assets/sponsor-wechat.png" alt="微信支付收款码" width="200"><br>微信支付</td>
-  </tr>
-</table>
-
-## 许可证
-
-[Apache 2.0](LICENSE)。随附的第三方资源列在 [`THIRD_PARTY_LICENSES.md`](THIRD_PARTY_LICENSES.md) 中。
-
-<sub>与 JetBrains 无关联。IntelliJ IDEA 是 JetBrains s.r.o. 的商标。</sub>
@@ -1,26 +0,0 @@
-# Security policy
-
-## Reporting a vulnerability
-
-Please do not report security problems in public issues, pull requests or discussions.
-
-Report them privately through GitHub:
-[Report a vulnerability](https://github.com/l0ng-ai/openidea/security/advisories/new)
-(repository **Security** tab → **Report a vulnerability**). Only the maintainers can see
-the report.
-
-Include what you can of:
-
- the affected version, platform, and whether remote development (`openidea-server`)
-  or plugins are involved;
- steps to reproduce, or a proof of concept;
- the impact you expect, and any fix you suggest.
-
-We will acknowledge the report, keep you updated in the advisory, and agree on a
-disclosure date with you. Fixes are released as a new version, and the advisory is
-published once users can update.
-
-## Supported versions
-
-Security fixes go into the latest release. Please check that the problem still occurs
-there before reporting.
@@ -1,11 +1,5 @@
 # Third-party licenses

-## Project type icons
-
-`src/ui/brands/*.svg` use the unmodified logo paths from
-[Simple Icons](https://github.com/simple-icons/simple-icons), retrieved through
-Iconify (`simple-icons:angular`, `simple-icons:astro`, `simple-icons:cplusplus`, `simple-icons:dart`, `simple-icons:django`, `simple-icons:dotnet`, `simple-icons:elixir`, `simple-icons:express`, `simple-icons:fastapi`, `simple-icons:flask`, `simple-icons:flutter`, `simple-icons:go`, `simple-icons:haskell`, `simple-icons:html5`, `simple-icons:kotlin`, `simple-icons:ktor`, `simple-icons:laravel`, `simple-icons:nestjs`, `simple-icons:nextdotjs`, `simple-icons:nodedotjs`, `simple-icons:nuxt`, `simple-icons:openjdk`, `simple-icons:phoenixframework`, `simple-icons:php`, `simple-icons:python`, `simple-icons:quarkus`, `simple-icons:ruby`, `simple-icons:rubyonrails`, `simple-icons:rust`, `simple-icons:scala`, `simple-icons:springboot`, `simple-icons:svelte`, `simple-icons:swift`, `simple-icons:symfony`, `simple-icons:vite`, `simple-icons:zig`) and filled with the brand colors (the standard icon grey for black logos). Licensed under [CC0 1.0 Universal](https://github.com/simple-icons/simple-icons/blob/develop/LICENSE.md).
-
 ## Project Lombok

 `java/lombok/lombok-1.18.48-openidea.3.jar` contains Project Lombok v1.18.48 with the Equinox
@@ -268,7 +262,7 @@ END OF TERMS AND CONDITIONS

 The Solarized palettes in `src/styles/tokens.css` are adapted from
 [Ethan Schoonover’s Solarized](https://github.com/altercation/solarized/tree/62f656a02f93c5190a8753159e34b385588d5ff3).
-MIT license:
+See [theme sources and mapping](docs/themes.md). MIT license:

 ```text
 Copyright (c) 2011 Ethan Schoonover
@@ -296,11 +290,7 @@ THE SOFTWARE.

 The One palettes and semantic syntax mapping in `src/styles/tokens.css` are
 adapted from GitHub’s Atom One syntax and UI themes.
-Source revisions:
-[one-light-syntax d845790](https://github.com/atom/one-light-syntax/tree/d84579027410c576086dfca14d934c4bd74b0438),
-[one-dark-syntax 9c96f44](https://github.com/atom/one-dark-syntax/tree/9c96f4454362267ac45322063e193ccf9d2debb1),
-[one-light-ui a27bce3](https://github.com/atom/one-light-ui/tree/a27bce35088ecd323e44f5c2510bcf2d4e9efcf8),
-[one-dark-ui 18c2143](https://github.com/atom/one-dark-ui/tree/18c2143d41e17b337fff6dc7024562c4d999be17).
+Source revisions are listed in [theme sources and mapping](docs/themes.md).
 Both syntax themes use the following MIT notice:

 ```text
@@ -7,10 +7,8 @@ license.workspace = true

 [dependencies]
 encoding_rs.workspace = true
-blake3.workspace = true
 ide-vfs.workspace = true
 ide-core.workspace = true
-ide-mcp.workspace = true
 ide-jsonrpc.workspace = true
 ide-vcs.workspace = true
 ide-tools = { path = "../ide-tools" }
@@ -23,8 +21,7 @@ tracing.workspace = true
 parking_lot.workspace = true
 dunce.workspace = true
 uuid.workspace = true
-tempfile.workspace = true
 which = "8"

 [dev-dependencies]
-tokio = { workspace = true, features = ["test-util"] }
+tempfile.workspace = true
@@ -1,129 +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::catalogs::Discovered;
-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<Discovered, String> {
-    let prefer_stored = crate::provider::prefer_stored_copilot_auth();
-    match run_once(shared, spec, prefer_stored).await {
-        Err(err)
-            if !prefer_stored
-                && crate::provider::is_copilot_provider(&spec.id)
-                && crate::provider::has_unconfigured_copilot_ambient_token(&spec.env)
-                && super::auth_required(0, &err) =>
-        {
-            let retry = run_once(shared, spec, true).await;
-            if retry.is_ok() {
-                crate::provider::mark_prefer_stored_copilot_auth();
-            }
-            retry
-        }
-        other => other,
-    }
-}
-
-async fn run_once(shared: &Arc<Shared>, spec: &ProviderSpec, strip_ambient: bool) -> Result<Discovered, 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_with_copilot_env(&root, strip_ambient)
-    })
-    .await
-    .map_err(|e| e.to_string())?;
-    let cwd = dunce::canonicalize(&root).unwrap_or(root);
-    let updates = Arc::new(DiscoveryUpdates { provider: spec.id.clone(), commands: Mutex::new(None) });
-    let client = Dialect::wrap(updates.clone());
-    let on_stderr: Box<dyn Fn(String) + Send + Sync> = Box::new(|_| {});
-    let peer = (shared.connector)(&launch, &cwd, client.clone(), on_stderr)
-        .map_err(|e| format!("Couldn't start {} (`{}`): {e}", launch.name, launch.command))?;
-    let _stop = crate::catalogs::KillPeer(peer.clone());
-    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 commands = updates
-            .commands
-            .lock()
-            .clone()
-            .or_else(|| new.get("availableCommands").map(|_| config::commands_of(&new, &launch.id)));
-        Ok::<_, String>(Discovered { config: options, commands, levels: levels.into_iter().collect() })
-    };
-    let result = tokio::time::timeout(DISCOVER_TIMEOUT, work).await;
-    peer.kill();
-    match result {
-        Ok(result) => result,
-        Err(_) => Err("the agent did not answer in time".into()),
-    }
-}
-
-#[derive(Default)]
-struct DiscoveryUpdates {
-    provider: String,
-    commands: Mutex<Option<Vec<crate::AgentCommand>>>,
-}
-
-impl ide_jsonrpc::Handler for DiscoveryUpdates {
-    fn on_notification(&self, method: &str, params: Value) {
-        if method == "session/update"
-            && let Some(update) = params.get("update")
-            && update["sessionUpdate"] == "available_commands_update"
-        {
-            // Commands are protocol data, not stderr (which may contain credentials).
-            *self.commands.lock() = Some(config::commands_of(update, &self.provider));
-        }
-    }
-
-    fn on_request(&self, method: &str, _: Value) -> Result<Value, (i64, String)> {
-        Err((ide_jsonrpc::codes::METHOD_NOT_FOUND, format!("unsupported discovery request {method}")))
-    }
-}
-
-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)
-}
@@ -107,8 +107,6 @@ fn manager(dir: &Path, agent: Arc<FakeV2Agent>) -> AgentManager {
            models_file: dir.join("models.json"),
            custom_agents_dir: None,
            home_dir: None,
-            env_secrets: None,
-            catalogs: Arc::default(),
        },
        tokio::runtime::Handle::current(),
        connector,
@@ -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};
@@ -28,29 +27,6 @@ use std::sync::Arc;
 use std::sync::atomic::{AtomicU8, Ordering};
 use tokio::sync::oneshot;

-/// ACP's error code for a request that needs the user to sign in.
-pub(crate) const AUTH_REQUIRED: i64 = -32000;
-
-// Covers signed-out users and refused accounts (Claude Code: "API Error: 403").
-pub(crate) fn auth_required(code: i64, message: &str) -> bool {
-    if code == AUTH_REQUIRED {
-        return true;
-    }
-    let lower = message.to_lowercase();
-    let words: Vec<&str> = lower.split(|c: char| !c.is_alphanumeric()).filter(|w| !w.is_empty()).collect();
-    words.iter().any(|w| {
-        *w == "auth"
-            || w.starts_with("authenticat")
-            || w.starts_with("authoriz")
-            || w.starts_with("unauthenticat")
-            || w.starts_with("unauthoriz")
-            || w.starts_with("oauth")
-    }) || words.windows(3).any(|w| w == ["not", "logged", "in"])
-        || words
-            .windows(2)
-            .any(|w| w == ["logged", "out"] || w == ["sign", "in"] || w == ["log", "in"] || w == ["login", "required"])
-}
-
 /// The capabilities this client offers, in v1 form.
 fn client_capabilities() -> Value {
    json!({
@@ -58,9 +34,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 },
    })
 }

@@ -96,11 +69,6 @@ pub(crate) struct Negotiated {
 }

 impl Negotiated {
-    pub fn mcp_stdio(&self) -> bool {
-        // Stdio is the ACP v1 baseline; v2 negotiates each transport explicitly.
-        self.capabilities.pointer("/mcpCapabilities/stdio").and_then(Value::as_bool).unwrap_or(self.generation == 1)
-    }
-
    /// Reads an `initialize` response. The shape decides, not `protocolVersion`: some v1
    /// agents report version 2 with v1 fields (`agentInfo`, `agentCapabilities`); only a
    /// v2 response has `info`.
@@ -129,7 +97,7 @@ impl Negotiated {
                "audio": has(prompt, "audio"),
                "embeddedContext": has(prompt, "embeddedContext"),
            },
-            "mcpCapabilities": { "http": has(mcp, "http"), "sse": false, "stdio": has(mcp, "stdio") },
+            "mcpCapabilities": { "http": has(mcp, "http"), "sse": false },
        });
        if session.is_some() {
            let mut sc = json!({ "list": {}, "resume": {}, "close": {} });
@@ -168,11 +136,6 @@ impl Negotiated {
        self.capabilities.pointer(&format!("/promptCapabilities/{name}")).and_then(Value::as_bool) == Some(true)
    }

-    /// `mcpCapabilities.<name>` (`http`, `sse`).
-    pub fn mcp(&self, name: &str) -> bool {
-        self.capabilities.pointer(&format!("/mcpCapabilities/{name}")).and_then(Value::as_bool) == Some(true)
-    }
-
    /// `sessionCapabilities.<name>` (`fork`, `resume`, `close`, `list`, `delete`).
    pub fn session(&self, name: &str) -> bool {
        self.capabilities.pointer(&format!("/sessionCapabilities/{name}")).is_some_and(|v| !v.is_null())
@@ -182,17 +145,6 @@ impl Negotiated {
    pub fn meta(&self, pointer: &str) -> Option<&Value> {
        self.capabilities.get("_meta")?.pointer(pointer)
    }
-
-    /// First authentication method the agent can run over ACP (`type` absent or `"agent"`).
-    pub fn agent_auth_method(&self) -> Option<&str> {
-        self.auth_methods.iter().find_map(|m| {
-            let kind = m.get("type").and_then(Value::as_str).unwrap_or("agent");
-            (kind == "agent" && m.pointer("/_meta/terminal-auth").is_none())
-                .then(|| m.get("id").and_then(Value::as_str))
-                .flatten()
-                .filter(|id| !id.is_empty())
-        })
-    }
 }

 /// The client side of one agent connection: wraps the task's [`Handler`] and, once
@@ -16,42 +16,6 @@ const CANCEL: &str = include_str!("../../tests/fixtures/acp-v2/cancel.jsonl");
 const RESUME: &str = include_str!("../../tests/fixtures/acp-v2/resume.jsonl");
 const INITIALIZE_V1: &str = include_str!("../../tests/fixtures/acp-v2/initialize-v1.jsonl");

-#[test]
-fn auth_required_matches_authentication_words_and_sign_in_phrases() {
-    for (code, message, expected) in [
-        (AUTH_REQUIRED, "This account is not eligible.", true),
-        (codes::INTERNAL_ERROR, "Auth required", true),
-        (codes::INTERNAL_ERROR, "Authentication failed", true),
-        (codes::INTERNAL_ERROR, "Failed to authenticate. API Error: 401", true),
-        (codes::INTERNAL_ERROR, "Failed to authenticate. API Error: 403", true),
-        (codes::INTERNAL_ERROR, "Not authenticated", true),
-        (codes::INTERNAL_ERROR, "Authorization failed", true),
-        (codes::INTERNAL_ERROR, "Authorize your account", true),
-        (codes::INTERNAL_ERROR, "Unauthenticated", true),
-        (codes::INTERNAL_ERROR, "Unauthentication error", true),
-        (codes::INTERNAL_ERROR, "Unauthorized", true),
-        (codes::INTERNAL_ERROR, "Unauthorization error", true),
-        (codes::INTERNAL_ERROR, "OAuth token has expired", true),
-        (codes::INTERNAL_ERROR, "OAuth2 token has expired", true),
-        (codes::INTERNAL_ERROR, "You are not logged in", true),
-        (codes::INTERNAL_ERROR, "You are logged out", true),
-        (codes::INTERNAL_ERROR, "Please sign in", true),
-        (codes::INTERNAL_ERROR, "Please log in", true),
-        (codes::INTERNAL_ERROR, "Login required", true),
-        (codes::INTERNAL_ERROR, "author", false),
-        (codes::INTERNAL_ERROR, "authors", false),
-        (codes::INTERNAL_ERROR, "authority", false),
-        (codes::INTERNAL_ERROR, "authored", false),
-        (codes::INTERNAL_ERROR, "reauthenticate", false),
-        (codes::INTERNAL_ERROR, "preauthorized", false),
-        (codes::INTERNAL_ERROR, "signal input failed", false),
-        (codes::INTERNAL_ERROR, "catalog index failed", false),
-        (codes::INTERNAL_ERROR, "login succeeded", false),
-    ] {
-        assert_eq!(auth_required(code, message), expected, "code={code}, message={message:?}");
-    }
-}
-
 /// The messages of a fixture going `dir` (`in` or `out`).
 pub(crate) fn frames(fixture: &str, dir: &str) -> Vec<Value> {
    fixture
@@ -93,83 +57,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,
-            env_secrets: None,
-            catalogs: Arc::default(),
-        },
-        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]
@@ -209,36 +99,6 @@ fn the_shape_decides_the_version_not_the_number() {
    assert_eq!((n.generation, n.load_session(), n.session("fork")), (2, false, false));
 }

-#[test]
-fn picks_non_terminal_agent_auth_method() {
-    let v1 = Negotiated::from_initialize(&json!({
-        "protocolVersion": 1,
-        "authMethods": [
-            { "id": "cli_login", "_meta": { "terminal-auth": { "command": "copilot", "args": ["login"] } } },
-            { "id": "terminal_login", "type": "terminal", "args": ["login"] },
-            { "id": "api_key", "type": "env_var" },
-            { "id": "github_oauth", "name": "GitHub OAuth" }
-        ]
-    }));
-    assert_eq!(v1.agent_auth_method(), Some("github_oauth"));
-
-    let v2 = Negotiated::from_initialize(&json!({
-        "protocolVersion": 2,
-        "info": { "name": "x", "version": "1" },
-        "authMethods": [
-            { "type": "terminal", "methodId": "cli", "name": "CLI", "args": ["login"] },
-            { "type": "agent", "methodId": "oauth", "name": "OAuth" }
-        ]
-    }));
-    assert_eq!(v2.agent_auth_method(), Some("oauth"));
-
-    let terminal_only = Negotiated::from_initialize(&json!({
-        "protocolVersion": 1,
-        "authMethods": [{ "id": "cli", "type": "terminal", "args": ["login"] }]
-    }));
-    assert_eq!(terminal_only.agent_auth_method(), None);
-}
-
 #[test]
 fn meta_and_auth_methods_pass_through() {
    // The native shims advertise their extensions in `agentCapabilities._meta`.
@@ -667,13 +527,3 @@ async fn v1_requests_are_sent_in_v2() {
        .collect();
    assert_eq!(commands, [&json!("28846a4c-c3e8-4a45-a3d0-c19f10d19d1a"), &json!("s1")]);
 }
-
-#[test]
-fn stdio_mcp_is_v1_baseline_and_negotiated_in_v2() {
-    assert!(super::Negotiated::from_initialize(&json!({"protocolVersion":1,"agentCapabilities":{}})).mcp_stdio());
-    assert!(!super::Negotiated::from_initialize(&json!({"info":{},"capabilities":{"session":{}}})).mcp_stdio());
-    assert!(
-        super::Negotiated::from_initialize(&json!({"info":{},"capabilities":{"session":{"mcp":{"stdio":{}}}}}))
-            .mcp_stdio()
-    );
-}
@@ -1,427 +0,0 @@
-//! Model availability for new tasks. Sessions own selections; discovery owns catalogs.
-
-use crate::{
-    AgentCommand, AgentConfigOption, AgentEvent, AgentModelCatalog, Known, Shared, acp, config, native, provider,
-};
-use ide_core::{IdeError, IdeResult};
-use parking_lot::Mutex;
-use serde::{Deserialize, Serialize};
-use std::collections::{BTreeMap, HashMap};
-use std::path::PathBuf;
-use std::sync::{Arc, Weak};
-use std::time::Duration;
-use tokio::sync::watch;
-use tokio::time::Instant;
-
-const FRESH_FOR: Duration = Duration::from_secs(15 * 60);
-const COOLDOWN: Duration = Duration::from_secs(30);
-
-type Store = Arc<Mutex<HashMap<String, Known>>>;
-type Key = (PathBuf, PathBuf, String);
-
-/// Backend-wide single-flight model lookups, scoped to project and effective launch configuration.
-#[derive(Default)]
-pub struct AgentCatalogs {
-    state: Mutex<State>,
-    #[cfg(test)]
-    clock_ms: std::sync::atomic::AtomicU64,
-}
-
-#[derive(Default)]
-struct State {
-    stores: HashMap<PathBuf, Store>,
-    entries: HashMap<Key, Entry>,
-    subscribers: Vec<Weak<Shared>>,
-    generation: u64,
-}
-
-struct Entry {
-    // Launch credentials remain only in memory, never serialized or logged.
-    context: LaunchContext,
-    generation: u64,
-    completed: Option<Instant>,
-    successful: Option<Instant>,
-    retry_at_ms: Option<f64>,
-    error: Option<String>,
-    flight: Option<watch::Receiver<bool>>,
-    abort: Option<tokio::task::AbortHandle>,
-    catalog: Option<CatalogData>,
-}
-
-#[derive(Clone, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct CatalogData {
-    pub config: Vec<AgentConfigOption>,
-    pub thought_levels: BTreeMap<String, Vec<AgentConfigOption>>,
-    pub refreshed_at_ms: Option<f64>,
-}
-
-#[derive(Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub(crate) struct SavedCatalog {
-    /// An opaque cryptographic digest, never raw launch arguments or credentials.
-    fingerprint: String,
-    #[serde(flatten)]
-    catalog: CatalogData,
-}
-
-#[derive(PartialEq)]
-struct LaunchContext {
-    spec: provider::ProviderSpec,
-    executable: PathBuf,
-    modified: Option<std::time::SystemTime>,
-    len: Option<u64>,
-}
-
-impl LaunchContext {
-    fn new(spec: provider::ProviderSpec, root: &std::path::Path) -> Self {
-        let resolved = spec.clone().resolve_for_launch(root);
-        let executable = dunce::canonicalize(&resolved.command).unwrap_or_else(|_| PathBuf::from(&resolved.command));
-        let metadata = std::fs::metadata(&executable).ok();
-        Self {
-            spec,
-            executable,
-            modified: metadata.as_ref().and_then(|m| m.modified().ok()),
-            len: metadata.as_ref().map(std::fs::Metadata::len),
-        }
-    }
-
-    fn fingerprint(&self) -> String {
-        let mut hash = blake3::Hasher::new();
-        fn field(hash: &mut blake3::Hasher, value: &[u8]) {
-            hash.update(&(value.len() as u64).to_le_bytes());
-            hash.update(value);
-        }
-        field(&mut hash, b"openidea-model-catalog-v1");
-        field(
-            &mut hash,
-            match self.spec.driver {
-                provider::Driver::Acp => b"acp",
-                provider::Driver::Codex => b"codex",
-                provider::Driver::Claude => b"claude",
-            },
-        );
-        field(&mut hash, self.spec.command.as_bytes());
-        hash.update(&(self.spec.args.len() as u64).to_le_bytes());
-        for arg in &self.spec.args {
-            field(&mut hash, arg.as_bytes());
-        }
-        hash.update(&(self.spec.env.len() as u64).to_le_bytes());
-        for (name, value) in &self.spec.env {
-            field(&mut hash, name.as_bytes());
-            field(&mut hash, value.as_bytes());
-        }
-        field(&mut hash, self.executable.to_string_lossy().as_bytes());
-        if let Some(modified) = self.modified.and_then(|t| t.duration_since(std::time::UNIX_EPOCH).ok()) {
-            hash.update(&modified.as_nanos().to_le_bytes());
-        }
-        if let Some(len) = self.len {
-            hash.update(&len.to_le_bytes());
-        }
-        hash.finalize().to_hex().to_string()
-    }
-}
-
-pub(crate) struct Discovered {
-    pub config: Vec<AgentConfigOption>,
-    pub commands: Option<Vec<AgentCommand>>,
-    pub levels: BTreeMap<String, Vec<AgentConfigOption>>,
-}
-
-pub(crate) struct KillPeer(pub ide_jsonrpc::Peer);
-
-impl Drop for KillPeer {
-    fn drop(&mut self) {
-        self.0.kill();
-    }
-}
-
-impl AgentCatalogs {
-    fn now(&self) -> Instant {
-        let now = Instant::now();
-        #[cfg(test)]
-        let now = now + Duration::from_millis(self.clock_ms.load(std::sync::atomic::Ordering::Relaxed));
-        now
-    }
-
-    fn epoch_ms(&self) -> f64 {
-        let now = crate::now_ms();
-        #[cfg(test)]
-        let now = now + self.clock_ms.load(std::sync::atomic::Ordering::Relaxed) as f64;
-        now
-    }
-
-    pub(crate) fn store(&self, path: &std::path::Path) -> Store {
-        self.state
-            .lock()
-            .stores
-            .entry(path.to_path_buf())
-            .or_insert_with(|| {
-                Arc::new(Mutex::new(
-                    std::fs::read(path).ok().and_then(|b| serde_json::from_slice(&b).ok()).unwrap_or_default(),
-                ))
-            })
-            .clone()
-    }
-
-    pub(crate) fn subscribe(&self, shared: &Arc<Shared>) {
-        let mut state = self.state.lock();
-        state.subscribers.retain(|s| s.strong_count() > 0);
-        state.subscribers.push(Arc::downgrade(shared));
-    }
-
-    fn key(shared: &Shared, provider: &str) -> Key {
-        (shared.paths.models_file.clone(), shared.paths.project_root.clone(), provider.to_owned())
-    }
-
-    fn fallback(shared: &Shared, provider: &str) -> CatalogData {
-        let cache = shared.known.lock();
-        let Some(known) = cache.get(provider) else { return CatalogData::default() };
-        known.catalogs.get(&shared.root_key()).map(|saved| saved.catalog.clone()).unwrap_or_else(|| CatalogData {
-            config: known.config.clone(),
-            thought_levels: known.thought_levels.clone(),
-            refreshed_at_ms: None,
-        })
-    }
-
-    pub(crate) fn cached(&self, shared: &Shared, provider: &str) -> CatalogData {
-        self.state
-            .lock()
-            .entries
-            .get(&Self::key(shared, provider))
-            .and_then(|e| e.catalog.clone())
-            .unwrap_or_else(|| Self::fallback(shared, provider))
-    }
-
-    fn snapshot(&self, shared: &Shared, provider: &str, entry: &Entry) -> AgentModelCatalog {
-        let catalog = entry.catalog.clone().unwrap_or_else(|| Self::fallback(shared, provider));
-        AgentModelCatalog {
-            provider: provider.to_owned(),
-            config: shared.config_for_new_task(catalog.config, provider),
-            thought_levels: catalog.thought_levels,
-            refreshing: entry.flight.is_some(),
-            refreshed_at_ms: catalog.refreshed_at_ms,
-            retry_at_ms: entry
-                .retry_at_ms
-                .filter(|_| entry.completed.is_some_and(|at| self.now().duration_since(at) < COOLDOWN)),
-            error: entry.error.clone(),
-        }
-    }
-
-    /// Start or join a lookup. No queued refresh can outlive the request that asked for it.
-    pub(crate) fn request(
-        self: &Arc<Self>,
-        shared: &Arc<Shared>,
-        spec: provider::ProviderSpec,
-        force: bool,
-    ) -> (AgentModelCatalog, Option<watch::Receiver<bool>>) {
-        let key = Self::key(shared, &spec.id);
-        let context = LaunchContext::new(spec.clone(), &shared.paths.project_root);
-        let now = self.now();
-        let mut state = self.state.lock();
-        let changed = state.entries.get(&key).is_none_or(|e| e.context != context);
-        if changed {
-            if let Some(abort) = state.entries.get_mut(&key).and_then(|entry| entry.abort.take()) {
-                abort.abort();
-            }
-            state.generation += 1;
-            let generation = state.generation;
-            let saved =
-                shared.known.lock().get(&spec.id).and_then(|known| known.catalogs.get(&shared.root_key())).cloned();
-            let matching = saved.as_ref().is_some_and(|saved| saved.fingerprint == context.fingerprint());
-            let age = saved
-                .as_ref()
-                .filter(|_| matching)
-                .and_then(|saved| saved.catalog.refreshed_at_ms)
-                .map(|at| self.epoch_ms() - at)
-                .filter(|age| *age >= 0.0 && *age < FRESH_FOR.as_millis() as f64)
-                .map(|age| Duration::from_secs_f64(age / 1000.0));
-            let successful = age.and_then(|age| now.checked_sub(age));
-            let completed = age.filter(|age| *age < COOLDOWN).and_then(|age| now.checked_sub(age));
-            let retry_at_ms = completed
-                .and_then(|_| saved.as_ref().and_then(|s| s.catalog.refreshed_at_ms))
-                .map(|at| at + COOLDOWN.as_millis() as f64);
-            let catalog = saved.map(|saved| {
-                let mut catalog = saved.catalog;
-                if !matching {
-                    catalog.refreshed_at_ms = None;
-                }
-                catalog
-            });
-            state.entries.insert(
-                key.clone(),
-                Entry {
-                    context,
-                    generation,
-                    completed,
-                    successful,
-                    retry_at_ms,
-                    catalog,
-                    error: None,
-                    flight: None,
-                    abort: None,
-                },
-            );
-        }
-        let entry = state.entries.get_mut(&key).expect("catalog entry");
-        let cooling = entry.completed.is_some_and(|at| now.duration_since(at) < COOLDOWN);
-        let fresh = entry.successful.is_some_and(|at| now.duration_since(at) < FRESH_FOR);
-        let mut start = None;
-        if entry.flight.is_none() && !cooling && (force || !fresh) {
-            let (done, ready) = watch::channel(false);
-            entry.flight = Some(ready);
-            entry.error = None;
-            entry.retry_at_ms = None;
-            start = Some((entry.generation, done));
-        }
-        let snapshot = self.snapshot(shared, &spec.id, entry);
-        let flight = entry.flight.clone();
-        drop(state);
-        if let Some((generation, done)) = start {
-            self.broadcast(shared, &snapshot);
-            let coordinator = self.clone();
-            let shared = shared.clone();
-            let flight_key = key.clone();
-            let task = shared.runtime.clone().spawn(async move {
-                let result = discover(&shared, spec).await;
-                coordinator.complete(&shared, flight_key, generation, result);
-                let _ = done.send(true);
-            });
-            // A subscriber can re-enter and change configuration during the start event.
-            let mut state = self.state.lock();
-            if let Some(entry) = state.entries.get_mut(&key).filter(|entry| entry.generation == generation) {
-                if entry.flight.is_some() {
-                    entry.abort = Some(task.abort_handle());
-                }
-            } else {
-                task.abort();
-            }
-        }
-        (snapshot, flight)
-    }
-
-    fn complete(&self, shared: &Shared, key: Key, generation: u64, result: Result<Discovered, String>) {
-        let current = provider::load(shared.paths.custom_agents_dir.as_deref(), shared.env_secrets())
-            .into_iter()
-            .find(|spec| spec.id == key.2)
-            .map(|spec| LaunchContext::new(spec, &shared.paths.project_root));
-        let mut state = self.state.lock();
-        let Some(entry) = state.entries.get_mut(&key).filter(|e| e.generation == generation) else { return };
-        // Configuration may have changed without another refresh request arriving.
-        if current.as_ref() != Some(&entry.context) {
-            entry.flight = None;
-            entry.abort = None;
-            entry.completed = None;
-            entry.retry_at_ms = None;
-            entry.error = None;
-            let snapshot = self.snapshot(shared, &key.2, entry);
-            state.entries.remove(&key);
-            drop(state);
-            self.broadcast(shared, &snapshot);
-            return;
-        }
-        let now = self.now();
-        entry.completed = Some(now);
-        entry.retry_at_ms = Some(self.epoch_ms() + COOLDOWN.as_millis() as f64);
-        entry.flight = None;
-        entry.abort = None;
-        let success = match result {
-            Ok(found) => {
-                let mut cache = shared.known.lock();
-                let known = cache.entry(key.2.clone()).or_default();
-                let catalog = CatalogData {
-                    config: found.config,
-                    thought_levels: found.levels,
-                    refreshed_at_ms: Some(self.epoch_ms()),
-                };
-                known.config = catalog.config.clone();
-                known.thought_levels = catalog.thought_levels.clone();
-                if let Some(commands) = found.commands {
-                    known.commands.insert(shared.root_key(), commands);
-                }
-                known.authoritative = true;
-                known.refreshed_at_ms = catalog.refreshed_at_ms;
-                known.catalogs.insert(
-                    shared.root_key(),
-                    SavedCatalog { fingerprint: entry.context.fingerprint(), catalog: catalog.clone() },
-                );
-                entry.catalog = Some(catalog);
-                shared.persist_known(&cache);
-                entry.successful = Some(now);
-                entry.error = None;
-                true
-            }
-            Err(error) => {
-                entry.error = Some(error);
-                false
-            }
-        };
-        let snapshot = self.snapshot(shared, &key.2, entry);
-        drop(state);
-        self.broadcast(shared, &snapshot);
-        if success {
-            for subscriber in self.subscribers(shared) {
-                subscriber.emit(AgentEvent::Providers);
-            }
-        }
-    }
-
-    fn subscribers(&self, shared: &Shared) -> Vec<Arc<Shared>> {
-        self.state
-            .lock()
-            .subscribers
-            .iter()
-            .filter_map(Weak::upgrade)
-            .filter(|s| {
-                s.paths.models_file == shared.paths.models_file && s.paths.project_root == shared.paths.project_root
-            })
-            .collect()
-    }
-
-    fn broadcast(&self, shared: &Shared, catalog: &AgentModelCatalog) {
-        for subscriber in self.subscribers(shared) {
-            subscriber.emit(AgentEvent::ModelCatalog { catalog: catalog.clone() });
-        }
-    }
-}
-
-impl crate::AgentManager {
-    /// Return cached choices immediately and schedule discovery when eligible.
-    pub fn refresh_models(&self, provider: &str, force: bool) -> IdeResult<AgentModelCatalog> {
-        // Settings and environment secrets can change while this window is open.
-        *self.shared.providers.write() =
-            provider::load(self.shared.paths.custom_agents_dir.as_deref(), self.shared.env_secrets());
-        let spec = self.shared.spec(provider).ok_or_else(|| IdeError::invalid(format!("unknown agent {provider}")))?;
-        Ok(self.shared.paths.catalogs.request(&self.shared, spec, force).0)
-    }
-}
-
-async fn discover(shared: &Arc<Shared>, spec: provider::ProviderSpec) -> Result<Discovered, String> {
-    match spec.driver {
-        provider::Driver::Acp => acp::discover::run(shared, &spec).await,
-        provider::Driver::Codex => native::codex::discover(spec, shared.paths.project_root.clone()).await,
-        provider::Driver::Claude => {
-            let found = native::claude::discover(spec.clone(), shared.paths.project_root.clone()).await?;
-            Ok(Discovered {
-                commands: Some(config::commands_of(
-                    &serde_json::json!({ "availableCommands": found.commands }),
-                    &spec.id,
-                )),
-                config: config::options_of(&serde_json::json!({ "configOptions": found.options })),
-                levels: found
-                    .efforts
-                    .into_iter()
-                    .map(|(model, option)| {
-                        let levels = option
-                            .map(|o| config::options_of(&serde_json::json!({ "configOptions": [o] })))
-                            .unwrap_or_default();
-                        (model, levels)
-                    })
-                    .collect(),
-            })
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests;
@@ -1,501 +0,0 @@
-use super::*;
-use crate::{AgentManager, AgentPaths, Connector};
-use ide_jsonrpc::{Framing, Peer};
-use serde_json::{Value, json};
-use std::path::Path;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
-use tokio::sync::{mpsc, oneshot};
-
-const PROVIDER: &str = "catalog-test";
-
-#[derive(Debug)]
-struct Pending {
-    params: Value,
-    reply: oneshot::Sender<Result<Value, String>>,
-}
-
-struct Harness {
-    connector: Connector,
-    pending: mpsc::UnboundedReceiver<Pending>,
-    launches: Arc<AtomicUsize>,
-    live: Arc<AtomicUsize>,
-}
-
-struct Live(Arc<AtomicUsize>);
-impl Drop for Live {
-    fn drop(&mut self) {
-        self.0.fetch_sub(1, Ordering::SeqCst);
-    }
-}
-
-impl Harness {
-    fn new() -> Self {
-        let (pending_tx, pending) = mpsc::unbounded_channel();
-        let launches = Arc::new(AtomicUsize::new(0));
-        let live = Arc::new(AtomicUsize::new(0));
-        let connector: Connector = Arc::new({
-            let launches = launches.clone();
-            let live = live.clone();
-            move |_, _, client, _| {
-                launches.fetch_add(1, Ordering::SeqCst);
-                live.fetch_add(1, Ordering::SeqCst);
-                let guard = Live(live.clone());
-                let pending = pending_tx.clone();
-                let (client_io, server_io) = tokio::io::duplex(1 << 16);
-                let (read, mut write) = tokio::io::split(server_io);
-                tokio::spawn(async move {
-                    let _guard = guard;
-                    let mut lines = BufReader::new(read).lines();
-                    while let Some(line) = lines.next_line().await.unwrap() {
-                        let request: Value = serde_json::from_str(&line).unwrap();
-                        let id = &request["id"];
-                        if id.is_null() {
-                            continue;
-                        }
-                        let response = match request["method"].as_str().unwrap() {
-                            "initialize" => json!({ "id": id, "jsonrpc": "2.0", "result": {
-                                "protocolVersion": 1, "agentCapabilities": {}, "authMethods": [] } }),
-                            "session/new" => {
-                                let (reply, result) = oneshot::channel();
-                                pending.send(Pending { params: request["params"].clone(), reply }).unwrap();
-                                let result = tokio::select! {
-                                    result = result => result.unwrap(),
-                                    _ = lines.next_line() => break,
-                                };
-                                match result {
-                                    Ok(result) => json!({ "id": id, "jsonrpc": "2.0", "result": result }),
-                                    Err(error) => {
-                                        json!({ "id": id, "jsonrpc": "2.0", "error": { "code": -32000, "message": error } })
-                                    }
-                                }
-                            }
-                            method => panic!("discovery must not call {method}"),
-                        };
-                        if write.write_all(format!("{response}\n").as_bytes()).await.is_err() {
-                            break;
-                        }
-                    }
-                });
-                let (read, write) = tokio::io::split(client_io);
-                Ok(Peer::connect_framed(read, write, client, Framing::Lines))
-            }
-        });
-        Self { connector, pending, launches, live }
-    }
-
-    async fn next(&mut self) -> Pending {
-        tokio::time::timeout(Duration::from_secs(5), self.pending.recv()).await.unwrap().unwrap()
-    }
-}
-
-fn configure(root: &Path, version: &str) {
-    std::fs::create_dir_all(root.join("agents")).unwrap();
-    let executable = root.join("catalog-test-bin");
-    if !executable.exists() {
-        std::fs::write(&executable, "first executable").unwrap();
-    }
-    std::fs::write(
-        root.join("agents/catalog-test.toml"),
-        format!(
-            "name = \"Catalog Test\"\ncommand = {}\n[env]\nTOKEN = \"secret-{version}\"\n",
-            serde_json::to_string(&executable.to_string_lossy()).unwrap()
-        ),
-    )
-    .unwrap();
-}
-
-fn make_manager(root: &Path, catalogs: Arc<AgentCatalogs>, harness: &Harness) -> AgentManager {
-    make_manager_at(root, &root.join("models.json"), catalogs, harness)
-}
-
-fn make_manager_at(root: &Path, models_file: &Path, catalogs: Arc<AgentCatalogs>, harness: &Harness) -> AgentManager {
-    AgentManager::with_connector(
-        AgentPaths {
-            project_root: root.to_path_buf(),
-            store_dir: root.join("store"),
-            worktrees_dir: root.join("worktrees"),
-            models_file: models_file.to_path_buf(),
-            catalogs,
-            custom_agents_dir: Some(root.join("agents")),
-            home_dir: Some(root.to_path_buf()),
-            env_secrets: None,
-        },
-        tokio::runtime::Handle::current(),
-        harness.connector.clone(),
-    )
-}
-
-fn events(manager: &AgentManager) -> mpsc::UnboundedReceiver<AgentEvent> {
-    let (tx, rx) = mpsc::unbounded_channel();
-    manager.subscribe(Arc::new(move |event| {
-        let _ = tx.send(event);
-    }));
-    rx
-}
-
-async fn completed(events: &mut mpsc::UnboundedReceiver<AgentEvent>) -> AgentModelCatalog {
-    tokio::time::timeout(Duration::from_secs(5), async {
-        loop {
-            if let AgentEvent::ModelCatalog { catalog } = events.recv().await.unwrap()
-                && !catalog.refreshing
-            {
-                return catalog;
-            }
-        }
-    })
-    .await
-    .unwrap()
-}
-
-fn response(models: &[&str], effort: &[&str]) -> Value {
-    json!({ "sessionId": "discovery-only", "configOptions": [
-        { "id": "model", "type": "select", "category": "model", "currentValue": models.first(),
-          "options": models.iter().map(|m| json!({ "value": m, "name": m })).collect::<Vec<_>>() },
-        { "id": "effort", "type": "select", "category": "thought_level", "currentValue": effort.first(),
-          "options": effort.iter().map(|e| json!({ "value": e })).collect::<Vec<_>>() }
-    ] })
-}
-
-fn model_values(catalog: &AgentModelCatalog) -> Vec<&str> {
-    catalog
-        .config
-        .iter()
-        .filter(|o| o.category.as_deref() == Some("model"))
-        .flat_map(|o| o.values.iter().map(|v| v.value.as_str()))
-        .collect()
-}
-
-async fn stopped(harness: &Harness) {
-    tokio::time::timeout(Duration::from_secs(5), async {
-        while harness.live.load(Ordering::SeqCst) != 0 {
-            tokio::task::yield_now().await;
-        }
-    })
-    .await
-    .unwrap();
-}
-
-fn advance(catalogs: &AgentCatalogs, seconds: u64) {
-    catalogs.clock_ms.fetch_add(seconds * 1000, Ordering::Relaxed);
-}
-
-#[tokio::test]
-async fn successful_refresh_replaces_models_and_efforts_and_old_sessions_cannot_revert_it() {
-    let tmp = tempfile::tempdir().unwrap();
-    configure(tmp.path(), "one");
-    let catalogs = Arc::new(AgentCatalogs::default());
-    let mut harness = Harness::new();
-    let manager = make_manager(tmp.path(), catalogs.clone(), &harness);
-    let mut events = events(&manager);
-    let old = config::options_of(&response(&["old", "retained"], &["low", "high"]));
-    manager.shared.remember(PROVIDER, Some(&old), None, Some("old"));
-    let cached = manager.refresh_models(PROVIDER, false).unwrap();
-    assert!(cached.refreshing);
-    assert_eq!(model_values(&cached), ["old", "retained"]);
-    assert!(cached.refreshed_at_ms.is_none(), "session reports are not fresh discovery");
-    let pending = harness.next().await;
-    assert_eq!(pending.params["mcpServers"], json!([]));
-    pending.reply.send(Ok(response(&["retained", "new"], &["medium"]))).unwrap();
-    let fresh = completed(&mut events).await;
-    assert_eq!(model_values(&fresh), ["retained", "new"]);
-    assert_eq!(fresh.thought_levels.keys().map(String::as_str).collect::<Vec<_>>(), ["new", "retained"]);
-    assert_eq!(fresh.thought_levels["retained"][0].values[0].value, "medium");
-    assert!(fresh.refreshed_at_ms.is_some() && fresh.retry_at_ms.is_some());
-    manager.shared.remember(PROVIDER, Some(&old), None, Some("old"));
-    assert_eq!(manager.refresh_models(PROVIDER, false).unwrap().config, fresh.config);
-    let provider = manager.providers().into_iter().find(|p| p.id == PROVIDER).unwrap();
-    assert_eq!(provider.config, fresh.config);
-    let persisted = std::fs::read_to_string(tmp.path().join("models.json")).unwrap();
-    assert!(!persisted.contains("secret-one") && !persisted.contains("TOKEN"));
-    let restored = make_manager(tmp.path(), Arc::default(), &harness);
-    let restored_snapshot = restored.refresh_models(PROVIDER, false).unwrap();
-    assert!(!restored_snapshot.refreshing, "matching persisted launch context remains fresh");
-    assert_eq!(restored_snapshot.refreshed_at_ms, fresh.refreshed_at_ms);
-    let provider = restored.providers().into_iter().find(|p| p.id == PROVIDER).unwrap();
-    assert_eq!(provider.config, fresh.config);
-    restored.shared.remember(PROVIDER, Some(&old), None, Some("old"));
-    assert_eq!(restored.shared.known_config(PROVIDER), fresh.config);
-    assert_eq!(restored.shared.known.lock()[PROVIDER].refreshed_at_ms, fresh.refreshed_at_ms);
-    assert!(!tmp.path().join("store").exists(), "refresh never creates tasks");
-}
-
-#[tokio::test]
-async fn legacy_cache_loads_without_claiming_authoritative_freshness() {
-    let tmp = tempfile::tempdir().unwrap();
-    configure(tmp.path(), "one");
-    let options = config::options_of(&response(&["legacy"], &["low"]));
-    std::fs::write(
-        tmp.path().join("models.json"),
-        serde_json::to_vec(&json!({
-            (PROVIDER): { "config": options, "thoughtLevels": {}, "projectCommands": {} }
-        }))
-        .unwrap(),
-    )
-    .unwrap();
-    let mut harness = Harness::new();
-    let manager = make_manager(tmp.path(), Arc::default(), &harness);
-    let mut events = events(&manager);
-    let cached = manager.refresh_models(PROVIDER, false).unwrap();
-    assert_eq!(model_values(&cached), ["legacy"]);
-    assert!(cached.refreshing && cached.refreshed_at_ms.is_none());
-    harness.next().await.reply.send(Err("Sign in required".into())).unwrap();
-    let failed = completed(&mut events).await;
-    assert_eq!(failed.config, cached.config);
-    assert!(failed.error.as_deref().unwrap().contains("Sign in required"));
-}
-
-#[tokio::test]
-async fn concurrent_windows_commands_and_manual_requests_share_one_flight_and_cooldown() {
-    let tmp = tempfile::tempdir().unwrap();
-    configure(tmp.path(), "one");
-    let catalogs = Arc::new(AgentCatalogs::default());
-    let mut harness = Harness::new();
-    let first = Arc::new(make_manager(tmp.path(), catalogs.clone(), &harness));
-    let second = make_manager(tmp.path(), catalogs.clone(), &harness);
-    let mut first_events = events(&first);
-    let mut second_events = events(&second);
-    assert!(first.refresh_models(PROVIDER, false).unwrap().refreshing);
-    let pending = harness.next().await;
-    for _ in 0..10 {
-        assert!(second.refresh_models(PROVIDER, true).unwrap().refreshing);
-        assert!(first.refresh_models(PROVIDER, true).unwrap().refreshing);
-    }
-    let commands = tokio::spawn({
-        let first = first.clone();
-        async move { first.commands(PROVIDER, None).await }
-    });
-    tokio::task::yield_now().await;
-    assert_eq!(harness.launches.load(Ordering::SeqCst), 1);
-    pending.reply.send(Ok(response(&["one"], &["low"]))).unwrap();
-    let done = completed(&mut first_events).await;
-    assert_eq!(completed(&mut second_events).await, done);
-    commands.await.unwrap().unwrap();
-    for force in [false, true, false, true] {
-        assert!(!second.refresh_models(PROVIDER, force).unwrap().refreshing);
-    }
-    advance(&catalogs, 29);
-    assert!(!first.refresh_models(PROVIDER, true).unwrap().refreshing);
-    advance(&catalogs, 1);
-    assert!(!first.refresh_models(PROVIDER, false).unwrap().refreshing, "automatic refresh remains fresh");
-    assert!(first.refresh_models(PROVIDER, true).unwrap().refreshing);
-    harness.next().await.reply.send(Ok(response(&["two"], &["high"]))).unwrap();
-    let newer = completed(&mut first_events).await;
-    assert_eq!(model_values(&newer), ["two"]);
-    assert_eq!(completed(&mut second_events).await, newer);
-    advance(&catalogs, 15 * 60 - 1);
-    assert!(!second.refresh_models(PROVIDER, false).unwrap().refreshing);
-    advance(&catalogs, 1);
-    assert!(second.refresh_models(PROVIDER, false).unwrap().refreshing);
-    harness.next().await.reply.send(Ok(response(&["three"], &["low"]))).unwrap();
-    completed(&mut first_events).await;
-    assert_eq!(harness.launches.load(Ordering::SeqCst), 3);
-}
-
-#[tokio::test]
-async fn failure_keeps_successful_choices_and_throttles_manual_and_auto_retries() {
-    let tmp = tempfile::tempdir().unwrap();
-    configure(tmp.path(), "one");
-    let catalogs = Arc::new(AgentCatalogs::default());
-    let mut harness = Harness::new();
-    let manager = make_manager(tmp.path(), catalogs.clone(), &harness);
-    let mut events = events(&manager);
-    manager.refresh_models(PROVIDER, true).unwrap();
-    harness.next().await.reply.send(Ok(response(&["cached"], &["low"]))).unwrap();
-    let success = completed(&mut events).await;
-    let disk = std::fs::read(tmp.path().join("models.json")).unwrap();
-    advance(&catalogs, 15 * 60);
-    manager.refresh_models(PROVIDER, false).unwrap();
-    harness.next().await.reply.send(Err("Authentication expired".into())).unwrap();
-    let failed = completed(&mut events).await;
-    assert_eq!(failed.config, success.config);
-    assert_eq!(failed.thought_levels, success.thought_levels);
-    assert_eq!(failed.refreshed_at_ms, success.refreshed_at_ms);
-    assert!(failed.error.as_deref().unwrap().contains("Authentication expired"));
-    assert_eq!(std::fs::read(tmp.path().join("models.json")).unwrap(), disk);
-    assert!(!manager.refresh_models(PROVIDER, false).unwrap().refreshing);
-    assert!(!manager.refresh_models(PROVIDER, true).unwrap().refreshing);
-    advance(&catalogs, 29);
-    assert!(!manager.refresh_models(PROVIDER, true).unwrap().refreshing);
-    advance(&catalogs, 1);
-    assert!(manager.refresh_models(PROVIDER, false).unwrap().refreshing);
-    harness.next().await.reply.send(Ok(response(&["recovered"], &["high"]))).unwrap();
-    let recovered = completed(&mut events).await;
-    assert_eq!(model_values(&recovered), ["recovered"]);
-    assert!(recovered.error.is_none());
-}
-
-#[tokio::test]
-async fn timeout_cleans_up_and_enters_the_same_failure_cooldown() {
-    let tmp = tempfile::tempdir().unwrap();
-    configure(tmp.path(), "one");
-    let catalogs = Arc::new(AgentCatalogs::default());
-    let mut harness = Harness::new();
-    let manager = make_manager(tmp.path(), catalogs.clone(), &harness);
-    let mut events = events(&manager);
-    manager.refresh_models(PROVIDER, false).unwrap();
-    let pending = harness.next().await;
-    tokio::time::pause();
-    tokio::time::advance(Duration::from_secs(4)).await;
-    let failed = completed(&mut events).await;
-    assert!(failed.error.as_deref().unwrap().contains("time"));
-    assert!(failed.retry_at_ms.is_some());
-    assert!(!manager.refresh_models(PROVIDER, true).unwrap().refreshing);
-    assert!(!manager.refresh_models(PROVIDER, false).unwrap().refreshing);
-    tokio::time::resume();
-    stopped(&harness).await;
-    assert_eq!(harness.live.load(Ordering::SeqCst), 0, "timed-out connection must close");
-    assert!(pending.reply.is_closed());
-    advance(&catalogs, 30);
-    assert!(manager.refresh_models(PROVIDER, false).unwrap().refreshing);
-    harness.next().await.reply.send(Ok(response(&["retry"], &["low"]))).unwrap();
-    completed(&mut events).await;
-}
-
-#[tokio::test]
-async fn changed_effective_config_supersedes_old_completion_without_queueing() {
-    let tmp = tempfile::tempdir().unwrap();
-    configure(tmp.path(), "one");
-    let catalogs = Arc::new(AgentCatalogs::default());
-    let mut harness = Harness::new();
-    let first = make_manager(tmp.path(), catalogs.clone(), &harness);
-    let second = make_manager(tmp.path(), catalogs.clone(), &harness);
-    let mut events = events(&second);
-    first.refresh_models(PROVIDER, false).unwrap();
-    let obsolete = harness.next().await;
-    configure(tmp.path(), "two");
-    assert!(second.refresh_models(PROVIDER, false).unwrap().refreshing);
-    let latest = harness.next().await;
-    latest.reply.send(Ok(response(&["latest"], &["high"]))).unwrap();
-    let fresh = completed(&mut events).await;
-    let _ = obsolete.reply.send(Ok(response(&["obsolete"], &["low"])));
-    stopped(&harness).await;
-    let shown = first.refresh_models(PROVIDER, false).unwrap();
-    assert_eq!(shown.config, fresh.config);
-    assert_eq!(shown.refreshed_at_ms, fresh.refreshed_at_ms);
-    assert!(!shown.refreshing);
-    assert_eq!(harness.launches.load(Ordering::SeqCst), 2);
-    assert!(!std::fs::read_to_string(tmp.path().join("models.json")).unwrap().contains("obsolete"));
-    // A changed configuration also invalidates successful freshness/cooldown.
-    configure(tmp.path(), "three");
-    assert!(first.refresh_models(PROVIDER, false).unwrap().refreshing);
-    harness.next().await.reply.send(Ok(response(&["new-config"], &["medium"]))).unwrap();
-    completed(&mut events).await;
-}
-
-#[tokio::test]
-async fn invalid_provider_is_a_request_error_and_does_not_launch() {
-    let tmp = tempfile::tempdir().unwrap();
-    let harness = Harness::new();
-    let manager = make_manager(tmp.path(), Arc::default(), &harness);
-    assert!(manager.refresh_models("missing-provider", true).is_err());
-    assert_eq!(harness.launches.load(Ordering::SeqCst), 0);
-}
-
-#[tokio::test]
-async fn replacing_the_executable_at_the_same_path_invalidates_freshness_and_obsolete_responses() {
-    let tmp = tempfile::tempdir().unwrap();
-    configure(tmp.path(), "unchanged-environment");
-    let catalogs = Arc::new(AgentCatalogs::default());
-    let mut harness = Harness::new();
-    let manager = make_manager(tmp.path(), catalogs, &harness);
-    let mut events = events(&manager);
-    manager.refresh_models(PROVIDER, false).unwrap();
-    let obsolete = harness.next().await;
-    std::fs::write(tmp.path().join("catalog-test-bin"), "replacement executable with different size").unwrap();
-    manager.refresh_models(PROVIDER, false).unwrap();
-    let latest = harness.next().await;
-    latest.reply.send(Ok(response(&["updated"], &["high"]))).unwrap();
-    let fresh = completed(&mut events).await;
-    let _ = obsolete.reply.send(Ok(response(&["obsolete"], &["low"])));
-    stopped(&harness).await;
-    assert_eq!(manager.refresh_models(PROVIDER, false).unwrap().config, fresh.config);
-    std::fs::write(tmp.path().join("catalog-test-bin"), "another executable").unwrap();
-    assert!(manager.refresh_models(PROVIDER, false).unwrap().refreshing);
-    harness.next().await.reply.send(Ok(response(&["new-install"], &["medium"]))).unwrap();
-    assert_eq!(model_values(&completed(&mut events).await), ["new-install"]);
-    assert_eq!(harness.launches.load(Ordering::SeqCst), 3);
-}
-
-#[tokio::test]
-async fn project_catalogs_and_persisted_freshness_do_not_leak_between_contexts() {
-    let tmp = tempfile::tempdir().unwrap();
-    let a = tmp.path().join("project-a");
-    let b = tmp.path().join("project-b");
-    configure(&a, "account-a");
-    configure(&b, "account-b");
-    let models_file = tmp.path().join("shared-models.json");
-    let catalogs = Arc::new(AgentCatalogs::default());
-    let mut harness = Harness::new();
-    let first = make_manager_at(&a, &models_file, catalogs.clone(), &harness);
-    let second = make_manager_at(&b, &models_file, catalogs, &harness);
-    let mut first_events = events(&first);
-    let mut second_events = events(&second);
-    first.refresh_models(PROVIDER, false).unwrap();
-    harness.next().await.reply.send(Ok(response(&["account-a-model"], &["low"]))).unwrap();
-    let a_catalog = completed(&mut first_events).await;
-    second.refresh_models(PROVIDER, false).unwrap();
-    harness.next().await.reply.send(Ok(response(&["account-b-model"], &["high"]))).unwrap();
-    let b_catalog = completed(&mut second_events).await;
-    assert_eq!(first.refresh_models(PROVIDER, false).unwrap().config, a_catalog.config);
-    assert_eq!(second.refresh_models(PROVIDER, false).unwrap().config, b_catalog.config);
-    assert_eq!(first.providers().into_iter().find(|p| p.id == PROVIDER).unwrap().config, a_catalog.config);
-    for (root, expected) in [(&a, &a_catalog), (&b, &b_catalog)] {
-        let restored = make_manager_at(root, &models_file, Arc::default(), &harness);
-        let cached = restored.refresh_models(PROVIDER, false).unwrap();
-        assert!(!cached.refreshing, "matching persisted context should retain freshness");
-        assert_eq!(cached.config, expected.config);
-        assert_eq!(cached.refreshed_at_ms, expected.refreshed_at_ms);
-    }
-    assert_eq!(harness.launches.load(Ordering::SeqCst), 2);
-    configure(&a, "new-account");
-    let changed = make_manager_at(&a, &models_file, Arc::default(), &harness);
-    let mut events = events(&changed);
-    let stale = changed.refresh_models(PROVIDER, false).unwrap();
-    assert!(stale.refreshing, "a different launch environment cannot reuse persisted freshness");
-    assert!(stale.refreshed_at_ms.is_none());
-    assert_eq!(stale.config, a_catalog.config, "stale cached choices remain selectable");
-    harness.next().await.reply.send(Ok(response(&["new-account-model"], &["medium"]))).unwrap();
-    completed(&mut events).await;
-    let persisted = std::fs::read_to_string(models_file).unwrap();
-    assert!(!persisted.contains("secret-") && !persisted.contains("TOKEN"));
-}
-
-#[tokio::test]
-async fn configuration_changed_without_another_request_also_discards_old_discovery() {
-    let tmp = tempfile::tempdir().unwrap();
-    configure(tmp.path(), "before");
-    let mut harness = Harness::new();
-    let manager = make_manager(tmp.path(), Arc::default(), &harness);
-    let mut events = events(&manager);
-    manager.refresh_models(PROVIDER, false).unwrap();
-    let obsolete = harness.next().await;
-    configure(tmp.path(), "after");
-    obsolete.reply.send(Ok(response(&["obsolete"], &["low"]))).unwrap();
-    let discarded = completed(&mut events).await;
-    assert!(model_values(&discarded).is_empty());
-    assert!(discarded.refreshed_at_ms.is_none());
-    assert!(!tmp.path().join("models.json").exists());
-    manager.refresh_models(PROVIDER, false).unwrap();
-    harness.next().await.reply.send(Ok(response(&["current"], &["high"]))).unwrap();
-    assert_eq!(model_values(&completed(&mut events).await), ["current"]);
-}
-
-#[tokio::test]
-async fn successful_empty_catalog_removes_all_previous_models_and_efforts() {
-    let tmp = tempfile::tempdir().unwrap();
-    configure(tmp.path(), "one");
-    let catalogs = Arc::new(AgentCatalogs::default());
-    let mut harness = Harness::new();
-    let manager = make_manager(tmp.path(), catalogs.clone(), &harness);
-    let mut events = events(&manager);
-    manager.refresh_models(PROVIDER, true).unwrap();
-    harness.next().await.reply.send(Ok(response(&["removed"], &["low"]))).unwrap();
-    completed(&mut events).await;
-    advance(&catalogs, 30);
-    manager.refresh_models(PROVIDER, true).unwrap();
-    harness.next().await.reply.send(Ok(response(&[], &[]))).unwrap();
-    let empty = completed(&mut events).await;
-    assert!(model_values(&empty).is_empty() && empty.thought_levels.is_empty());
-    assert!(empty.refreshed_at_ms.is_some() && empty.error.is_none());
-}
@@ -2,8 +2,7 @@
 //! the agent reports them over ACP.

 use crate::model::{
-    AgentCommand, AgentCommandSource, AgentConfigOption, AgentConfigValue, AgentConfigVia, AgentCost, AgentLimit,
-    AgentUsage,
+    AgentCommand, AgentConfigOption, AgentConfigValue, AgentConfigVia, AgentCost, AgentLimit, AgentUsage,
 };
 use serde_json::{Value, json};

@@ -36,61 +35,20 @@ pub(crate) fn add_client_options(provider: &str, config: &mut Vec<AgentConfigOpt
    });
 }

-/// Whether the current settings approve tool requests without asking: a bypass mode,
-/// an allow-all permissions option, or a bypass approval policy.
-pub(crate) fn bypass_approvals(config: &[AgentConfigOption]) -> bool {
-    let selected = |category: &str| {
-        config.iter().find(|o| o.category.as_deref() == Some(category)).and_then(|o| o.current.as_deref())
-    };
-    ["mode", "permissions", "approval"]
-        .into_iter()
-        .any(|category| selected(category).zip(bypass_value(category)).is_some_and(|(value, bypass)| bypass(value)))
-}
-
-/// For an option of `category` that can approve everything, what tells its approving values.
-fn bypass_value(category: &str) -> Option<fn(&str) -> bool> {
-    match category {
-        "mode" => Some(is_bypass_mode),
-        "permissions" => Some(|v| matches!(v.to_ascii_lowercase().as_str(), "on" | "true")),
-        "approval" => Some(|v| v.eq_ignore_ascii_case("bypass")),
-        _ => None,
-    }
-}
-
-/// Moves options that approve everything without asking to a value that asks: the agent's
-/// default or ask mode, else its first one that asks.
-pub(crate) fn ask_for_approvals(config: &mut [AgentConfigOption]) {
-    for option in config {
-        let Some(bypass) = option.category.as_deref().and_then(bypass_value) else { continue };
-        if option.current.as_deref().is_some_and(|c| !bypass(c)) {
-            continue;
-        }
-        let asks = |v: &&AgentConfigValue| !bypass(&v.value);
-        let value = ["default", "ask"]
-            .iter()
-            .find_map(|preferred| option.values.iter().filter(asks).find(|v| v.value == *preferred))
-            .or_else(|| option.values.iter().find(asks));
-        if let Some(value) = value {
-            option.current = Some(value.value.clone());
-        }
-    }
+pub(crate) fn bypass_approvals(provider: &str, config: &[AgentConfigOption]) -> bool {
+    provider == "cursor" && config.iter().any(|o| o.id == CURSOR_APPROVAL && o.current.as_deref() == Some("bypass"))
 }

 /// The mode that approves everything without asking (`bypassPermissions`, `yolo`, `full-access`…), if the agent has one.
 pub(crate) fn bypass_mode(options: &[AgentConfigOption]) -> Option<(&AgentConfigOption, &AgentConfigValue)> {
    let option = options.iter().find(|o| o.category.as_deref() == Some("mode"))?;
-    let value = option.values.iter().find(|v| is_bypass_mode(&v.value))?;
+    let value = option.values.iter().find(|v| {
+        let m: String = v.value.to_lowercase().chars().filter(char::is_ascii_lowercase).collect();
+        m.contains("bypass") || m == "yolo" || m.contains("fullaccess") || m == "dangerous"
+    })?;
    Some((option, value))
 }

-fn is_bypass_mode(mode: &str) -> bool {
-    // Mode ids can be URL-like (`…/session-modes#yolo`), as the composer's mode icon also assumes.
-    let lower = mode.to_lowercase();
-    let m: String =
-        lower.rsplit(['#', '/']).next().unwrap_or_default().chars().filter(char::is_ascii_lowercase).collect();
-    m.contains("bypass") || m == "yolo" || m.contains("fullaccess") || m == "dangerous"
-}
-
 /// The settings in a `session/new` or `session/load` result: its select `configOptions`,
 /// plus the older `modes` / `models` fields for what those don't cover.
 pub(crate) fn options_of(result: &Value) -> Vec<AgentConfigOption> {
@@ -136,15 +94,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,
@@ -183,22 +133,15 @@ pub(crate) fn set_request(option: &AgentConfigOption, value: &str) -> (&'static
 }

 /// `available_commands_update`.
-pub(crate) fn commands_of(update: &Value, provider: &str) -> Vec<AgentCommand> {
+pub(crate) fn commands_of(update: &Value) -> Vec<AgentCommand> {
    update
        .get("availableCommands")
        .and_then(Value::as_array)
        .into_iter()
        .flatten()
        .filter_map(|c| {
-            let name = c.get("name")?.as_str()?.trim_start_matches('/');
-            let source = if provider == "codex-acp" && name.starts_with('$') {
-                AgentCommandSource::Skill
-            } else {
-                c.get("source").and_then(|s| serde_json::from_value(s.clone()).ok()).unwrap_or_default()
-            };
            Some(AgentCommand {
-                name: name.to_owned(),
-                source,
+                name: c.get("name")?.as_str()?.trim_start_matches('/').to_owned(),
                description: str_of(c, "description").unwrap_or_default(),
                hint: c.pointer("/input/hint").and_then(Value::as_str).filter(|h| !h.is_empty()).map(str::to_owned),
            })
@@ -324,130 +267,12 @@ mod tests {
        assert_eq!(ids(&c), [("model", Some("b")), ("mode", Some("code"))]);
    }

-    #[test]
-    fn selected_bypass_settings_approve_without_asking() {
-        let full_access = options_of(&json!({
-            "modes": {"currentModeId": "full-access", "availableModes": [
-                {"id": "ask", "name": "Ask"}, {"id": "full-access", "name": "Full Access"}
-            ]}
-        }));
-        assert!(bypass_approvals(&full_access));
-        assert_eq!(bypass_mode(&full_access).map(|(_, v)| v.value.as_str()), Some("full-access"));
-
-        let asking = options_of(&json!({
-            "modes": {"currentModeId": "ask", "availableModes": [
-                {"id": "ask", "name": "Ask"}, {"id": "full-access", "name": "Full Access"}
-            ]}
-        }));
-        assert!(!bypass_approvals(&asking));
-        assert_eq!(
-            bypass_mode(&asking).map(|(_, v)| v.value.as_str()),
-            Some("full-access"),
-            "the offered bypass mode stays available"
-        );
-
-        let permissions = |current: &str| {
-            options_of(&json!({"configOptions": [{
-                "id": "allow_all", "name": "Allow All", "category": "permissions", "type": "select",
-                "currentValue": current, "options": [{"value": "off"}, {"value": "on"}]
-            }]}))
-        };
-        assert!(bypass_approvals(&permissions("on")));
-        assert!(bypass_approvals(&permissions("TRUE")));
-        assert!(!bypass_approvals(&permissions("off")));
-
-        let approval = options_of(&json!({"configOptions": [{
-            "id": "approval", "name": "Approvals", "category": "approval", "type": "select",
-            "currentValue": "bypass", "options": [{"value": "ask"}, {"value": "bypass"}]
-        }]}));
-        assert!(bypass_approvals(&approval));
-
-        // The composer's mode icon splits URL-like ids on `#` / `/`; the backend must agree.
-        let url_mode = options_of(&json!({
-            "modes": {"currentModeId": "https://agentclientprotocol.com/protocol/session-modes#yolo",
-                      "availableModes": [{"id": "https://agentclientprotocol.com/protocol/session-modes#yolo"}]}
-        }));
-        assert!(bypass_approvals(&url_mode));
-    }
-
-    #[test]
-    fn asking_for_approvals_keeps_a_mode_that_asks_and_leaves_one_that_does_not() {
-        let mode = |current: &str, values: &[&str]| {
-            options_of(&json!({"modes": {"currentModeId": current,
-                "availableModes": values.iter().map(|v| json!({"id": v})).collect::<Vec<_>>()}}))
-        };
-        let codex = ["read-only", "ask", "auto", "full-access"];
-        for (current, expected) in [("auto", "auto"), ("read-only", "read-only"), ("full-access", "ask")] {
-            let mut c = mode(current, &codex);
-            ask_for_approvals(&mut c);
-            assert_eq!(c[0].current.as_deref(), Some(expected), "{current}");
-            assert!(!bypass_approvals(&c));
-        }
-        let mut claude = mode("bypassPermissions", &["acceptEdits", "default", "plan", "bypassPermissions"]);
-        ask_for_approvals(&mut claude);
-        assert_eq!(claude[0].current.as_deref(), Some("default"));
-        let mut other = mode("yolo", &["yolo", "code", "architect"]);
-        ask_for_approvals(&mut other);
-        assert_eq!(other[0].current.as_deref(), Some("code"));
-
-        let mut c = options_of(&json!({"configOptions": [
-            {"id": "allow_all", "category": "permissions", "type": "select", "currentValue": "on",
-             "options": [{"value": "on"}, {"value": "off"}]},
-            {"id": "approval", "category": "approval", "type": "select", "currentValue": "bypass",
-             "options": [{"value": "bypass"}, {"value": "ask"}]}
-        ]}));
-        ask_for_approvals(&mut c);
-        assert_eq!(ids(&c), [("allow_all", Some("off")), ("approval", Some("ask"))]);
-    }
-
-    #[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": [
-            {"name": "review", "source": "skill"},
-            {"name": "$lint"},
-            {"name": "compact"}
-        ]});
-        let sources = |provider| commands_of(&update, provider).into_iter().map(|c| c.source).collect::<Vec<_>>();
-        assert_eq!(
-            sources("codex-acp"),
-            [AgentCommandSource::Skill, AgentCommandSource::Skill, AgentCommandSource::Command]
-        );
-        assert_eq!(
-            sources("custom"),
-            [AgentCommandSource::Skill, AgentCommandSource::Command, AgentCommandSource::Command]
-        );
-        let old: AgentCommand =
-            serde_json::from_value(json!({"name": "review", "description": "Review", "hint": null})).unwrap();
-        assert_eq!(old.source, AgentCommandSource::Command);
-        let skill = AgentCommand { source: AgentCommandSource::Skill, ..old };
-        assert_eq!(serde_json::from_value::<AgentCommand>(serde_json::to_value(&skill).unwrap()).unwrap(), skill);
-    }
-
    #[test]
    fn commands_and_usage() {
-        let cmds = commands_of(
-            &json!({"availableCommands": [
-                {"name": "review", "description": "Review changes", "input": {"hint": "what to review"}},
-                {"name": "/init", "description": "Write CLAUDE.md", "input": null}
-            ]}),
-            "claude",
-        );
-        assert_eq!(cmds[0].source, AgentCommandSource::Command);
+        let cmds = commands_of(&json!({"availableCommands": [
+            {"name": "review", "description": "Review changes", "input": {"hint": "what to review"}},
+            {"name": "/init", "description": "Write CLAUDE.md", "input": null}
+        ]}));
        assert_eq!(cmds[0].hint.as_deref(), Some("what to review"));
        assert_eq!((cmds[1].name.as_str(), cmds[1].hint.as_ref()), ("init", None));
        let u = usage_of(&json!({"used": 1200, "size": 200000, "cost": {"amount": 0.42, "currency": "USD"}})).unwrap();
@@ -1,365 +0,0 @@
-//! Sessions the user started outside OpenIDEA (a terminal, another editor, the CLI):
-//! scanned so they can be listed and imported as tasks instead of re-explained (#312).
-//!
-//! Only the native providers keep transcripts on disk in a readable form: Claude Code
-//! (`<config>/projects/*/<id>.jsonl`, see `native::claude::history`) and Codex
-//! (`<home>/.codex/sessions/**`, rollout files with a `session_meta` line, named in
-//! `<home>/.codex/session_index.jsonl`).
-
-use super::native::claude::history;
-use serde::Serialize;
-use specta::Type;
-use std::collections::HashMap;
-use std::io::BufRead;
-use std::path::{Path, PathBuf};
-
-/// A session on this machine that no task holds yet.
-#[derive(Clone, Debug, Serialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct ExternalSession {
-    /// The [`crate::AgentProvider`] id that owns it (`claude`, `codex`).
-    pub provider: String,
-    /// The id resuming it names (`--resume`, `thread/resume`).
-    pub session_id: String,
-    pub title: String,
-    /// Where it ran, when the transcript names one.
-    pub cwd: Option<String>,
-    /// File modification time, ms since the epoch.
-    pub updated_ms: f64,
-}
-
-/// Modification time of `path` in ms, else 0.
-fn mtime(path: &Path) -> f64 {
-    path.metadata()
-        .and_then(|m| m.modified())
-        .ok()
-        .and_then(|t| t.duration_since(std::time::UNIX_EPOCH).ok())
-        .map(|d| d.as_millis() as f64)
-        .unwrap_or(0.0)
-}
-
-/// Short display text: collapsed whitespace, truncated to `MAX_TITLE` chars.
-fn short(text: &str) -> String {
-    const MAX_TITLE: usize = 80;
-    let flat: String = text.split_whitespace().collect::<Vec<_>>().join(" ");
-    if flat.chars().count() <= MAX_TITLE {
-        flat
-    } else {
-        format!("{}…", flat.chars().take(MAX_TITLE - 1).collect::<String>())
-    }
-}
-
-/// The text of a Claude Code transcript entry's message, when it carries prose.
-fn message_text(e: &serde_json::Value) -> Option<String> {
-    match e.pointer("/message/content") {
-        Some(serde_json::Value::String(s)) => Some(s.clone()),
-        Some(serde_json::Value::Array(blocks)) => {
-            let text: Vec<&str> = blocks
-                .iter()
-                .filter(|b| b.get("type").and_then(serde_json::Value::as_str) == Some("text"))
-                .filter_map(|b| b.get("text").and_then(serde_json::Value::as_str))
-                .collect();
-            (!text.is_empty()).then(|| text.join("\n"))
-        }
-        _ => None,
-    }
-}
-
-/// 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> {
-    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();
-    for dir in dirs {
-        let files: Vec<PathBuf> = std::fs::read_dir(&dir)
-            .into_iter()
-            .flatten()
-            .flatten()
-            .map(|d| d.path())
-            .filter(|p| p.extension().is_some_and(|e| e == "jsonl"))
-            .collect();
-        for path in files {
-            let id = path.file_stem().and_then(|s| s.to_str()).unwrap_or_default().to_owned();
-            if id.is_empty() {
-                continue;
-            }
-            let entries = history::read(&path).unwrap_or_default();
-            if entries.is_empty() {
-                continue;
-            }
-            let title = history::title(&entries)
-                .or_else(|| entries.iter().filter(|e| history::is_turn_start(e)).filter_map(message_text).next())
-                .map(|t| short(&t))
-                .unwrap_or_else(|| format!("Claude Code session {}", &id[..id.len().min(8)]));
-            let cwd = entries
-                .iter()
-                .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,
-                title,
-                cwd,
-                updated_ms: mtime(&path),
-            });
-        }
-    }
-    out
-}
-
-/// The `session_meta` line of a Codex rollout file: `(id, cwd)`, across shapes.
-fn codex_meta(line: &serde_json::Value) -> Option<(String, Option<String>)> {
-    let payload =
-        line.get("payload").filter(|p| p.get("type").and_then(serde_json::Value::as_str) == Some("session_meta"));
-    let inner = payload.and_then(|p| p.get("payload")).or_else(|| {
-        line.get("type").and_then(serde_json::Value::as_str).filter(|t| *t == "session_meta").and(Some(line))
-    })?;
-    let id = inner.get("id").and_then(serde_json::Value::as_str)?.to_owned();
-    let cwd = inner.get("cwd").and_then(serde_json::Value::as_str).map(str::to_owned);
-    Some((id, cwd))
-}
-
-/// A prose line of a Codex rollout file (a user message), across shapes.
-fn codex_user_text(line: &serde_json::Value) -> Option<String> {
-    let payload = line.get("payload")?;
-    let ty = payload.get("type").and_then(serde_json::Value::as_str)?;
-    if !(ty == "user_message" || ty == "userMessage" || ty == "event_msg") {
-        return None;
-    }
-    let inner = payload.get("payload").unwrap_or(&serde_json::Value::Null);
-    for v in [payload, inner] {
-        if let Some(s) = v.get("message").and_then(serde_json::Value::as_str) {
-            return Some(s.to_owned());
-        }
-        if let Some(s) = v.get("text").and_then(serde_json::Value::as_str) {
-            return Some(s.to_owned());
-        }
-    }
-    None
-}
-
-/// 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 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 };
-        if id.is_none()
-            && let Some(meta) = codex_meta(&v)
-        {
-            id = Some(meta);
-        }
-        if title.is_none()
-            && let Some(t) = codex_user_text(&v)
-        {
-            title = Some(short(&t));
-        }
-        if id.is_some() && title.is_some() {
-            break;
-        }
-    }
-    let (session_id, cwd) = id?;
-    Some(ExternalSession {
-        provider: "codex".to_owned(),
-        title: title.unwrap_or_else(|| format!("Codex session {}", &session_id[..session_id.len().min(8)])),
-        session_id,
-        cwd,
-        updated_ms: mtime(path),
-    })
-}
-
-/// Collects `*.jsonl` below `dir`, up to 4 levels (`sessions/YYYY/MM/DD/<rollout>`).
-fn rollout_files(dir: &Path, depth: usize, out: &mut Vec<PathBuf>) {
-    if depth == 0 {
-        return;
-    }
-    for entry in std::fs::read_dir(dir).into_iter().flatten().flatten() {
-        let path = entry.path();
-        if path.is_dir() {
-            rollout_files(&path, depth - 1, out);
-        } else if path.extension().is_some_and(|e| e == "jsonl") {
-            out.push(path);
-        }
-    }
-}
-
-/// Thread names Codex keeps in `session_index.jsonl`, by thread id. A rename adds a line,
-/// so the last one wins.
-fn codex_names(codex_home: &Path) -> HashMap<String, String> {
-    let Ok(file) = std::fs::File::open(codex_home.join("session_index.jsonl")) else { return HashMap::new() };
-    let mut names = HashMap::new();
-    for line in std::io::BufReader::new(file).lines() {
-        let Ok(line) = line else { break };
-        let Ok(v) = serde_json::from_str::<serde_json::Value>(&line) else { continue };
-        let id = v.get("id").and_then(serde_json::Value::as_str);
-        let name = v.get("thread_name").and_then(serde_json::Value::as_str).map(str::trim).filter(|n| !n.is_empty());
-        if let (Some(id), Some(name)) = (id, name) {
-            names.insert(id.to_owned(), name.to_owned());
-        }
-    }
-    names
-}
-
-/// Codex sessions of the project at `root`: `<home>/.codex/sessions/**`, titled by their
-/// thread names, else by their first prompts.
-pub fn codex_sessions(codex_home: &Path, root: &Path) -> Vec<ExternalSession> {
-    let mut files = Vec::new();
-    rollout_files(&codex_home.join("sessions"), 4, &mut files);
-    let mut sessions: Vec<ExternalSession> =
-        files.iter().filter_map(|p| codex_file(p)).filter(|s| in_project(s.cwd.as_deref(), root)).collect();
-    if !sessions.is_empty() {
-        let names = codex_names(codex_home);
-        for s in &mut sessions {
-            if let Some(name) = names.get(&s.session_id) {
-                s.title = short(name);
-            }
-        }
-    }
-    sessions
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-    use std::io::Write;
-
-    fn write(path: &Path, lines: &[serde_json::Value]) {
-        std::fs::create_dir_all(path.parent().unwrap()).unwrap();
-        let mut f = std::fs::File::create(path).unwrap();
-        for line in lines {
-            writeln!(f, "{line}").unwrap();
-        }
-    }
-
-    fn claude_user(uuid: &str, text: &str) -> serde_json::Value {
-        json!({"type": "user", "uuid": uuid, "parentUuid": null,
-            "message": {"role": "user", "content": text}, "cwd": "/work/app"})
-    }
-
-    #[test]
-    fn lists_claude_transcripts_with_titles() {
-        let tmp = tempfile::tempdir().unwrap();
-        write(
-            &tmp.path().join("projects/-work-app/abc123.jsonl"),
-            &[
-                claude_user("u1", "fix the login bug"),
-                json!({"type": "assistant", "uuid": "a1", "parentUuid": "u1",
-                    "message": {"role": "assistant", "content": []}}),
-                json!({"type": "ai-title", "aiTitle": "Login fix"}),
-            ],
-        );
-        write(&tmp.path().join("projects/-work-app/empty.jsonl"), &[]);
-        let sessions = claude_sessions(tmp.path(), Path::new("/work/app"));
-        assert_eq!(sessions.len(), 1);
-        let s = &sessions[0];
-        assert_eq!((s.provider.as_str(), s.session_id.as_str()), ("claude", "abc123"));
-        assert_eq!(s.title, "Login fix");
-        assert_eq!(s.cwd.as_deref(), Some("/work/app"));
-        assert!(s.updated_ms > 0.0);
-    }
-
-    #[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"));
-        assert_eq!(sessions.len(), 1);
-        assert_eq!(sessions[0].title, "hello there");
-    }
-
-    #[test]
-    fn lists_codex_rollouts_with_meta() {
-        let tmp = tempfile::tempdir().unwrap();
-        write(
-            &tmp.path().join("sessions/2026/01/02/rollout-01.jsonl"),
-            &[
-                json!({"timestamp": "t", "payload": {"type": "session_meta",
-                    "payload": {"id": "thread-1", "cwd": "/work/app"}}}),
-                json!({"timestamp": "t", "payload": {"type": "user_message",
-                    "payload": {"message": "add tests"}}}),
-            ],
-        );
-        write(&tmp.path().join("sessions/notes.jsonl"), &[json!({"nope": true})]);
-        let sessions = codex_sessions(tmp.path(), Path::new("/work"));
-        assert_eq!(sessions.len(), 1);
-        let s = &sessions[0];
-        assert_eq!((s.provider.as_str(), s.session_id.as_str()), ("codex", "thread-1"));
-        assert_eq!(s.title, "add tests");
-        assert_eq!(s.cwd.as_deref(), Some("/work/app"));
-
-        write(
-            &tmp.path().join("session_index.jsonl"),
-            &[
-                json!({"id": "thread-1", "thread_name": "Add tests", "updated_at": "t1"}),
-                json!({"id": "thread-2", "thread_name": "Other", "updated_at": "t1"}),
-                json!({"id": "thread-1", "thread_name": "Add parser tests", "updated_at": "t2"}),
-            ],
-        );
-        assert_eq!(codex_sessions(tmp.path(), Path::new("/work"))[0].title, "Add parser 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"]);
-    }
-}
@@ -1,507 +0,0 @@
-//! Model Context Protocol (MCP) server configurations stored in OpenIDEA's own settings
-//! (global `settings.toml` and project `.openidea/settings.toml`), passed to ACP agents in
-//! `session/new`, `session/load`, and `session/fork`, plus one-way import from `.mcp.json` /
-//! `.vscode/mcp.json`.
-
-use crate::acp::Negotiated;
-use crate::{AgentMcpServer, McpKeyValue, McpScope, McpServer, McpServerInput, McpTransport};
-use serde_json::{Value, json};
-use std::collections::{BTreeMap, HashSet};
-use std::path::Path;
-
-/// Stable ID for a server in a given scope (`"user::<name>"` or `"workspace::<name>"`).
-pub fn server_id(scope: McpScope, name: &str) -> String {
-    let prefix = match scope {
-        McpScope::User => "user",
-        McpScope::Workspace => "workspace",
-    };
-    format!("{prefix}::{name}")
-}
-
-/// Parses a server ID (`"user::<name>"` or `"workspace::<name>"`).
-pub fn parse_server_id(id: &str) -> Option<(McpScope, &str)> {
-    let (prefix, name) = id.split_once("::")?;
-    if name.is_empty() {
-        return None;
-    }
-    match prefix {
-        "user" => Some((McpScope::User, name)),
-        "workspace" => Some((McpScope::Workspace, name)),
-        _ => None,
-    }
-}
-
-/// Converts the User (`settings.toml`) and Workspace (`.openidea/settings.toml`) MCP server maps
-/// into the ordered list displayed in Settings › Agents › MCP Servers.
-pub fn servers_from_settings(
-    user: &BTreeMap<String, AgentMcpServer>,
-    workspace: &BTreeMap<String, AgentMcpServer>,
-) -> Vec<McpServer> {
-    user.iter()
-        .map(|(name, cfg)| to_mcp_server(McpScope::User, name, cfg))
-        .chain(workspace.iter().map(|(name, cfg)| to_mcp_server(McpScope::Workspace, name, cfg)))
-        .collect()
-}
-
-fn to_mcp_server(scope: McpScope, name: &str, cfg: &AgentMcpServer) -> McpServer {
-    McpServer {
-        id: server_id(scope, name),
-        name: name.to_owned(),
-        scope,
-        transport: cfg.transport,
-        enabled: cfg.enabled,
-        command: cfg.command.clone(),
-        args: cfg.args.clone(),
-        env: cfg.env.iter().map(|(k, v)| McpKeyValue { name: k.clone(), value: v.clone() }).collect(),
-        url: cfg.url.clone(),
-        headers: cfg.headers.iter().map(|(k, v)| McpKeyValue { name: k.clone(), value: v.clone() }).collect(),
-        agents: cfg.agents.clone(),
-    }
-}
-
-fn normalize_provider(id: &str) -> &str {
-    id.strip_suffix("-acp").unwrap_or(id)
-}
-
-fn matches_agent(agents: &[String], provider: &str) -> bool {
-    if agents.is_empty() {
-        return true;
-    }
-    let target = normalize_provider(provider);
-    agents.iter().any(|a| {
-        let trimmed = a.trim();
-        trimmed == provider || normalize_provider(trimmed) == target
-    })
-}
-
-/// Builds the ACP `mcpServers` array for `session/new`, `session/load`, and `session/fork`.
-/// Workspace entries take precedence over User entries with the same name.
-pub(crate) fn acp_mcp_servers(all: &[McpServer], provider: &str, init: &Negotiated) -> Vec<Value> {
-    let supports_stdio = init.mcp_stdio();
-    let supports_http = init.mcp("http");
-    let supports_sse = init.mcp("sse");
-    let mut seen = HashSet::new();
-    let mut servers = Vec::new();
-
-    let ordered =
-        all.iter().filter(|s| s.scope == McpScope::Workspace).chain(all.iter().filter(|s| s.scope == McpScope::User));
-
-    for srv in ordered {
-        if !srv.enabled || !matches_agent(&srv.agents, provider) || !seen.insert(srv.name.clone()) {
-            continue;
-        }
-        match srv.transport {
-            McpTransport::Stdio if supports_stdio => {
-                let Some(cmd) = srv.command.as_deref().filter(|c| !c.trim().is_empty()) else {
-                    continue;
-                };
-                let env: Vec<Value> = srv.env.iter().map(|kv| json!({ "name": kv.name, "value": kv.value })).collect();
-                servers.push(json!({
-                    "name": srv.name,
-                    "command": cmd,
-                    "args": srv.args,
-                    "env": env,
-                }));
-            }
-            McpTransport::Http if supports_http => {
-                let Some(url) = srv.url.as_deref().filter(|u| !u.trim().is_empty()) else {
-                    continue;
-                };
-                let headers: Vec<Value> =
-                    srv.headers.iter().map(|kv| json!({ "name": kv.name, "value": kv.value })).collect();
-                servers.push(json!({
-                    "type": "http",
-                    "name": srv.name,
-                    "url": url,
-                    "headers": headers,
-                }));
-            }
-            McpTransport::Sse if supports_sse => {
-                let Some(url) = srv.url.as_deref().filter(|u| !u.trim().is_empty()) else {
-                    continue;
-                };
-                let headers: Vec<Value> =
-                    srv.headers.iter().map(|kv| json!({ "name": kv.name, "value": kv.value })).collect();
-                servers.push(json!({
-                    "type": "sse",
-                    "name": srv.name,
-                    "url": url,
-                    "headers": headers,
-                }));
-            }
-            _ => {}
-        }
-    }
-
-    servers
-}
-
-/// Applies a create or update operation to the User / Workspace MCP server maps.
-pub fn apply_save(
-    user: &mut BTreeMap<String, AgentMcpServer>,
-    workspace: &mut BTreeMap<String, AgentMcpServer>,
-    has_workspace: bool,
-    input: McpServerInput,
-) -> Result<(), String> {
-    let name = input.name.trim();
-    if name.is_empty() {
-        return Err("Server name is required".into());
-    }
-    if input.scope == McpScope::Workspace && !has_workspace {
-        return Err("Open a project to configure workspace MCP servers".into());
-    }
-    let cfg = match input.transport {
-        McpTransport::Stdio => {
-            let cmd = input.command.as_deref().map(str::trim).unwrap_or_default();
-            if cmd.is_empty() {
-                return Err("Command is required for stdio MCP servers".into());
-            }
-            let env = input
-                .env
-                .into_iter()
-                .filter_map(|kv| {
-                    let k = kv.name.trim();
-                    (!k.is_empty()).then(|| (k.to_owned(), kv.value))
-                })
-                .collect();
-            AgentMcpServer {
-                transport: McpTransport::Stdio,
-                enabled: input.enabled,
-                command: Some(cmd.to_owned()),
-                args: input.args,
-                env,
-                url: None,
-                headers: BTreeMap::new(),
-                agents: normalize_agents_list(input.agents),
-            }
-        }
-        McpTransport::Http | McpTransport::Sse => {
-            let url = input.url.as_deref().map(str::trim).unwrap_or_default();
-            if url.is_empty() {
-                return Err("URL is required for HTTP/SSE MCP servers".into());
-            }
-            let headers = input
-                .headers
-                .into_iter()
-                .filter_map(|kv| {
-                    let k = kv.name.trim();
-                    (!k.is_empty()).then(|| (k.to_owned(), kv.value))
-                })
-                .collect();
-            AgentMcpServer {
-                transport: input.transport,
-                enabled: input.enabled,
-                command: None,
-                args: Vec::new(),
-                env: BTreeMap::new(),
-                url: Some(url.to_owned()),
-                headers,
-                agents: normalize_agents_list(input.agents),
-            }
-        }
-    };
-
-    if let Some(prev_id) = input.id.as_deref()
-        && let Some((prev_scope, prev_name)) = parse_server_id(prev_id)
-        && (prev_scope != input.scope || prev_name != name)
-    {
-        match prev_scope {
-            McpScope::User => {
-                user.remove(prev_name);
-            }
-            McpScope::Workspace => {
-                workspace.remove(prev_name);
-            }
-        }
-    }
-
-    match input.scope {
-        McpScope::User => {
-            user.insert(name.to_owned(), cfg);
-        }
-        McpScope::Workspace => {
-            workspace.insert(name.to_owned(), cfg);
-        }
-    }
-    Ok(())
-}
-
-/// Enables or disables a User or Workspace MCP server by ID.
-pub fn apply_set_enabled(
-    user: &mut BTreeMap<String, AgentMcpServer>,
-    workspace: &mut BTreeMap<String, AgentMcpServer>,
-    id: &str,
-    enabled: bool,
-) -> Result<McpScope, String> {
-    let (scope, name) = parse_server_id(id).ok_or_else(|| format!("MCP server `{id}` not found"))?;
-    let map = match scope {
-        McpScope::User => user,
-        McpScope::Workspace => workspace,
-    };
-    let srv = map.get_mut(name).ok_or_else(|| format!("MCP server `{name}` not found"))?;
-    srv.enabled = enabled;
-    Ok(scope)
-}
-
-/// Removes a User or Workspace MCP server by ID.
-pub fn apply_remove(
-    user: &mut BTreeMap<String, AgentMcpServer>,
-    workspace: &mut BTreeMap<String, AgentMcpServer>,
-    id: &str,
-) -> Result<McpScope, String> {
-    let (scope, name) = parse_server_id(id).ok_or_else(|| format!("MCP server `{id}` not found"))?;
-    let map = match scope {
-        McpScope::User => user,
-        McpScope::Workspace => workspace,
-    };
-    if map.remove(name).is_none() {
-        return Err(format!("MCP server `{name}` not found"));
-    }
-    Ok(scope)
-}
-
-/// Imports MCP servers from `<workspace_root>/.mcp.json` and `<workspace_root>/.vscode/mcp.json`
-/// into `workspace` without modifying the external files. Returns the number of newly added servers.
-pub fn apply_import(workspace: &mut BTreeMap<String, AgentMcpServer>, workspace_root: &Path) -> usize {
-    let mut added = 0;
-    for rel in [".mcp.json", ".vscode/mcp.json"] {
-        let path = workspace_root.join(rel);
-        for (name, srv) in read_external_file(&path) {
-            if let std::collections::btree_map::Entry::Vacant(e) = workspace.entry(name) {
-                e.insert(srv);
-                added += 1;
-            }
-        }
-    }
-    added
-}
-
-fn normalize_agents_list(agents: Vec<String>) -> Vec<String> {
-    let mut out = Vec::new();
-    for a in agents {
-        let trimmed = a.trim();
-        if !trimmed.is_empty() && !out.iter().any(|existing: &String| existing == trimmed) {
-            out.push(trimmed.to_owned());
-        }
-    }
-    out
-}
-
-fn read_external_file(path: &Path) -> BTreeMap<String, AgentMcpServer> {
-    let Ok(bytes) = std::fs::read(path) else {
-        return BTreeMap::new();
-    };
-    let Ok(root) = serde_json::from_slice::<Value>(&bytes) else {
-        return BTreeMap::new();
-    };
-    let Some(servers_obj) = root.get("mcpServers").or_else(|| root.get("servers")).and_then(Value::as_object) else {
-        return BTreeMap::new();
-    };
-
-    let mut out = BTreeMap::new();
-    for (name, def) in servers_obj {
-        let name = name.trim();
-        let Some(obj) = def.as_object().filter(|_| !name.is_empty()) else {
-            continue;
-        };
-        let disabled = obj.get("disabled").and_then(Value::as_bool).unwrap_or(false)
-            || obj.get("enabled").and_then(Value::as_bool) == Some(false);
-        let type_str = obj.get("type").and_then(Value::as_str).unwrap_or_default().to_ascii_lowercase();
-        let url = obj
-            .get("url")
-            .or_else(|| obj.get("serverUrl"))
-            .and_then(Value::as_str)
-            .map(str::trim)
-            .filter(|s| !s.is_empty())
-            .map(str::to_owned);
-        let command =
-            obj.get("command").and_then(Value::as_str).map(str::trim).filter(|s| !s.is_empty()).map(str::to_owned);
-
-        let transport = match type_str.as_str() {
-            "sse" => McpTransport::Sse,
-            "http" | "streamable-http" | "streamable_http" => McpTransport::Http,
-            "stdio" | "local" => McpTransport::Stdio,
-            _ if url.is_some() && command.is_none() => McpTransport::Http,
-            _ => McpTransport::Stdio,
-        };
-
-        match transport {
-            McpTransport::Stdio if command.is_none() => continue,
-            McpTransport::Http | McpTransport::Sse if url.is_none() => continue,
-            _ => {}
-        }
-
-        let args = obj
-            .get("args")
-            .and_then(Value::as_array)
-            .map(|arr| arr.iter().filter_map(|v| v.as_str().map(str::to_owned)).collect())
-            .unwrap_or_default();
-
-        out.insert(
-            name.to_owned(),
-            AgentMcpServer {
-                transport,
-                enabled: !disabled,
-                command,
-                args,
-                env: parse_key_values_map(obj.get("env")),
-                url,
-                headers: parse_key_values_map(obj.get("headers")),
-                agents: Vec::new(),
-            },
-        );
-    }
-    out
-}
-
-fn parse_key_values_map(val: Option<&Value>) -> BTreeMap<String, String> {
-    match val {
-        Some(Value::Object(map)) => map
-            .iter()
-            .filter_map(|(k, v)| {
-                let s = match v {
-                    Value::String(s) => s.clone(),
-                    Value::Number(n) => n.to_string(),
-                    Value::Bool(b) => b.to_string(),
-                    _ => return None,
-                };
-                Some((k.clone(), s))
-            })
-            .collect(),
-        Some(Value::Array(arr)) => arr
-            .iter()
-            .filter_map(|item| {
-                let obj = item.as_object()?;
-                let name = obj.get("name")?.as_str()?.to_owned();
-                let value = obj.get("value")?.as_str()?.to_owned();
-                Some((name, value))
-            })
-            .collect(),
-        _ => BTreeMap::new(),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn crud_and_acp_filtering_by_scope_agent_and_transport() {
-        let mut user = BTreeMap::new();
-        let mut workspace = BTreeMap::new();
-
-        apply_save(
-            &mut user,
-            &mut workspace,
-            true,
-            McpServerInput {
-                id: None,
-                name: "shared".into(),
-                scope: McpScope::User,
-                transport: McpTransport::Stdio,
-                enabled: true,
-                command: Some("npx".into()),
-                args: vec!["-y".into(), "user-pkg".into()],
-                env: vec![McpKeyValue { name: "TOKEN".into(), value: "u1".into() }],
-                url: None,
-                headers: Vec::new(),
-                agents: Vec::new(),
-            },
-        )
-        .unwrap();
-
-        apply_save(
-            &mut user,
-            &mut workspace,
-            true,
-            McpServerInput {
-                id: None,
-                name: "shared".into(),
-                scope: McpScope::Workspace,
-                transport: McpTransport::Stdio,
-                enabled: true,
-                command: Some("npx".into()),
-                args: vec!["-y".into(), "workspace-pkg".into()],
-                env: Vec::new(),
-                url: None,
-                headers: Vec::new(),
-                agents: Vec::new(),
-            },
-        )
-        .unwrap();
-
-        apply_save(
-            &mut user,
-            &mut workspace,
-            true,
-            McpServerInput {
-                id: None,
-                name: "claude-http".into(),
-                scope: McpScope::User,
-                transport: McpTransport::Http,
-                enabled: true,
-                command: None,
-                args: Vec::new(),
-                env: Vec::new(),
-                url: Some("https://example.com/mcp".into()),
-                headers: vec![McpKeyValue { name: "Authorization".into(), value: "Bearer secret".into() }],
-                agents: vec!["claude".into()],
-            },
-        )
-        .unwrap();
-
-        let list = servers_from_settings(&user, &workspace);
-        assert_eq!(list.len(), 3);
-
-        // Negotiated with HTTP support: `claude` gets workspace `shared` + `claude-http`; `codex` only gets `shared`.
-        let init_http = Negotiated::from_initialize(&json!({
-            "agentCapabilities": { "mcpCapabilities": { "http": true, "sse": false } }
-        }));
-        let claude_servers = acp_mcp_servers(&list, "claude-acp", &init_http);
-        assert_eq!(claude_servers.len(), 2);
-        assert_eq!(claude_servers[0]["name"], "shared");
-        assert_eq!(claude_servers[0]["args"], json!(["-y", "workspace-pkg"]));
-        assert_eq!(claude_servers[1]["name"], "claude-http");
-        assert_eq!(claude_servers[1]["type"], "http");
-
-        let codex_servers = acp_mcp_servers(&list, "codex", &init_http);
-        assert_eq!(codex_servers.len(), 1);
-        assert_eq!(codex_servers[0]["name"], "shared");
-
-        // Disable workspace `shared` and remove user `claude-http`.
-        apply_set_enabled(&mut user, &mut workspace, "workspace::shared", false).unwrap();
-        apply_remove(&mut user, &mut workspace, "user::claude-http").unwrap();
-        let list = servers_from_settings(&user, &workspace);
-        let after = acp_mcp_servers(&list, "claude", &init_http);
-        assert_eq!(after.len(), 1);
-        assert_eq!(after[0]["args"], json!(["-y", "user-pkg"]));
-    }
-
-    #[test]
-    fn imports_from_mcp_json_and_vscode_mcp_json_without_modifying_them() {
-        let tmp = tempfile::tempdir().unwrap();
-        let mcp_json = tmp.path().join(".mcp.json");
-        let vscode_dir = tmp.path().join(".vscode");
-        std::fs::create_dir_all(&vscode_dir).unwrap();
-        let vscode_mcp = vscode_dir.join("mcp.json");
-
-        let raw_mcp = r#"{"mcpServers":{"sqlite":{"command":"uvx","args":["mcp-server-sqlite"]}}}"#;
-        let raw_vscode = r#"{"servers":{"remote":{"type":"http","url":"https://mcp.example.com"}}}"#;
-        std::fs::write(&mcp_json, raw_mcp).unwrap();
-        std::fs::write(&vscode_mcp, raw_vscode).unwrap();
-
-        let mut workspace = BTreeMap::new();
-        let added = apply_import(&mut workspace, tmp.path());
-        assert_eq!(added, 2);
-        assert_eq!(workspace["sqlite"].command.as_deref(), Some("uvx"));
-        assert_eq!(workspace["remote"].transport, McpTransport::Http);
-        assert_eq!(workspace["remote"].url.as_deref(), Some("https://mcp.example.com"));
-
-        // Re-importing does not duplicate or overwrite existing entries, and leaves files untouched.
-        workspace.get_mut("sqlite").unwrap().enabled = false;
-        assert_eq!(apply_import(&mut workspace, tmp.path()), 0);
-        assert!(!workspace["sqlite"].enabled);
-        assert_eq!(std::fs::read_to_string(&mcp_json).unwrap(), raw_mcp);
-        assert_eq!(std::fs::read_to_string(&vscode_mcp).unwrap(), raw_vscode);
-    }
-}
@@ -36,9 +36,6 @@ pub struct AgentCapabilities {
    pub steer: bool,
    /// It reports its background tasks and stops them one by one.
    pub background_tasks: bool,
-    /// The task runs read-only: it asks before anything, and requests that would change
-    /// the project are denied (a temporary side conversation).
-    pub read_only: bool,
 }

 #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
@@ -159,14 +156,6 @@ pub struct AgentConfigOption {
    pub via: AgentConfigVia,
 }

-#[derive(Clone, Copy, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub enum AgentCommandSource {
-    #[default]
-    Command,
-    Skill,
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct AgentCommand {
@@ -175,8 +164,6 @@ pub struct AgentCommand {
    pub description: String,
    /// What to type after the command, when it takes input.
    pub hint: Option<String>,
-    #[serde(default)]
-    pub source: AgentCommandSource,
 }

 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
@@ -295,9 +282,6 @@ pub struct AgentPermissionOption {
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct AgentQuestion {
-    /// Stable answer identity when the provider supplies question ids.
-    #[serde(default)]
-    pub answer_key: Option<String>,
    #[serde(default)]
    pub header: String,
    pub question: String,
@@ -387,10 +371,6 @@ pub enum AgentEntry {
    Permission {
        id: u32,
        title: String,
-        /// The shell command the request asks to run, from its structured input; `None` for
-        /// any other request, whatever its title says.
-        #[serde(default)]
-        command: Option<String>,
        options: Vec<AgentPermissionOption>,
        /// Set when the request asks `AskUserQuestion`'s questions; answered with a JSON object
        /// of question to answer instead of an option.
@@ -426,9 +406,6 @@ pub struct AgentProvider {
    pub env: BTreeMap<String, String>,
    /// Settings (models, modes…) the agent offered last time it ran; empty before its first session.
    pub config: Vec<AgentConfigOption>,
-    /// Thinking-level options by model value; absent models have not reported their levels.
-    #[serde(default)]
-    pub thought_levels: BTreeMap<String, Vec<AgentConfigOption>>,
    /// Slash commands it offered last time.
    pub commands: Vec<AgentCommand>,
    pub source: AgentSource,
@@ -491,8 +468,7 @@ pub struct NewAgentTask {
    pub base: Option<String>,
 }

-/// A file the task changed: against [`AgentTask::base_commit`], or against `HEAD` in the
-/// grouped view.
+/// A file the task changed, relative to [`AgentTask::base_commit`].
 #[derive(Clone, Debug, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct AgentChange {
@@ -501,57 +477,6 @@ pub struct AgentChange {
    pub kind: ide_vcs::ChangeKind,
    pub added: u32,
    pub removed: u32,
-    /// Path before a rename; the left side of its diff reads this path.
-    pub old_path: Option<String>,
-}
-
-/// A commit made while the task ran, with the files it changed against its first parent.
-#[derive(Clone, Debug, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct AgentCommit {
-    pub id: String,
-    pub short_id: String,
-    pub summary: String,
-    pub message: String,
-    pub time_ms: f64,
-    /// First parent, or `None` for a root commit.
-    pub parent: Option<String>,
-    pub files: Vec<AgentChange>,
-}
-
-/// Which comparison a rollback of the task's changes uses.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub enum AgentChangesView {
-    /// Everything since the commit the task started from.
-    #[default]
-    SinceStart,
-    /// The uncommitted files against `HEAD`; commits made since the start stay.
-    Group,
-}
-
-/// A task's uncommitted files and the commits made since it started.
-#[derive(Clone, Debug, Default, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct AgentChanges {
-    /// Files changed against `HEAD`, less those changed before the task started and untouched since.
-    pub uncommitted: Vec<AgentChange>,
-    /// Commits from the task's start (exclusive) to `HEAD` (inclusive), newest first. Empty
-    /// for tasks working in the project's own checkout.
-    pub commits: Vec<AgentCommit>,
-}
-
-/// Authoritative choices for new tasks, independent of any running session's settings.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct AgentModelCatalog {
-    pub provider: String,
-    pub config: Vec<AgentConfigOption>,
-    pub thought_levels: BTreeMap<String, Vec<AgentConfigOption>>,
-    pub refreshing: bool,
-    pub refreshed_at_ms: Option<f64>,
-    pub retry_at_ms: Option<f64>,
-    pub error: Option<String>,
 }

 /// Streamed to the window that subscribed (`AgentManager::subscribe`).
@@ -577,137 +502,11 @@ pub enum AgentEvent {
        index: u32,
        entry: AgentEntry,
    },
-    /// Text was appended to entry `index` (an agent message or a thought): it read the first
-    /// `from` UTF-16 units of its text when the previous event for it was sent.
-    Append {
-        task: String,
-        subagent: Option<String>,
-        index: u32,
-        from: u32,
-        text: String,
-    },
    /// An agent reported the usage limits of its account (shared by every task of `provider`).
    Limits {
        provider: String,
        limits: Vec<AgentLimit>,
    },
-    /// A model lookup started or completed, including unsuccessful lookups.
-    ModelCatalog {
-        catalog: AgentModelCatalog,
-    },
    /// The installed or configured agent providers changed.
    Providers,
 }
-
-pub use ide_core::settings::{AgentMcpServer, McpTransport};
-
-/// Where an MCP server configuration is stored (`settings.toml` vs `.openidea/settings.toml`).
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub enum McpScope {
-    User,
-    Workspace,
-}
-
-/// A named environment variable or HTTP header for an MCP server.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct McpKeyValue {
-    pub name: String,
-    pub value: String,
-}
-
-/// One configured Model Context Protocol (MCP) server.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct McpServer {
-    pub id: String,
-    pub name: String,
-    pub scope: McpScope,
-    pub transport: McpTransport,
-    pub enabled: bool,
-    pub command: Option<String>,
-    pub args: Vec<String>,
-    pub env: Vec<McpKeyValue>,
-    pub url: Option<String>,
-    pub headers: Vec<McpKeyValue>,
-    /// Agent provider ids this server is enabled for; empty means enabled for all agents.
-    #[serde(default)]
-    pub agents: Vec<String>,
-}
-
-/// Payload for creating or updating a user or workspace MCP server.
-#[derive(Clone, Debug, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct McpServerInput {
-    #[serde(default)]
-    pub id: Option<String>,
-    pub name: String,
-    pub scope: McpScope,
-    pub transport: McpTransport,
-    #[serde(default = "default_true")]
-    pub enabled: bool,
-    #[serde(default)]
-    pub command: Option<String>,
-    #[serde(default)]
-    pub args: Vec<String>,
-    #[serde(default)]
-    pub env: Vec<McpKeyValue>,
-    #[serde(default)]
-    pub url: Option<String>,
-    #[serde(default)]
-    pub headers: Vec<McpKeyValue>,
-    /// Agent provider ids this server is enabled for; empty means enabled for all agents.
-    #[serde(default)]
-    pub agents: Vec<String>,
-}
-
-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,
-}
@@ -135,7 +135,7 @@ impl Cli for Process {
 }

 /// Claude Code's configuration directory (`CLAUDE_CONFIG_DIR`, else `~/.claude`).
-pub(crate) fn config_dir(env: &[(String, String)]) -> Option<PathBuf> {
+pub(super) fn config_dir(env: &[(String, String)]) -> Option<PathBuf> {
    let set = env
        .iter()
        .find(|(k, _)| k == "CLAUDE_CONFIG_DIR")
@@ -31,11 +31,11 @@ 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()
 }

-pub(crate) fn read(path: &Path) -> std::io::Result<Vec<Value>> {
+pub(super) fn read(path: &Path) -> std::io::Result<Vec<Value>> {
    let text = std::fs::read_to_string(path)?;
    Ok(text.lines().filter_map(|l| serde_json::from_str(l).ok()).collect())
 }
@@ -111,7 +111,7 @@ fn block_ids<'a>(e: &'a Value, ty: &'a str, key: &'a str) -> impl Iterator<Item

 /// Whether `e` is a message that started a turn: the user's own, not a tool result, a
 /// steer, or text Claude Code added.
-pub(crate) fn is_turn_start(e: &Value) -> bool {
+pub(super) fn is_turn_start(e: &Value) -> bool {
    if kind(e) != "user" || e.get("isMeta").and_then(Value::as_bool) == Some(true) {
        return false;
    }
@@ -149,7 +149,7 @@ pub(super) fn cut(chain: &[&Value], turns: usize) -> Result<Option<String>, Stri
 }

 /// The newest title Claude Code gave the session.
-pub(crate) fn title(entries: &[Value]) -> Option<String> {
+pub(super) fn title(entries: &[Value]) -> Option<String> {
    entries
        .iter()
        .rev()
@@ -158,42 +158,6 @@ pub(crate) fn title(entries: &[Value]) -> Option<String> {
        .map(str::to_owned)
 }

-/// Claude Code titles a session from the last 1000 characters of its text.
-const TITLE_SOURCE_CHARS: usize = 1000;
-/// Below this Claude Code gives no title without asking the model.
-const TITLE_SOURCE_MIN_CHARS: usize = 10;
-
-/// The conversation's own text to title the session after: the prompts and the replies,
-/// without the files attached to the prompts. `None` while there is too little.
-pub(super) fn title_source(entries: &[Value]) -> Option<String> {
-    let mut text = String::new();
-    for e in chain(entries, None) {
-        if !(is_turn_start(e) || kind(e) == "assistant") {
-            continue;
-        }
-        let blocks = match e.pointer("/message/content") {
-            Some(Value::String(s)) => vec![s.as_str()],
-            Some(Value::Array(blocks)) => blocks
-                .iter()
-                .filter(|b| b.get("type").and_then(Value::as_str) == Some("text"))
-                .filter_map(|b| b.get("text").and_then(Value::as_str))
-                .filter(|t| !t.starts_with("\n<context ref="))
-                .collect(),
-            _ => Vec::new(),
-        };
-        for block in blocks {
-            text.push_str(block);
-            text.push('\n');
-        }
-    }
-    let text = text.trim();
-    let len = text.chars().count();
-    if len < TITLE_SOURCE_MIN_CHARS {
-        return None;
-    }
-    Some(text.chars().skip(len.saturating_sub(TITLE_SOURCE_CHARS)).collect())
-}
-
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -255,29 +219,6 @@ mod tests {
        assert_eq!(cut(&c, 1), Ok(None));
    }

-    #[test]
-    fn titles_come_from_prompts_and_replies() {
-        let mut prompt = user("u1", None, "Fix the login form");
-        prompt["message"]["content"]
-            .as_array_mut()
-            .unwrap()
-            .push(json!({"type": "text", "text": "\n<context ref=\"file:///p/a.rs\">\nfn a() {}\n</context>"}));
-        let entries = vec![
-            prompt,
-            assistant(
-                "a1",
-                "u1",
-                json!([{"type": "thinking", "thinking": "hm"}, {"type": "text", "text": "Done."},
-                    {"type": "tool_use", "id": "t1", "name": "Bash", "input": {}}]),
-            ),
-            json!({"type": "user", "uuid": "r1", "parentUuid": "a1", "message": {"content": [{"type": "tool_result", "tool_use_id": "t1", "content": "out"}]}}),
-        ];
-        assert_eq!(title_source(&entries).as_deref(), Some("Fix the login form\nDone."));
-        assert_eq!(title_source(&[user("u1", None, "hi")]), None);
-        let long = "x".repeat(TITLE_SOURCE_CHARS + 5);
-        assert_eq!(title_source(&[user("u1", None, &long)]).map(|t| t.chars().count()), Some(TITLE_SOURCE_CHARS));
-    }
-
    #[test]
    fn project_directory_names() {
        assert_eq!(escape(Path::new("/private/tmp/a.b/c_d")), "-private-tmp-a-b-c-d");
@@ -7,8 +7,8 @@
 //! <id>.json`): loading that session, from this connection or a fresh one, starts it that
 //! way.

-pub(crate) mod cli;
-pub(crate) mod history;
+mod cli;
+mod history;
 mod settings;
 mod tools;
 mod translate;
@@ -69,77 +69,6 @@ pub(crate) fn connect(
    Ok(super::serve(shim, client))
 }

-/// What discovery found: ACP `availableCommands`, `configOptions` for the configured model,
-/// and each model's effort option by model value (`None`: none).
-pub(crate) struct Discovered {
-    pub commands: Vec<Value>,
-    pub options: Value,
-    pub efforts: Vec<(String, Option<Value>)>,
-}
-
-/// Discover the slash commands and the model, mode and effort options without a prompt,
-/// ACP session, or pending session file.
-pub(crate) async fn discover(spec: ProviderSpec, cwd: PathBuf) -> Result<Discovered, String> {
-    tokio::time::timeout(Duration::from_secs(5), async move {
-        let spec = tokio::task::spawn_blocking(move || (spec.resolve_for_launch(&cwd), cwd));
-        let (spec, cwd) = spec.await.map_err(|e| e.to_string())?;
-        let mut args = spec.args;
-        args.extend(Start::New { id: uuid::Uuid::new_v4().to_string() }.args());
-        // Metadata discovery must not launch project-configured MCP servers.
-        args.extend(["--strict-mcp-config".into(), "--mcp-config".into(), "{\"mcpServers\":{}}".into()]);
-        let launch = Launch { program: spec.command, args, cwd, env: spec.env };
-        let mut io = cli::Process.launch(&launch, Arc::new(|_| {})).map_err(|e| e.to_string())?;
-        let _stop = io.kill.clone().drop_guard();
-        let mut lines = BufReader::new(io.stdout).lines();
-        let init = control(
-            &mut io.stdin,
-            &mut lines,
-            "commands",
-            json!({ "subtype": "initialize", "perTaskStopAffordance": true }),
-        )
-        .await?
-        .ok_or("Claude Code did not initialize")?;
-        // The effort and model the user configured; without them the options show the defaults.
-        let applied = tokio::time::timeout(
-            Duration::from_secs(2),
-            control(&mut io.stdin, &mut lines, "settings", json!({ "subtype": "get_settings" })),
-        )
-        .await
-        .ok()
-        .and_then(Result::ok)
-        .flatten()
-        .unwrap_or_default();
-        let settings = Settings::from_cli(&init, &applied);
-        Ok(Discovered {
-            commands: settings.commands.clone(),
-            options: settings.options(),
-            efforts: settings.efforts_by_model(),
-        })
-    })
-    .await
-    .map_err(|_| "Claude Code command discovery timed out".to_owned())?
-}
-
-/// Sends one control request and waits for its response; `None` when the CLI answered with an error.
-async fn control(
-    stdin: &mut (impl AsyncWriteExt + Unpin),
-    lines: &mut tokio::io::Lines<impl AsyncBufReadExt + Unpin>,
-    id: &str,
-    request: Value,
-) -> Result<Option<Value>, String> {
-    let line = json!({ "type": "control_request", "request_id": id, "request": request });
-    stdin.write_all(format!("{line}\n").as_bytes()).await.map_err(|e| e.to_string())?;
-    stdin.flush().await.map_err(|e| e.to_string())?;
-    while let Some(line) = lines.next_line().await.map_err(|e| e.to_string())? {
-        let Ok(msg) = serde_json::from_str::<Value>(&line) else { continue };
-        if msg["type"] == "control_response" && msg["response"]["request_id"] == id {
-            let response = &msg["response"];
-            return Ok((response["subtype"] == "success").then(|| response["response"].clone()));
-        }
-    }
-    Err("Claude Code exited".into())
-}
-
 struct Config {
    pub program: String,
    /// Extra arguments (a custom agent's), before the session's own.
@@ -169,7 +98,6 @@ pub(super) struct Shim {
 struct Session {
    id: String,
    cwd: PathBuf,
-    mcp_config: Option<tempfile::TempPath>,
    shim: Weak<Shim>,
    st: Mutex<State>,
    /// Serializes (re)starting the process.
@@ -193,8 +121,6 @@ struct State {
    limit_resets_ms: Option<f64>,
    terminal_only: Vec<String>,
    titled: bool,
-    /// A title is being read or generated.
-    titling: bool,
 }

 struct Turn {
@@ -338,24 +264,9 @@ impl Shim {
        Ok(history::chain(&entries, at.as_deref()).into_iter().cloned().collect())
    }

-    fn add_session(
-        self: &Arc<Self>,
-        id: &str,
-        cwd: PathBuf,
-        start: Start,
-        pending: bool,
-        mcp_config: Option<String>,
-    ) -> Arc<Session> {
-        let mcp_config = mcp_config.and_then(|json| match write_mcp_config(&json) {
-            Ok(path) => Some(path),
-            Err(e) => {
-                tracing::warn!("Claude Code session {id}: cannot write its MCP configuration: {e}");
-                None
-            }
-        });
+    fn add_session(self: &Arc<Self>, id: &str, cwd: PathBuf, start: Start, pending: bool) -> Arc<Session> {
        let session = Arc::new(Session {
            id: id.to_owned(),
-            mcp_config,
            shim: Arc::downgrade(self),
            st: Mutex::new(State {
                proc: None,
@@ -369,7 +280,6 @@ impl Shim {
                limit_resets_ms: None,
                terminal_only: Vec::new(),
                titled: false,
-                titling: false,
            }),
            cwd,
            starting: tokio::sync::Mutex::new(()),
@@ -402,7 +312,6 @@ impl Shim {
                        "loadSession": true,
                        "promptCapabilities": { "image": true, "embeddedContext": true },
                        "sessionCapabilities": { "fork": {} },
-                        "mcpCapabilities": { "stdio": true, "http": true, "sse": true },
                        "_meta": { "openidea": { "rollback": true, "steer": true, "backgroundTasks": true } },
                    },
                    "agentInfo": { "name": "claude", "title": "Claude Code", "version": self.version() },
@@ -411,13 +320,7 @@ impl Shim {
            }
            "session/new" => {
                let id = new_uuid(false);
-                let session = self.add_session(
-                    &id,
-                    self.cwd_of(&params),
-                    Start::New { id: id.clone() },
-                    false,
-                    mcp_config(&params),
-                );
+                let session = self.add_session(&id, self.cwd_of(&params), Start::New { id: id.clone() }, false);
                rt.block_on(session.ensure()).map_err(|e| self.start_error(&session, e))?;
                session.announce_commands();
                Ok(json!({ "sessionId": id, "configOptions": session.st.lock().settings.options() }))
@@ -433,7 +336,7 @@ impl Shim {
                    None => return Err(invalid(format!("no Claude Code session {id} in {}", cwd.display()))),
                };
                let chain = self.base_chain(&cwd, &start).map_err(internal)?;
-                let session = self.add_session(id, cwd, start, pending, mcp_config(&params));
+                let session = self.add_session(id, cwd, start, pending);
                rt.block_on(session.ensure()).map_err(|e| self.start_error(&session, e))?;
                if method == "session/load" {
                    session.replay(&chain);
@@ -459,7 +362,7 @@ impl Shim {
                    (start, st.settings.clone())
                };
                self.save_pending(&id, Some(&start));
-                let session = self.add_session(&id, source.cwd.clone(), start, true, mcp_config(&params));
+                let session = self.add_session(&id, source.cwd.clone(), start, true);
                session.st.lock().settings = settings;
                let options = session.st.lock().settings.options();
                Ok(json!({ "sessionId": id, "configOptions": options }))
@@ -588,12 +491,11 @@ impl Shim {
 impl super::Shim for Shim {
    fn attach(&self, client: Peer) {
        let _ = self.client.set(client.clone());
-        // The client went away: so do the processes. Held until then: the connection drops
-        // its handler (this shim) as it closes, and the sessions would go without stopping.
-        let me = self.me.upgrade();
+        // The client went away: so do the processes.
+        let weak = self.me.clone();
        tokio::spawn(async move {
            client.closed().await;
-            if let Some(me) = me {
+            if let Some(me) = weak.upgrade() {
                me.closed.store(true, Ordering::Release);
                let sessions: Vec<Arc<Session>> = me.sessions.lock().drain().map(|(_, s)| s).collect();
                for s in sessions {
@@ -604,15 +506,6 @@ impl super::Shim for Shim {
    }
 }

-impl Drop for Session {
-    /// A session dropped without being stopped (the shim went away) takes its process along.
-    fn drop(&mut self) {
-        if let Some(p) = self.st.get_mut().proc.take() {
-            p.kill.cancel();
-        }
-    }
-}
-
 impl Session {
    fn shim(&self) -> Option<Arc<Shim>> {
        self.shim.upgrade()
@@ -663,9 +556,6 @@ impl Session {
            old.end();
        }
        let mut args = shim.config.args.clone();
-        if let Some(config) = &self.mcp_config {
-            args.extend(["--mcp-config".to_owned(), config.to_string_lossy().into_owned()]);
-        }
        args.extend(start.args());
        let launch =
            Launch { program: shim.config.program.clone(), args, cwd: self.cwd.clone(), env: shim.config.env.clone() };
@@ -1063,8 +953,7 @@ impl Session {
                    } else if matches!(st.start, Start::New { .. }) {
                        st.start = Start::Resume { id: self.id.clone(), at: None };
                    }
-                    read_title = !st.titled && !st.titling;
-                    st.titling |= read_title;
+                    read_title = !st.titled;
                    if let Some(turn) = st.turn.as_ref()
                        && belongs(turn, &msg)
                    {
@@ -1089,29 +978,13 @@ impl Session {
        }
    }

-    /// Sends the session's title once it has one: the one in its transcript, or else one
-    /// Claude Code is asked for, as it titles no session run the way the Agent SDK runs it.
-    /// Without a title the next turn tries again.
+    /// Sends the title Claude Code gave the session, once it has one.
    fn read_title(self: &Arc<Self>) {
        let me = self.clone();
-        tokio::spawn(async move {
-            let reader = me.clone();
-            let entries = tokio::task::spawn_blocking(move || transcript_entries(&reader)).await.ok().flatten();
-            let mut title = entries.as_deref().and_then(history::title);
-            if title.is_none()
-                && let Some(source) = entries.as_deref().and_then(history::title_source)
-            {
-                title = me.generate_title(source).await;
-            }
-            {
-                let mut st = me.st.lock();
-                st.titling = false;
-                if title.is_none() {
-                    return;
-                }
-                st.titled = true;
-            }
-            if let (Some(title), Some(shim)) = (title, me.shim()) {
+        tokio::task::spawn_blocking(move || {
+            let Some(title) = chain_title(&me) else { return };
+            me.st.lock().titled = true;
+            if let Some(shim) = me.shim() {
                shim.notify(vec![Update {
                    session: me.id.clone(),
                    update: json!({ "sessionUpdate": "session_info_update", "title": title }),
@@ -1120,19 +993,6 @@ impl Session {
        });
    }

-    /// A title Claude Code generates from `source`, also written to the transcript.
-    async fn generate_title(&self, source: String) -> Option<String> {
-        let proc = self.st.lock().proc.clone()?;
-        let request = json!({ "subtype": "generate_session_title", "description": source, "persist": true });
-        match proc.control(request).await {
-            Ok(r) => r.get("title").and_then(Value::as_str).map(str::trim).filter(|t| !t.is_empty()).map(str::to_owned),
-            Err(e) => {
-                tracing::debug!("generating a claude session title: {e}");
-                None
-            }
-        }
-    }
-
    async fn on_cli_request(self: &Arc<Self>, proc: &Arc<Proc>, msg: Value) {
        let id = msg.get("request_id").and_then(Value::as_str).unwrap_or_default().to_owned();
        let request = msg.get("request").cloned().unwrap_or_default();
@@ -1462,13 +1322,9 @@ fn strings(v: Option<&Value>) -> Vec<String> {

 /// The title in a session's transcript (or that of the session it continues).
 fn chain_title(session: &Session) -> Option<String> {
-    history::title(&transcript_entries(session)?)
-}
-
-fn transcript_entries(session: &Session) -> Option<Vec<Value>> {
    let shim = session.shim()?;
    let path = shim.transcript(&session.cwd, &session.id).filter(|p| p.exists())?;
-    history::read(&path).ok()
+    history::title(&history::read(&path).ok()?)
 }

 fn start_json(start: &Start) -> Value {
@@ -1489,38 +1345,3 @@ fn start_from_json(v: &Value) -> Option<Start> {
    }
    Some(Start::Fork { from: s("fork")?, id: s("id")?, at: s("at") })
 }
-
-/// Writes `json` to a new file only this user can read (removed when the path is dropped).
-fn write_mcp_config(json: &str) -> std::io::Result<tempfile::TempPath> {
-    let mut file = tempfile::Builder::new().prefix("openidea-mcp-").suffix(".json").tempfile()?;
-    std::io::Write::write_all(&mut file, json.as_bytes())?;
-    Ok(file.into_temp_path())
-}
-
-/// ACP `mcpServers` as Claude Code's `--mcp-config` JSON (`None` when there are none).
-fn mcp_config(params: &Value) -> Option<String> {
-    let servers = params.get("mcpServers")?.as_array()?;
-    let pairs = |v: Option<&Value>| -> serde_json::Map<String, Value> {
-        v.and_then(Value::as_array)
-            .into_iter()
-            .flatten()
-            .filter_map(|p| Some((p.get("name")?.as_str()?.to_owned(), p.get("value")?.clone())))
-            .collect()
-    };
-    let mut out = serde_json::Map::new();
-    for server in servers {
-        let Some(name) = server.get("name").and_then(Value::as_str) else { continue };
-        let entry = match server.get("type").and_then(Value::as_str) {
-            Some(kind @ ("http" | "sse")) => {
-                json!({ "type": kind, "url": server.get("url"), "headers": pairs(server.get("headers")) })
-            }
-            _ => json!({
-                "command": server.get("command"),
-                "args": server.get("args").cloned().unwrap_or_else(|| json!([])),
-                "env": pairs(server.get("env")),
-            }),
-        };
-        out.insert(name.to_owned(), entry);
-    }
-    (!out.is_empty()).then(|| json!({ "mcpServers": out }).to_string())
-}
@@ -132,18 +132,19 @@ impl Settings {
                }).collect::<Vec<_>>(),
            }));
        }
-        if let Some(effort) = self.current_model().and_then(|m| effort_option(m, &self.effort)) {
-            out.push(effort);
+        let efforts = self.current_model().map(|m| m.efforts.as_slice()).unwrap_or_default();
+        if !efforts.is_empty() {
+            let mut values = vec![json!({ "value": "default", "name": "Default" })];
+            values.extend(efforts.iter().map(|e| json!({ "value": e, "name": capitalize(e) })));
+            let current = if efforts.contains(&self.effort) { self.effort.as_str() } else { "default" };
+            out.push(json!({
+                "id": EFFORT, "name": "Effort", "category": "thought_level", "type": "select",
+                "currentValue": current, "options": values,
+            }));
        }
        Value::Array(out)
    }

-    /// Each model's effort option by model value (`None`: it has no effort levels): what a new
-    /// task offers once that model is picked, before any session has run it.
-    pub fn efforts_by_model(&self) -> Vec<(String, Option<Value>)> {
-        self.models.iter().map(|m| (m.value.clone(), effort_option(m, &self.effort))).collect()
-    }
-
    pub fn valid(&self, option: &str, value: &str) -> bool {
        self.options()
            .as_array()
@@ -155,20 +156,6 @@ impl Settings {
    }
 }

-/// `model`'s effort option, with `effort` selected when the model offers it; `None` without efforts.
-fn effort_option(model: &Model, effort: &str) -> Option<Value> {
-    if model.efforts.is_empty() {
-        return None;
-    }
-    let mut values = vec![json!({ "value": "default", "name": "Default" })];
-    values.extend(model.efforts.iter().map(|e| json!({ "value": e, "name": capitalize(e) })));
-    let current = if model.efforts.iter().any(|e| e == effort) { effort } else { "default" };
-    Some(json!({
-        "id": EFFORT, "name": "Effort", "category": "thought_level", "type": "select",
-        "currentValue": current, "options": values,
-    }))
-}
-
 /// Slash commands as ACP `availableCommands`, without those that need Claude Code's terminal.
 pub(super) fn commands(list: Option<&Value>, terminal_only: &[String]) -> Vec<Value> {
    list.and_then(Value::as_array)
@@ -244,20 +231,4 @@ mod tests {
        let cmds = commands(init().get("commands"), &["doctor".into()]);
        assert_eq!(cmds, vec![json!({"name": "review", "description": "Review", "input": {"hint": "[pr]"}})]);
    }
-
-    #[test]
-    fn every_model_offers_its_own_efforts() {
-        let s = Settings::from_cli(&init(), &json!({"applied": {"model": "claude-sonnet-5-5", "effort": "high"}}));
-        let efforts = s.efforts_by_model();
-        let values = |model: &str| {
-            let (_, o) = efforts.iter().find(|(m, _)| m == model).unwrap();
-            let o = o.as_ref().unwrap();
-            let values: Vec<_> = o["options"].as_array().unwrap().iter().map(|v| v["value"].clone()).collect();
-            (values, o["currentValue"].clone())
-        };
-        assert_eq!(values("default"), (vec![json!("default"), json!("low"), json!("high")], json!("high")));
-        // The configured effort only where the model offers it.
-        assert_eq!(values("opus"), (vec![json!("default"), json!("low"), json!("max")], json!("default")));
-        assert!(efforts.contains(&("claude-haiku-4-5".into(), None)), "no effort option without levels");
-    }
 }
@@ -311,8 +311,6 @@ struct Replay {
    sent: Arc<Mutex<Vec<Vec<Value>>>>,
    launched: Mutex<Vec<Vec<String>>>,
    errors: Arc<Mutex<Vec<String>>>,
-    /// Each process's kill token.
-    kills: Mutex<Vec<CancellationToken>>,
 }

 impl Cli for Replay {
@@ -333,7 +331,6 @@ impl Cli for Replay {
        let (shim_in, cli_in) = tokio::io::duplex(1 << 20);
        let (mut cli_out, shim_out) = tokio::io::duplex(1 << 20);
        let kill = CancellationToken::new();
-        self.kills.lock().push(kill.clone());
        let (sent, errors, token) = (self.sent.clone(), self.errors.clone(), kill.clone());
        sent.lock().push(Vec::new());
        tokio::spawn(async move {
@@ -424,18 +421,14 @@ impl Replayed {
    }
 }

-fn replay_cli(processes: Vec<Vec<Frame>>) -> Arc<Replay> {
-    Arc::new(Replay {
+async fn replay(name: &str) -> Replayed {
+    let processes = load_fixture(name);
+    let cli = Arc::new(Replay {
        processes: Mutex::new(processes.into()),
        sent: Arc::default(),
        launched: Mutex::default(),
        errors: Arc::default(),
-        kills: Mutex::default(),
-    })
-}
-
-async fn replay(name: &str) -> Replayed {
-    let cli = replay_cli(load_fixture(name));
+    });
    let (config, cwd) = (tempfile::tempdir().unwrap(), tempfile::tempdir().unwrap());
    let cwd_path = std::fs::canonicalize(cwd.path()).unwrap();
    let h =
@@ -468,69 +461,6 @@ async fn replay_simple() {
    assert_eq!(user["message"]["content"][0]["text"], "Reply with exactly: hello there");
 }

-/// The app closing the connection (an idle task released, archived or deleted) stops the
-/// CLI processes of its sessions, idle ones included.
-#[tokio::test(flavor = "multi_thread")]
-async fn closing_the_connection_stops_the_processes() {
-    let r = replay("simple").await;
-    assert!(r.cli.kills.lock().iter().all(|k| !k.is_cancelled()));
-    r.h.client.kill();
-    let kills = r.cli.kills.lock().clone();
-    tokio::time::timeout(Duration::from_secs(5), async {
-        for k in kills {
-            k.cancelled().await;
-        }
-    })
-    .await
-    .expect("every process was stopped");
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn sessions_without_a_title_get_one_generated() {
-    let mut processes = load_fixture("simple");
-    processes[0].extend([
-        Frame::Shim(json!({"type": "control_request", "request_id": "req_3",
-            "request": {"subtype": "generate_session_title"}})),
-        Frame::Cli(json!({"type": "control_response",
-            "response": {"subtype": "success", "request_id": "req_3", "response": {"title": "Say hello"}}})),
-    ]);
-    let cli = replay_cli(processes);
-    let (config, cwd) = (tempfile::tempdir().unwrap(), tempfile::tempdir().unwrap());
-    let cwd_path = std::fs::canonicalize(cwd.path()).unwrap();
-    let h = Harness::connect(
-        cli.clone(),
-        config.path().into(),
-        config.path().join("pending"),
-        cwd_path.clone(),
-        Vec::new(),
-    )
-    .await;
-    let session = h.new_session().await;
-    // The transcript Claude Code writes, without the title it gives sessions in a terminal.
-    let dir = config.path().join("projects").join(history::escape(&cwd_path));
-    std::fs::create_dir_all(&dir).unwrap();
-    let prompt = json!({"type": "user", "uuid": "u1", "parentUuid": null,
-        "message": {"role": "user", "content": "Reply with exactly: hello there"}});
-    std::fs::write(dir.join(format!("{session}.jsonl")), format!("{prompt}\n")).unwrap();
-
-    h.prompt(&session, "Reply with exactly: hello there").await.unwrap();
-    let mut titles = Vec::new();
-    for _ in 0..100 {
-        titles = h.updates(&session, "session_info_update");
-        if !titles.is_empty() {
-            break;
-        }
-        tokio::time::sleep(Duration::from_millis(20)).await;
-    }
-    assert!(cli.errors.lock().is_empty(), "{:?}", cli.errors.lock());
-    assert_eq!(titles.iter().map(|t| t["title"].clone()).collect::<Vec<_>>(), [json!("Say hello")]);
-    let sent = cli.sent.lock()[0].clone();
-    let request =
-        sent.iter().find(|m| m.pointer("/request/subtype") == Some(&json!("generate_session_title"))).unwrap();
-    assert_eq!(request["request"]["description"], "Reply with exactly: hello there");
-    assert_eq!(request["request"]["persist"], true);
-}
-
 #[tokio::test(flavor = "multi_thread")]
 async fn replay_multi_turn() {
    let r = replay("multi_turn").await;
@@ -797,7 +727,6 @@ async fn a_stop_ahead_of_its_prompt_cancels_it() {
        sent: Arc::default(),
        launched: Mutex::default(),
        errors: Arc::default(),
-        kills: Mutex::default(),
    });
    let (dir, cwd) = (tempfile::tempdir().unwrap(), tempfile::tempdir().unwrap());
    let h = Harness::connect(cli.clone(), dir.path().into(), dir.path().join("p"), cwd.path().into(), Vec::new()).await;
@@ -841,7 +770,6 @@ async fn a_failed_turn_reports_its_failure() {
            sent: Arc::default(),
            launched: Mutex::default(),
            errors: Arc::default(),
-            kills: Mutex::default(),
        });
        let (dir, cwd) = (tempfile::tempdir().unwrap(), tempfile::tempdir().unwrap());
        let h =
@@ -1242,29 +1170,3 @@ async fn skipped_questions_have_no_answers() {
    let cancelled = ask_questions(&input, &json!({}), |_, _| async { None }).await;
    assert_eq!(cancelled, None);
 }
-
-#[test]
-fn mcp_servers_become_an_mcp_config() {
-    assert_eq!(mcp_config(&json!({ "mcpServers": [] })), None);
-    assert_eq!(mcp_config(&json!({})), None);
-    let config = mcp_config(&json!({ "mcpServers": [
-        { "type": "http", "name": "openidea", "url": "http://127.0.0.1:1/mcp",
-          "headers": [{ "name": "Authorization", "value": "Bearer t" }] },
-        { "name": "local", "command": "srv", "args": ["-x"], "env": [{ "name": "K", "value": "V" }] },
-    ] }))
-    .unwrap();
-    let v: Value = serde_json::from_str(&config).unwrap();
-    assert_eq!(
-        v["mcpServers"]["openidea"],
-        json!({ "type": "http", "url": "http://127.0.0.1:1/mcp", "headers": { "Authorization": "Bearer t" } })
-    );
-    assert_eq!(v["mcpServers"]["local"], json!({ "command": "srv", "args": ["-x"], "env": { "K": "V" } }));
-
-    let path = write_mcp_config(&config).unwrap();
-    assert_eq!(std::fs::read_to_string(&path).unwrap(), config);
-    #[cfg(unix)]
-    assert_eq!(std::os::unix::fs::PermissionsExt::mode(&std::fs::metadata(&path).unwrap().permissions()) & 0o077, 0);
-    let kept = path.to_path_buf();
-    drop(path);
-    assert!(!kept.exists());
-}
@@ -8,7 +8,6 @@ mod translate;
 mod tests;

 use super::Shim;
-use crate::acp::AUTH_REQUIRED;
 use crate::provider::ProviderSpec;
 use ide_jsonrpc::{Framing, Handler, Peer, RpcError, codes};
 use parking_lot::Mutex;
@@ -28,9 +27,8 @@ const OUTPUT_EVERY: Duration = Duration::from_millis(200);
 const EARLY_CANCEL: Duration = Duration::from_secs(1);
 /// How long the client's connection outlives codex.
 const EXIT_GRACE: Duration = Duration::from_millis(100);
-/// What a thread's name is asked for with, after its first turn.
-const NAME_PROMPT: &str = "Name this conversation for a list of tasks: a short title of at most six words, in the \
-    language the user writes in. Reply with the title only, without quotes or a closing period.";
+/// ACP's error code for a request that needs the user to sign in.
+const AUTH_REQUIRED: i64 = -32000;

 pub(crate) fn connect(
    spec: &ProviderSpec,
@@ -44,92 +42,6 @@ pub(crate) fn connect(
    })
 }

-/// A model lookup uses app-server directly: no thread, task, prompt or project MCP.
-pub(crate) async fn discover(
-    spec: ProviderSpec,
-    cwd: std::path::PathBuf,
-) -> Result<crate::catalogs::Discovered, String> {
-    let spec = tokio::task::spawn_blocking({
-        let cwd = cwd.clone();
-        move || spec.resolve_for_launch(&cwd)
-    })
-    .await
-    .map_err(|e| e.to_string())?;
-    let peer = Peer::spawn_framed(
-        &spec.command,
-        &spec.args,
-        &cwd,
-        &spec.env,
-        Arc::new(ide_jsonrpc::NoopHandler),
-        Box::new(|_| {}),
-        Framing::Lines,
-    )
-    .map_err(|e| e.to_string())?;
-    let _stop = crate::catalogs::KillPeer(peer.clone());
-    tokio::time::timeout(Duration::from_secs(30), async {
-        let _: Value = peer.request("initialize", initialize_params(), None).await.map_err(|e| e.to_string())?;
-        peer.notify("initialized", Value::Null).map_err(|e| e.to_string())?;
-        let mut models = list_models(&peer).await.map_err(|e| e.message)?;
-        models.retain(|model| !model.hidden);
-        let mut settings = Settings::of(&json!({}), &models);
-        if settings.model.is_empty()
-            && let Some(model) = models.first()
-        {
-            settings.model = model.id.clone();
-            settings.fit_effort(&models);
-        }
-        let options = translate::config_options(&models, &settings);
-        let config = crate::config::options_of(&json!({ "configOptions": options }));
-        let levels = models
-            .iter()
-            .map(|model| {
-                let mut settings = settings.clone();
-                settings.model = model.id.clone();
-                settings.fit_effort(&models);
-                let options = translate::config_options(&models, &settings);
-                let levels = crate::config::options_of(&json!({ "configOptions": options }))
-                    .into_iter()
-                    .filter(|o| o.category.as_deref() == Some("thought_level"))
-                    .collect();
-                (model.id.clone(), levels)
-            })
-            .collect();
-        Ok(crate::catalogs::Discovered { config, commands: None, levels })
-    })
-    .await
-    .map_err(|_| "Codex model discovery timed out".to_owned())?
-}
-
-fn initialize_params() -> Value {
-    json!({
-        "clientInfo": { "name": "openidea", "title": "OpenIDEA", "version": env!("CARGO_PKG_VERSION") },
-        "capabilities": { "experimentalApi": true, "optOutNotificationMethods": OPT_OUT },
-    })
-}
-
-async fn list_models(peer: &Peer) -> Result<Vec<ModelInfo>, ResponseError> {
-    let mut all = Vec::new();
-    let mut cursor = Value::Null;
-    let mut seen = HashSet::new();
-    loop {
-        let page: Value = peer.request("model/list", json!({ "cursor": cursor }), None).await.map_err(from_codex)?;
-        let Some(data) = page.get("data").and_then(Value::as_array) else {
-            return Err(error(codes::INTERNAL_ERROR, "Codex returned an invalid model list"));
-        };
-        let models = translate::models_of(&page);
-        if models.len() != data.len() {
-            return Err(error(codes::INTERNAL_ERROR, "Codex returned an invalid model list"));
-        }
-        all.extend(models);
-        match page.get("nextCursor") {
-            None | Some(Value::Null) => return Ok(all),
-            Some(Value::String(next)) if next.is_empty() => return Ok(all),
-            Some(Value::String(next)) if seen.insert(next.clone()) => cursor = json!(next),
-            _ => return Err(error(codes::INTERNAL_ERROR, "Codex returned an invalid model-list cursor")),
-        }
-    }
-}
-
 /// Connects `client` to a shim driving the codex connection `connect_codex` opens (it
 /// gets the handler for what codex sends). Each side's end closes the other.
 fn attach(
@@ -142,7 +54,6 @@ fn attach(
        client: OnceLock::new(),
        state: Mutex::new(State::default()),
        models: tokio::sync::Mutex::new(None),
-        skills: tokio::sync::Mutex::new(()),
    });
    let codex = connect_codex(Arc::new(CodexEvents(Arc::downgrade(&shim))))?;
    let _ = shim.codex.set(codex.clone());
@@ -172,8 +83,6 @@ struct CodexShim {
    state: Mutex<State>,
    /// `model/list`, fetched once.
    models: tokio::sync::Mutex<Option<Arc<Vec<ModelInfo>>>>,
-    /// Keep skill snapshots in request order, including invalidations during session setup.
-    skills: tokio::sync::Mutex<()>,
 }

 #[derive(Default)]
@@ -215,10 +124,6 @@ struct Thread {
    early_cancel: Option<Instant>,
    /// The latest agent message (a subagent's answer).
    answer: String,
-    /// The thread has a name.
-    named: bool,
-    /// A name is being asked for.
-    naming: bool,
 }

 struct PendingPrompt {
@@ -299,7 +204,7 @@ fn from_codex(e: RpcError) -> ResponseError {
                code,
                codes::PARSE_ERROR | codes::INVALID_REQUEST | codes::METHOD_NOT_FOUND | codes::INVALID_PARAMS
            );
-            let code = if !protocol && crate::acp::auth_required(code, &message) { AUTH_REQUIRED } else { code };
+            let code = if !protocol && message.to_lowercase().contains("auth") { AUTH_REQUIRED } else { code };
            ResponseError { code, message, data }
        }
        RpcError::Closed => error(codes::INTERNAL_ERROR, "Codex exited"),
@@ -336,7 +241,15 @@ impl CodexShim {
    }

    async fn initialize(&self) -> Result<Value, ResponseError> {
-        let info = self.call("initialize", initialize_params()).await?;
+        let info = self
+            .call(
+                "initialize",
+                json!({
+                    "clientInfo": { "name": "openidea", "title": "OpenIDEA", "version": env!("CARGO_PKG_VERSION") },
+                    "capabilities": { "experimentalApi": true, "optOutNotificationMethods": OPT_OUT },
+                }),
+            )
+            .await?;
        self.codex().notify("initialized", Value::Null).map_err(from_codex)?;
        self.state.lock().initialized = true;
        // `<client>/<codex version> (<platform>) …`
@@ -351,7 +264,7 @@ impl CodexShim {
            "agentCapabilities": {
                "loadSession": true,
                "promptCapabilities": { "image": true, "audio": false, "embeddedContext": true },
-                "mcpCapabilities": { "http": false, "sse": false, "stdio": true },
+                "mcpCapabilities": { "http": false, "sse": false },
                "sessionCapabilities": { "fork": {}, "close": {} },
                "_meta": { "openidea": { "rollback": true, "steer": true } },
            },
@@ -360,29 +273,32 @@ impl CodexShim {
        }))
    }

-    /// Cache only complete, successful listings; a failed page must never become availability.
-    async fn models(&self) -> Result<Arc<Vec<ModelInfo>>, ResponseError> {
+    /// The models codex offers; empty when it can't list them.
+    async fn models(&self) -> Arc<Vec<ModelInfo>> {
        let mut cached = self.models.lock().await;
-        if let Some(models) = cached.as_ref() {
-            return Ok(models.clone());
+        if let Some(m) = cached.as_ref() {
+            return m.clone();
        }
-        let models = Arc::new(list_models(self.codex()).await?);
+        let mut all = Vec::new();
+        let mut cursor = Value::Null;
+        loop {
+            match self.call("model/list", json!({ "cursor": cursor })).await {
+                Ok(page) => {
+                    all.extend(translate::models_of(&page));
+                    match page.get("nextCursor").filter(|c| c.is_string()) {
+                        Some(next) if *next != cursor => cursor = next.clone(),
+                        _ => break,
+                    }
+                }
+                Err(e) => {
+                    tracing::warn!("codex: listing models failed: {}", e.message);
+                    return Arc::new(all);
+                }
+            }
+        }
+        let models = Arc::new(all);
        *cached = Some(models.clone());
-        Ok(models)
-    }
-
-    async fn publish_skills(&self, session: &str) {
-        let _listing = self.skills.lock().await;
-        let cwd = self.state.lock().threads.get(session).and_then(|t| t.cwd.clone());
-        let Some(cwd) = cwd else { return };
-        let result =
-            tokio::time::timeout(Duration::from_secs(5), self.call("skills/list", json!({ "cwds": [cwd] }))).await;
-        if let Ok(Ok(result)) = result
-            && let Some(update) = translate::skill_commands(&result)
-            && self.state.lock().threads.contains_key(session)
-        {
-            self.emit(session, update);
-        }
+        models
    }

    /// Registers a thread codex opened for a session of its own; returns its `configOptions`.
@@ -397,52 +313,38 @@ impl CodexShim {
        t.parent = None;
        t.settings = Some(settings);
        t.cwd = cwd;
-        t.named = thread.get("name").and_then(Value::as_str).is_some_and(|n| !n.trim().is_empty());
        (id, options)
    }

    async fn new_session(&self, params: &Value) -> Result<Value, ResponseError> {
-        let models = self.models().await?;
-        let mut request = json!({ "cwd": params.get("cwd") });
-        if let Some(config) = translate::mcp_config(params) {
-            request["config"] = config;
-        }
-        let result = self.call("thread/start", request).await?;
+        let models = self.models().await;
+        let result = self.call("thread/start", json!({ "cwd": params.get("cwd") })).await?;
        let (id, options) = self.open_thread(&result, &models, None);
        if id.is_empty() {
            return Err(error(codes::INTERNAL_ERROR, "codex started no thread"));
        }
-        self.publish_skills(&id).await;
        Ok(json!({ "sessionId": id, "configOptions": options }))
    }

    /// Resumes the thread and replays its history before answering.
    async fn load_session(&self, params: &Value) -> Result<Value, ResponseError> {
        let id = str_param(params, "sessionId")?;
-        let models = self.models().await?;
-        let mut request = json!({ "threadId": id, "cwd": params.get("cwd") });
-        if let Some(config) = translate::mcp_config(params) {
-            request["config"] = config;
-        }
-        let result = self.call("thread/resume", request).await?;
+        let models = self.models().await;
+        let result = self.call("thread/resume", json!({ "threadId": id, "cwd": params.get("cwd") })).await?;
        let (_, options) = self.open_thread(&result, &models, None);
        let cwd = self.state.lock().threads.get(id).and_then(|t| t.cwd.clone());
        let thread = result.get("thread").unwrap_or(&Value::Null);
        for update in translate::history(thread, cwd.as_deref()) {
            self.emit(id, update);
        }
-        self.publish_skills(id).await;
        Ok(json!({ "configOptions": options }))
    }

    async fn fork_session(&self, params: &Value) -> Result<Value, ResponseError> {
        let source = str_param(params, "sessionId")?;
-        let models = self.models().await?;
+        let models = self.models().await;
        let settings = self.state.lock().threads.get(source).and_then(|t| t.settings.clone());
        let mut request = json!({ "threadId": source, "cwd": params.get("cwd") });
-        if let Some(config) = translate::mcp_config(params) {
-            request["config"] = config;
-        }
        if let Some(s) = &settings {
            request["model"] = json!(s.model_slug(&models));
            request["approvalPolicy"] = json!(s.mode.approval_policy());
@@ -450,7 +352,6 @@ impl CodexShim {
        }
        let result = self.call("thread/fork", request).await?;
        let (id, options) = self.open_thread(&result, &models, settings);
-        self.publish_skills(&id).await;
        Ok(json!({ "sessionId": id, "configOptions": options }))
    }

@@ -458,7 +359,7 @@ impl CodexShim {
        let session = str_param(params, "sessionId")?;
        let option = str_param(params, "configId")?;
        let value = str_param(params, "value")?;
-        let models = self.models().await?;
+        let models = self.models().await;
        let mut state = self.state.lock();
        let settings = state
            .threads
@@ -475,7 +376,7 @@ impl CodexShim {
        if input.is_empty() {
            return Err(invalid("empty prompt"));
        }
-        let models = self.models().await?;
+        let models = self.models().await;
        let (done, ended) = oneshot::channel();
        let settings = {
            let mut state = self.state.lock();
@@ -640,25 +541,9 @@ impl CodexShim {
        }
    }

-    fn on_codex_notification(self: &Arc<Self>, method: &str, params: &Value) {
+    fn on_codex_notification(&self, method: &str, params: &Value) {
        let thread = params.get("threadId").and_then(Value::as_str).unwrap_or_default();
        match method {
-            "skills/changed" => {
-                let shim = self.clone();
-                let sessions: Vec<String> = self
-                    .state
-                    .lock()
-                    .threads
-                    .iter()
-                    .filter(|(_, t)| t.settings.is_some() && t.parent.is_none())
-                    .map(|(id, _)| id.clone())
-                    .collect();
-                self.runtime.spawn(async move {
-                    for session in sessions {
-                        shim.publish_skills(&session).await;
-                    }
-                });
-            }
            "turn/started" => {
                if let Some(turn) = params.pointer("/turn/id").and_then(Value::as_str) {
                    self.turn_known(thread, turn, true);
@@ -694,9 +579,8 @@ impl CodexShim {
                Some(translate::plan(params))
            }),
            "thread/tokenUsage/updated" => self.with_thread(thread, |_, _| translate::usage(params)),
-            "thread/name/updated" => self.with_thread(thread, |t, _| {
+            "thread/name/updated" => self.with_thread(thread, |_, _| {
                let title = params.get("threadName").and_then(Value::as_str)?;
-                t.named = true;
                Some(json!({ "sessionUpdate": "session_info_update", "title": title }))
            }),
            "thread/started" => self.thread_started(params.get("thread").unwrap_or(&Value::Null)),
@@ -882,10 +766,9 @@ impl CodexShim {
        }
    }

-    fn turn_completed(self: &Arc<Self>, thread: &str, turn: &Value) {
+    fn turn_completed(&self, thread: &str, turn: &Value) {
        let id = turn.get("id").and_then(Value::as_str).unwrap_or_default();
-        let completed = turn.get("status").and_then(Value::as_str) == Some("completed");
-        let (parent, answer, name) = {
+        let (parent, answer) = {
            let mut state = self.state.lock();
            let Some(t) = state.threads.get_mut(thread) else { return };
            if t.turn.as_deref().is_none_or(|r| r == id) {
@@ -901,15 +784,8 @@ impl CodexShim {
                let _ = p.done.send((turn.clone(), error.clone()));
            }
            let answer = std::mem::take(&mut t.answer);
-            let name =
-                completed && !id.is_empty() && t.parent.is_none() && t.settings.is_some() && !t.named && !t.naming;
-            t.naming |= name;
-            (t.parent.clone(), (answer, error), name)
+            (t.parent.clone(), (answer, error))
        };
-        if name {
-            let (shim, thread, turn) = (self.clone(), thread.to_owned(), id.to_owned());
-            self.runtime.spawn(async move { shim.name_thread(&thread, &turn).await });
-        }
        let Some(parent) = parent else { return };
        let (answer, error) = answer;
        let mut state_of = match turn.get("status").and_then(Value::as_str) {
@@ -931,28 +807,6 @@ impl CodexShim {
        }
    }

-    /// Names a thread from what it holds after `turn`, as codex leaves naming to its
-    /// clients; `thread/name/updated` brings the name back. Unnamed, the next turn tries again.
-    async fn name_thread(&self, thread: &str, turn: &str) {
-        let sample = json!({ "threadId": thread, "expectedTurnId": turn, "prompt": NAME_PROMPT, "effort": "low" });
-        let named = match self.call("thread/sample", sample).await {
-            Ok(r) => match r.get("text").and_then(Value::as_str).and_then(translate::thread_name) {
-                Some(name) => {
-                    self.call("thread/name/set", json!({ "threadId": thread, "name": name })).await.map(|_| ())
-                }
-                None => Err(error(codes::INTERNAL_ERROR, "codex gave no name")),
-            },
-            Err(e) => Err(e),
-        };
-        if let Err(e) = &named {
-            tracing::debug!("naming codex thread {thread}: {}", e.message);
-        }
-        if let Some(t) = self.state.lock().threads.get_mut(thread) {
-            t.naming = false;
-            t.named |= named.is_ok();
-        }
-    }
-
    /// Requests from codex: approvals and questions, asked as ACP permission requests.
    fn on_codex_request(&self, method: &str, params: &Value) -> Result<Value, (i64, String)> {
        let thread = params.get("threadId").and_then(Value::as_str).unwrap_or_default().to_owned();
@@ -968,15 +822,14 @@ impl CodexShim {
        match method {
            "item/commandExecution/requestApproval" => {
                let choices = translate::decisions(params, true);
-                let title = translate::command_approval_title(params, item.as_ref());
-                let mut input = json!({
-                    "command": translate::approval_command(params, item.as_ref()),
-                    "cwd": params.get("cwd"),
-                });
-                if let Some(network) = params.get("networkApprovalContext").filter(|c| !c.is_null()) {
-                    input["networkApprovalContext"] = network.clone();
-                }
-                let call = tool_call_of(&item_id, &title, "execute", reason, Some(input));
+                let title = translate::command_approval_title(params, item.as_ref(), cwd);
+                let call = tool_call_of(
+                    &item_id,
+                    &title,
+                    "execute",
+                    reason,
+                    Some(json!({ "command": params.get("command"), "cwd": params.get("cwd") })),
+                );
                Ok(self.ask(&thread, call, &choices, decline))
            }
            "item/fileChange/requestApproval" => {
@@ -1018,55 +871,31 @@ impl CodexShim {
                Ok(self.ask(&thread, call, &choices, json!({ "permissions": {}, "scope": "turn" })))
            }
            "item/tool/requestUserInput" => {
-                let questions = params.get("questions").and_then(Value::as_array).cloned().unwrap_or_default();
-                // One permission request carrying all the questions, so the client shows
-                // them as a card (as it does for Claude's `AskUserQuestion`).
-                let asked: Vec<Value> = questions
-                    .iter()
-                    .filter_map(|q| {
-                        let id = q.get("id").and_then(Value::as_str)?;
-                        let question = q.get("question").and_then(Value::as_str)?;
-                        let options: Vec<Value> = q
-                            .get("options")
-                            .and_then(Value::as_array)
-                            .into_iter()
-                            .flatten()
-                            .filter_map(|o| {
-                                let label = o.get("label").and_then(Value::as_str)?;
-                                Some(json!({
-                                    "label": label,
-                                    "description": o.get("description").and_then(Value::as_str).unwrap_or_default(),
-                                }))
-                            })
-                            .collect();
-                        Some(json!({
-                            "answerKey": id,
-                            "header": q.get("header").and_then(Value::as_str).unwrap_or_default(),
-                            "question": question,
-                            "multiSelect": q.get("multiSelect").and_then(Value::as_bool).unwrap_or(false),
-                            "options": options,
-                        }))
-                    })
-                    .collect();
-                if asked.is_empty() {
-                    return Ok(json!({ "answers": {} }));
-                }
-                let title = asked[0].get("question").and_then(Value::as_str).unwrap_or("Codex has a question");
-                let mut call = tool_call_of(&item_id, title, "other", None, None);
-                call["_meta"] = json!({ "questions": asked });
-                let options = [json!({ "optionId": "submit", "name": "Submit", "kind": "allow_once" })];
-                let picked: serde_json::Map<String, Value> = self
-                    .ask_option(&thread, call, &options)
-                    .and_then(|reply| serde_json::from_str(&reply).ok())
-                    .unwrap_or_default();
                let mut answers = serde_json::Map::new();
-                for q in &questions {
+                for q in params.get("questions").and_then(Value::as_array).into_iter().flatten() {
                    let Some(qid) = q.get("id").and_then(Value::as_str) else { continue };
-                    if let Some(labels) = picked
-                        .get(qid)
-                        .filter(|labels| labels.as_array().is_some_and(|labels| labels.iter().all(Value::is_string)))
-                    {
-                        answers.insert(qid.to_owned(), json!({ "answers": labels }));
+                    let choices: Vec<Choice> = q
+                        .get("options")
+                        .and_then(Value::as_array)
+                        .into_iter()
+                        .flatten()
+                        .enumerate()
+                        .filter_map(|(i, o)| {
+                            let label = o.get("label")?.as_str()?;
+                            Some(Choice {
+                                option: json!({ "optionId": i.to_string(), "name": label, "kind": "allow_once" }),
+                                answer: json!({ "answers": [label] }),
+                            })
+                        })
+                        .collect();
+                    if choices.is_empty() {
+                        continue;
+                    }
+                    let title = q.get("question").and_then(Value::as_str).unwrap_or("Codex has a question");
+                    let call = tool_call_of(&item_id, title, "other", None, None);
+                    let answer = self.ask(&thread, call, &choices, Value::Null);
+                    if !answer.is_null() {
+                        answers.insert(qid.to_owned(), answer);
                    }
                }
                Ok(json!({ "answers": answers }))
@@ -1099,25 +928,6 @@ impl CodexShim {
        }
    }

-    /// Asks the client; returns the selected option id (`None` when cancelled).
-    fn ask_option(&self, session: &str, tool_call: Value, options: &[Value]) -> Option<String> {
-        let client = self.client.get().cloned()?;
-        let params = json!({ "sessionId": session, "toolCall": tool_call, "options": options });
-        let outcome: Result<Value, RpcError> =
-            self.runtime.block_on(client.request("session/request_permission", params, None));
-        match outcome {
-            Ok(outcome) => outcome
-                .pointer("/outcome/outcome")
-                .and_then(Value::as_str)
-                .filter(|outcome| *outcome == "selected")
-                .and_then(|_| outcome.pointer("/outcome/optionId").and_then(Value::as_str).map(str::to_owned)),
-            Err(e) => {
-                tracing::debug!("codex: question request failed: {e}");
-                None
-            }
-        }
-    }
-
    /// Asks the client; returns the answer for codex (`otherwise` when cancelled).
    fn ask(&self, session: &str, tool_call: Value, choices: &[Choice], otherwise: Value) -> Value {
        let Some(client) = self.client.get().cloned() else { return otherwise };
@@ -11,155 +11,6 @@ use std::collections::VecDeque;
 use std::path::PathBuf;
 use tokio::io::{AsyncBufReadExt, AsyncRead, AsyncWrite, AsyncWriteExt, BufReader};

-struct ModelPages {
-    pages: Mutex<VecDeque<Result<Value, (i64, String)>>>,
-    cursors: Mutex<Vec<Value>>,
-}
-
-impl Handler for ModelPages {
-    fn on_notification(&self, _: &str, _: Value) {}
-
-    fn on_request(&self, method: &str, params: Value) -> Result<Value, (i64, String)> {
-        assert_eq!(method, "model/list", "listing models must never start a thread or turn");
-        self.cursors.lock().push(params["cursor"].clone());
-        self.pages.lock().pop_front().expect("another expected page")
-    }
-}
-
-fn model_peer(pages: Arc<ModelPages>) -> (Peer, Peer) {
-    let (ours, theirs) = tokio::io::duplex(1 << 16);
-    let (read, write) = tokio::io::split(theirs);
-    let server = Peer::connect_framed(read, write, pages, Framing::Lines);
-    let (read, write) = tokio::io::split(ours);
-    (Peer::connect_framed(read, write, Arc::new(ide_jsonrpc::NoopHandler), Framing::Lines), server)
-}
-
-#[tokio::test]
-async fn model_pagination_failure_does_not_cache_an_incomplete_catalog() {
-    let first = json!({ "data": [{ "id": "first" }], "nextCursor": "next" });
-    let pages = Arc::new(ModelPages {
-        pages: Mutex::new(VecDeque::from([
-            Ok(first.clone()),
-            Err((-32000, "authentication expired".into())),
-            Ok(first),
-            Ok(json!({ "data": [{ "id": "second" }], "nextCursor": null })),
-        ])),
-        cursors: Mutex::default(),
-    });
-    let (peer, server) = model_peer(pages.clone());
-    let shim = CodexShim {
-        runtime: tokio::runtime::Handle::current(),
-        codex: OnceLock::from(peer.clone()),
-        client: OnceLock::new(),
-        state: Mutex::default(),
-        models: tokio::sync::Mutex::new(None),
-        skills: tokio::sync::Mutex::new(()),
-    };
-    assert_eq!(shim.models().await.unwrap_err().message, "authentication expired");
-    let models = shim.models().await.unwrap();
-    assert_eq!(models.iter().map(|m| m.id.as_str()).collect::<Vec<_>>(), ["first", "second"]);
-    assert_eq!(shim.models().await.unwrap().len(), 2);
-    assert_eq!(*pages.cursors.lock(), [Value::Null, json!("next"), Value::Null, json!("next")]);
-    peer.kill();
-    server.kill();
-}
-
-#[tokio::test]
-async fn repeated_or_invalid_model_cursors_and_malformed_pages_are_failures() {
-    for pages in [
-        vec![json!({ "data": [], "nextCursor": "a" }), json!({ "data": [], "nextCursor": "a" })],
-        vec![
-            json!({ "data": [], "nextCursor": "a" }),
-            json!({ "data": [], "nextCursor": "b" }),
-            json!({ "data": [], "nextCursor": "a" }),
-        ],
-        vec![json!({ "data": [], "nextCursor": 7 })],
-        vec![json!({ "nextCursor": null })],
-        vec![json!({ "data": [{}], "nextCursor": null })],
-    ] {
-        let pages =
-            Arc::new(ModelPages { pages: Mutex::new(pages.into_iter().map(Ok).collect()), cursors: Mutex::default() });
-        let (peer, server) = model_peer(pages);
-        assert!(list_models(&peer).await.is_err());
-        peer.kill();
-        server.kill();
-    }
-}
-
-#[cfg(unix)]
-#[tokio::test(flavor = "multi_thread")]
-async fn native_discovery_only_initializes_and_pages_models_then_stops_the_process() {
-    use std::os::unix::fs::PermissionsExt;
-    let tmp = tempfile::tempdir().unwrap();
-    let script = tmp.path().join("fake-codex");
-    std::fs::write(
-        &script,
-        r#"#!/usr/bin/env python3
-import json, os, pathlib, sys
-pathlib.Path('pid').write_text(str(os.getpid()))
-for line in sys.stdin:
-    request = json.loads(line)
-    with pathlib.Path('requests').open('a') as f:
-        f.write(json.dumps(request) + '\n')
-    method = request['method']
-    if method == 'initialized':
-        continue
-    if method == 'initialize':
-        result = {}
-    elif method == 'model/list':
-        cursor = request['params']['cursor']
-        model = 'one' if cursor is None else 'two'
-        result = {'data': [{'id': model, 'isDefault': cursor is None,
-            'defaultReasoningEffort': 'low', 'supportedReasoningEfforts': [{'reasoningEffort': 'low'}]}],
-            'nextCursor': 'second-page' if cursor is None else None}
-    else:
-        raise RuntimeError('must not create a thread or prompt: ' + method)
-    print(json.dumps({'jsonrpc': '2.0', 'id': request['id'], 'result': result}), flush=True)
-"#,
-    )
-    .unwrap();
-    std::fs::set_permissions(&script, std::fs::Permissions::from_mode(0o755)).unwrap();
-    let spec = ProviderSpec {
-        id: "codex".into(),
-        name: "Codex".into(),
-        driver: crate::provider::Driver::Codex,
-        command: script.to_string_lossy().into_owned(),
-        args: Vec::new(),
-        env: Vec::new(),
-        login_hint: String::new(),
-        source: crate::AgentSource::Builtin,
-    };
-    let found = discover(spec, tmp.path().to_path_buf()).await.unwrap();
-    let models: Vec<_> = found
-        .config
-        .iter()
-        .filter(|o| o.category.as_deref() == Some("model"))
-        .flat_map(|o| o.values.iter().map(|v| v.value.as_str()))
-        .collect();
-    assert_eq!(models, ["one", "two"]);
-    assert_eq!(found.levels.keys().map(String::as_str).collect::<Vec<_>>(), ["one", "two"]);
-    let requests = std::fs::read_to_string(tmp.path().join("requests")).unwrap();
-    let requests: Vec<Value> = requests.lines().map(|line| serde_json::from_str(line).unwrap()).collect();
-    assert_eq!(
-        requests.iter().map(|r| r["method"].as_str().unwrap()).collect::<Vec<_>>(),
-        ["initialize", "initialized", "model/list", "model/list"]
-    );
-    assert_eq!(requests[2]["params"]["cursor"], Value::Null);
-    assert_eq!(requests[3]["params"]["cursor"], "second-page");
-    let pid = std::fs::read_to_string(tmp.path().join("pid")).unwrap();
-    tokio::time::timeout(Duration::from_secs(5), async {
-        loop {
-            let alive = std::process::Command::new("kill").args(["-0", pid.trim()]).output().unwrap().status.success();
-            if !alive {
-                break;
-            }
-            tokio::time::sleep(Duration::from_millis(10)).await;
-        }
-    })
-    .await
-    .expect("discovery must kill and reap its child");
-}
-
 // ---- Pure translations -------------------------------------------------------------

 fn models() -> Vec<ModelInfo> {
@@ -396,39 +247,13 @@ fn approvals_offer_what_codex_offers_and_always_a_decline() {
    assert_eq!(
        command_approval_title(
            &json!({"command": "/bin/zsh -lc 'ls'", "commandActions": [{"type": "unknown", "command": "touch b"}]}),
+            None,
            None
        ),
-        "Run ls"
+        "Run touch b"
    );
 }

-#[test]
-fn approval_title_shows_the_script_inside_a_shell_wrapper() {
-    let title = |command: &str| command_approval_title(&json!({ "command": command }), None);
-    assert_eq!(
-        title(r#"/bin/zsh -lc "python3 -c 'import pathlib\np = pathlib.Path(\"a.txt\")'""#),
-        "Run python3 -c 'import pathlib\\np = pathlib.Path(\"a.txt\")'"
-    );
-    assert_eq!(title(r#"bash -lc 'echo '\''hi'\'''"#), "Run echo 'hi'");
-    assert_eq!(title("/bin/zsh -lc ls"), "Run /bin/zsh -lc ls");
-    assert_eq!(title("/bin/zsh -lc 'ls' && rm x"), "Run /bin/zsh -lc 'ls' && rm x");
-    assert_eq!(title("python3 -c 'print(1)'"), "Run python3 -c 'print(1)'");
-}
-
-#[test]
-fn approval_command_uses_its_request_and_matching_item_only() {
-    let command = "python3 -c 'import pathlib\np = pathlib.Path(\"note.txt\")\np.write_text(\"hi\\n\")'";
-    let pending_read = json!({"id": "read", "type": "commandExecution", "command": "ls",
-        "commandActions": [{"type": "listFiles", "path": "."}]});
-    let request = json!({"itemId": "write", "command": command});
-    assert_eq!(command_approval_title(&request, Some(&pending_read)), format!("Run {command}"));
-    let item = json!({"id": "write", "command": command});
-    let request = json!({"itemId": "write"});
-    assert_eq!(command_approval_title(&request, Some(&item)), format!("Run {command}"));
-    assert_eq!(command_approval_title(&request, Some(&pending_read)), "Run a command");
-    assert_eq!(command_approval_title(&request, None), "Run a command");
-}
-
 #[test]
 fn history_replays_turns() {
    let thread = json!({"turns": [{"id": "t", "status": "completed", "items": [
@@ -491,39 +316,6 @@ impl Client {
    }
 }

-#[tokio::test(flavor = "multi_thread")]
-async fn questions_share_one_card_and_keep_their_ids() {
-    let client = Arc::new(Client::default());
-    client.answers.lock().extend([Some(r#"{"first":["One"],"second":["Two","Custom"]}"#), None, Some("invalid")]);
-    let (ours, theirs) = tokio::io::duplex(1 << 16);
-    let (read, write) = tokio::io::split(theirs);
-    let codex = Peer::connect_framed(read, write, Arc::new(ide_jsonrpc::NoopHandler), Framing::Lines);
-    let acp = attach(client.clone(), |events| {
-        let (read, write) = tokio::io::split(ours);
-        Ok(Peer::connect_framed(read, write, events, Framing::Lines))
-    })
-    .unwrap();
-    let params = json!({"threadId": "s", "itemId": "q", "questions": [
-        {"id": "first", "question": "Which?", "options": [{"label": "One", "description": "First"}]},
-        {"id": "second", "question": "Which?", "multiSelect": true, "options": [{"label": "Two"}]}
-    ]});
-    for expected in
-        [json!({"first": {"answers": ["One"]}, "second": {"answers": ["Two", "Custom"]}}), json!({}), json!({})]
-    {
-        let reply: Value = codex.request("item/tool/requestUserInput", params.clone(), None).await.unwrap();
-        assert_eq!(reply, json!({"answers": expected}));
-    }
-    let asked = client.asked.lock();
-    assert_eq!(asked.len(), 3);
-    let questions = &asked[0]["toolCall"]["_meta"]["questions"];
-    assert_eq!(questions.as_array().unwrap().len(), 2);
-    assert_eq!(questions[0]["answerKey"], "first");
-    assert_eq!(questions[1]["answerKey"], "second");
-    assert_eq!(questions[0]["options"][0]["description"], "First");
-    acp.kill();
-    codex.kill();
-}
-
 #[derive(Clone, Copy, Debug, PartialEq)]
 enum Scenario {
    AuthFailure,
@@ -677,23 +469,12 @@ async fn play<R: AsyncRead + Unpin, W: AsyncWrite + Unpin>(
    let mut sent = Vec::new();
    for (out, frame) in &t.frames {
        if *out {
-            let actual: Value = loop {
-                let line = tokio::time::timeout(Duration::from_secs(10), lines.next_line())
-                    .await
-                    .unwrap_or_else(|_| panic!("the shim didn't send {frame}"))
-                    .unwrap()
-                    .unwrap_or_else(|| panic!("the shim closed before {frame}"));
-                let actual: Value = serde_json::from_str(&line).unwrap();
-                // Older recordings predate skill discovery and thread naming; play an
-                // unsupported server.
-                let method = actual["method"].as_str().unwrap_or_default();
-                if matches!(method, "skills/list" | "thread/sample") && frame["method"] != method {
-                    let reply = json!({ "id": actual["id"], "error": { "code": -32601, "message": "unsupported" } });
-                    write.write_all(format!("{reply}\n").as_bytes()).await.unwrap();
-                    continue;
-                }
-                break actual;
-            };
+            let line = tokio::time::timeout(Duration::from_secs(10), lines.next_line())
+                .await
+                .unwrap_or_else(|_| panic!("the shim didn't send {frame}"))
+                .unwrap()
+                .unwrap_or_else(|| panic!("the shim closed before {frame}"));
+            let actual: Value = serde_json::from_str(&line).unwrap();
            match frame.get("method") {
                Some(method) => {
                    assert_eq!(actual.get("method"), Some(method), "expected {frame}, got {actual}");
@@ -725,14 +506,7 @@ async fn play<R: AsyncRead + Unpin, W: AsyncWrite + Unpin>(
 /// Runs `scenario` against its transcript; returns the ACP results, the client and
 /// the frames the shim sent.
 async fn replay(scenario: Scenario) -> (Results, Arc<Client>, Vec<Value>, Value) {
-    let (results, client, sent, meta, _codex) = replay_transcript(scenario, load(scenario.file())).await;
-    (results, client, sent, meta)
-}
-
-/// Both connections of a replay, which stay open while it is held.
-type CodexEnd = Box<dyn std::any::Any>;
-
-async fn replay_transcript(scenario: Scenario, t: Transcript) -> (Results, Arc<Client>, Vec<Value>, Value, CodexEnd) {
+    let t = load(scenario.file());
    let (ours, theirs) = tokio::io::duplex(1 << 20);
    let (tr, tw) = tokio::io::split(theirs);
    let client = Arc::new(Client::default());
@@ -748,8 +522,8 @@ async fn replay_transcript(scenario: Scenario, t: Transcript) -> (Results, Arc<C
        .await
        .expect("the scenario finished");
    // Codex stays up until the scenario is over.
-    let (sent, read, write) = player.await.unwrap();
-    (results, client, sent, meta, Box::new((acp, read, write)))
+    let (sent, _read, _write) = player.await.unwrap();
+    (results, client, sent, meta)
 }

 fn sent<'a>(frames: &'a [Value], method: &str) -> Vec<&'a Value> {
@@ -790,23 +564,6 @@ async fn auth_failure_names_auth() {
    assert!(start.get("jsonrpc").is_some(), "codex accepts the jsonrpc field");
 }

-#[test]
-fn request_errors_classify_authentication_without_matching_author_or_protocol_errors() {
-    for (code, message, expected) in [
-        (codes::INTERNAL_ERROR, "Missing author field", codes::INTERNAL_ERROR),
-        (codes::INTERNAL_ERROR, "Unknown authority", codes::INTERNAL_ERROR),
-        (codes::INTERNAL_ERROR, "Authentication failed: expired token", AUTH_REQUIRED),
-        (codes::INTERNAL_ERROR, "Unauthorized", AUTH_REQUIRED),
-        (codes::METHOD_NOT_FOUND, "authentication method not found", codes::METHOD_NOT_FOUND),
-        (AUTH_REQUIRED, "Account is not eligible", AUTH_REQUIRED),
-    ] {
-        let response = from_codex(RpcError::Server { code, message: message.into(), data: Some(json!({"detail": 1})) });
-        assert_eq!(response.code, expected, "{message}");
-        assert_eq!(response.message, message);
-        assert_eq!(response.data, Some(json!({"detail": 1})));
-    }
-}
-
 #[tokio::test(flavor = "multi_thread")]
 async fn a_stop_sent_right_after_the_prompt_interrupts_the_turn() {
    let (results, _client, frames, _) = replay(Scenario::Interrupt).await;
@@ -959,42 +716,6 @@ async fn a_simple_turn_streams_reasoning_text_and_usage() {
    assert_eq!(info["title"], "Say hi");
 }

-#[tokio::test(flavor = "multi_thread")]
-async fn an_unnamed_thread_is_named_after_its_first_turn() {
-    let mut t = load(Scenario::Simple.file());
-    t.frames.retain(|(_, f)| f["method"] != "thread/name/updated");
-    let thread = "01a18300-0000-7000-8000-000000000001";
-    t.frames.extend([
-        (true, json!({"id": 90, "method": "thread/sample"})),
-        (false, json!({"id": 90, "result": {"responseId": "r", "sourceTurnId": thread, "text": "\"Say hi.\"\n"}})),
-        (true, json!({"id": 91, "method": "thread/name/set"})),
-        (false, json!({"id": 91, "result": {}})),
-        (false, json!({"method": "thread/name/updated", "params": {"threadId": thread, "threadName": "Say hi"}})),
-    ]);
-    let (results, client, frames, _, _codex) = replay_transcript(Scenario::Simple, t).await;
-    let session = session_of(&results, "new");
-    let sample = &sent(&frames, "thread/sample")[0]["params"];
-    assert_eq!((sample["threadId"].as_str(), sample["expectedTurnId"].as_str()), (Some(thread), Some(thread)));
-    assert_eq!(sent(&frames, "thread/name/set")[0]["params"], json!({"threadId": thread, "name": "Say hi"}));
-    let mut info = Vec::new();
-    for _ in 0..100 {
-        info = client.of(&session).into_iter().filter(|u| u["sessionUpdate"] == "session_info_update").collect();
-        if !info.is_empty() {
-            break;
-        }
-        tokio::time::sleep(Duration::from_millis(20)).await;
-    }
-    assert_eq!(info.iter().map(|u| u["title"].clone()).collect::<Vec<_>>(), [json!("Say hi")]);
-}
-
-#[test]
-fn thread_names_are_the_first_line_of_the_reply() {
-    assert_eq!(thread_name("  \n“修复登录表单。”\nmore").as_deref(), Some("修复登录表单"));
-    assert_eq!(thread_name("**Fix the login form.**").as_deref(), Some("Fix the login form"));
-    assert_eq!(thread_name(" \n\"\" "), None);
-    assert_eq!(thread_name(&"x".repeat(100)).map(|n| n.chars().count()), Some(80));
-}
-
 #[tokio::test(flavor = "multi_thread")]
 async fn settings_apply_to_the_next_turn() {
    let (results, client, frames, _) = replay(Scenario::MultiTurn).await;
@@ -1247,129 +968,3 @@ fn v_method(line: &str) -> Option<&str> {
    let at = line.find("\"method\":\"")? + 10;
    line[at..].split('"').next()
 }
-
-#[test]
-fn session_mcp_servers_become_thread_configuration() {
-    assert!(mcp_config(&json!({"mcpServers":[]})).is_none());
-    assert_eq!(
-        mcp_config(&json!({"mcpServers":[{"name":"OpenIDEA","command":"/app/openidea",
-        "args":["--mcp-stdio","--project","/project"],"env":[{"name":"K","value":"V"}]}]})),
-        Some(
-            json!({"mcp_servers":{"OpenIDEA":{"command":"/app/openidea","args":["--mcp-stdio","--project","/project"],"env":{"K":"V"}}}})
-        )
-    );
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn skills_are_listed_for_sessions_and_refreshed_on_change() {
-    for (method, native) in
-        [("session/new", "thread/start"), ("session/load", "thread/resume"), ("session/fork", "thread/fork")]
-    {
-        for initial in [
-            json!({"result": {"data": [{"cwd": "/work", "errors": [], "skills": [
-                {"name": "review", "enabled": true, "description": "Review", "path": "/work/SKILL.md", "scope": "repo"}
-            ]}]}}),
-            json!({"error": {"code": -32601, "message": "unsupported"}}),
-            json!({"result": {}}),
-        ] {
-            let listed = initial.pointer("/result/data").is_some();
-            let mut initial = initial;
-            initial["id"] = json!(4);
-            let transcript = Transcript {
-                meta: Value::Null,
-                frames: vec![
-                    (true, json!({"id": 1, "method": "initialize"})),
-                    (false, json!({"id": 1, "result": {}})),
-                    (true, json!({"method": "initialized"})),
-                    (true, json!({"id": 2, "method": "model/list"})),
-                    (false, json!({"id": 2, "result": {"data": []}})),
-                    (true, json!({"id": 3, "method": native})),
-                    (
-                        false,
-                        json!({"id": 3, "result": {"thread": {"id": "s", "cwd": "/work", "turns": []}, "cwd": "/work"}}),
-                    ),
-                    (true, json!({"id": 4, "method": "skills/list"})),
-                    (false, initial),
-                    (true, json!({"id": 5, "method": "turn/start"})),
-                    (false, json!({"id": 5, "error": {"code": -32602, "message": "no model in this test"}})),
-                    (false, json!({"method": "skills/changed", "params": {}})),
-                    (true, json!({"id": 6, "method": "skills/list"})),
-                    (false, json!({"id": 6, "result": {"data": [{"cwd": "/work", "skills": [], "errors": []}]}})),
-                    (false, json!({"method": "skills/changed", "params": {}})),
-                    (true, json!({"id": 7, "method": "skills/list"})),
-                    (false, json!({"id": 7, "error": {"code": -32603, "message": "listing failed"}})),
-                    (false, json!({"method": "skills/changed", "params": {}})),
-                    (true, json!({"id": 8, "method": "skills/list"})),
-                    (false, json!({"id": 8, "result": {"data": []}})),
-                ],
-            };
-            let (ours, theirs) = tokio::io::duplex(1 << 16);
-            let client = Arc::new(Client::default());
-            let acp = attach(client.clone(), |events| {
-                let (read, write) = tokio::io::split(ours);
-                Ok(Peer::connect_framed(read, write, events, Framing::Lines))
-            })
-            .unwrap();
-            let (read, write) = tokio::io::split(theirs);
-            let player = tokio::spawn(async move { play(&transcript, read, write).await });
-            request(&acp, "initialize", json!({})).await.unwrap();
-            request(&acp, method, json!({"sessionId": "s", "cwd": "/work"})).await.unwrap();
-            let initial_updates = client.of("s");
-            assert_eq!(initial_updates.len(), usize::from(listed), "{method}");
-            if listed {
-                assert_eq!(initial_updates[0]["availableCommands"][0]["name"], "$review");
-                assert_eq!(initial_updates[0]["availableCommands"][0]["source"], "skill");
-            }
-            assert!(
-                request(&acp, "session/prompt", json!({"sessionId": "s", "prompt": text("/$review check this")}))
-                    .await
-                    .is_err()
-            );
-            let (frames, _read, _write) = player.await.unwrap();
-            for frame in sent(&frames, "skills/list") {
-                assert_eq!(frame["params"], json!({"cwds": ["/work"]}));
-            }
-            assert_eq!(
-                sent(&frames, "turn/start")[0]["params"]["input"],
-                json!([{"type": "text", "text": "/$review check this"}])
-            );
-            tokio::time::timeout(Duration::from_secs(5), async {
-                while client.of("s").len() < usize::from(listed) + 2 {
-                    tokio::task::yield_now().await;
-                }
-            })
-            .await
-            .unwrap();
-            let updates = client.of("s");
-            assert_eq!(updates.len(), usize::from(listed) + 2);
-            assert_eq!(updates.last().unwrap()["availableCommands"], json!([]));
-            acp.kill();
-        }
-    }
-}
-
-#[test]
-fn skills_become_commands_with_their_invocation_names() {
-    let update = skill_commands(&json!({"data": [{"skills": [
-        {"name": "review", "enabled": true, "description": "Long", "shortDescription": "Short"},
-        {"name": "review", "enabled": true, "description": "Duplicate"},
-        {"name": "hidden", "enabled": false, "description": "Disabled"},
-        {"name": "modern", "enabled": true, "description": "Long", "interface": {"shortDescription": "Modern"}},
-        {"name": "full", "enabled": true, "description": "Full description"},
-        {"name": "", "enabled": true}, {"description": "No name"}
-    ]}]}))
-    .unwrap();
-    assert_eq!(
-        update,
-        json!({"sessionUpdate": "available_commands_update", "availableCommands": [
-            {"name": "$review", "description": "Short", "source": "skill", "input": null},
-            {"name": "$modern", "description": "Modern", "source": "skill", "input": null},
-            {"name": "$full", "description": "Full description", "source": "skill", "input": null}
-        ]})
-    );
-    let commands = crate::config::commands_of(&update, "codex");
-    assert!(commands.iter().all(|c| c.source == crate::AgentCommandSource::Skill));
-    assert_eq!(commands[0].name, "$review");
-    assert!(skill_commands(&json!({"data": []})).unwrap()["availableCommands"].as_array().unwrap().is_empty());
-    assert!(skill_commands(&json!({})).is_none());
-}
@@ -256,31 +256,6 @@ fn effort_name(effort: &str) -> String {
    }
 }

-/// The enabled skills from `skills/list`, named as Codex ACP advertises them.
-pub(super) fn skill_commands(result: &Value) -> Option<Value> {
-    let entries = result.get("data")?.as_array()?;
-    let mut seen = std::collections::HashSet::new();
-    let commands: Vec<Value> = entries
-        .iter()
-        .filter_map(|entry| entry.get("skills").and_then(Value::as_array))
-        .flatten()
-        .filter_map(|skill| {
-            let name = skill.get("name")?.as_str()?.trim();
-            if name.is_empty() || skill.get("enabled") == Some(&Value::Bool(false)) || !seen.insert(name) {
-                return None;
-            }
-            let description = skill
-                .pointer("/interface/shortDescription")
-                .and_then(Value::as_str)
-                .or_else(|| skill.get("shortDescription").and_then(Value::as_str))
-                .or_else(|| skill.get("description").and_then(Value::as_str))
-                .unwrap_or(name);
-            Some(json!({ "name": format!("${name}"), "description": description, "source": "skill", "input": null }))
-        })
-        .collect();
-    Some(json!({ "sessionUpdate": "available_commands_update", "availableCommands": commands }))
-}
-
 /// ACP prompt content blocks as codex `UserInput`s. Embedded files become text.
 pub(super) fn user_input(prompt: &Value) -> Vec<Value> {
    let blocks = prompt.as_array().map(Vec::as_slice).unwrap_or_default();
@@ -612,16 +587,6 @@ pub(super) fn usage(params: &Value) -> Option<Value> {
    Some(json!({ "sessionUpdate": "usage_update", "used": used, "size": size }))
 }

-/// A thread name from the model's reply to the naming prompt: its first line, without
-/// quotes or a closing period. `None` when nothing is left.
-pub(super) fn thread_name(reply: &str) -> Option<String> {
-    const MAX_NAME: usize = 80;
-    let line = reply.lines().map(str::trim).find(|l| !l.is_empty())?;
-    let line = line.trim_matches(|c: char| matches!(c, '"' | '\'' | '`' | '“' | '”' | '「' | '」' | '*'));
-    let line = line.trim_end_matches(['.', '。']).trim();
-    (!line.is_empty()).then(|| line.chars().take(MAX_NAME).collect())
-}
-
 /// How a failed turn is reported.
 #[derive(Debug, PartialEq)]
 pub(super) enum Failure {
@@ -767,24 +732,19 @@ pub(super) fn answer_of(choices: &[Choice], outcome: &Value, decline: Value) ->
    choices.iter().find(|c| selected && c.option["optionId"].as_str() == chosen).map_or(decline, |c| c.answer.clone())
 }

-/// The command a command approval is about: the request's own, else its item's.
-pub(super) fn approval_command<'a>(params: &'a Value, item: Option<&'a Value>) -> Option<&'a str> {
-    // Approval payloads can describe a different command from the item's earlier summary.
-    let item = item.filter(|i| i.get("id") == params.get("itemId"));
-    params
-        .get("command")
-        .and_then(Value::as_str)
-        .filter(|c| !c.is_empty())
-        .or_else(|| item.and_then(|i| i.get("command")).and_then(Value::as_str).filter(|c| !c.is_empty()))
-}
-
 /// The ACP title of a command approval.
-pub(super) fn command_approval_title(params: &Value, item: Option<&Value>) -> String {
+pub(super) fn command_approval_title(params: &Value, item: Option<&Value>, cwd: Option<&str>) -> String {
    if let Some(host) = params.pointer("/networkApprovalContext/host").and_then(Value::as_str) {
        return format!("Allow network access to {host}");
    }
-    match approval_command(params, item) {
-        Some(command) => format!("Run {}", crate::shell_script(command).unwrap_or_else(|| command.to_owned())),
+    let from_item = item.and_then(|i| tool_call(i, false, cwd, None)).and_then(|c| str_of(&c, "title"));
+    let title = from_item.or_else(|| {
+        let synthetic = json!({ "id": "", "type": "commandExecution", "command": params.get("command"),
+            "commandActions": params.get("commandActions").cloned().unwrap_or(json!([])) });
+        tool_call(&synthetic, false, cwd, None).and_then(|c| str_of(&c, "title"))
+    });
+    match title.filter(|t| !t.is_empty()) {
+        Some(t) => format!("Run {t}"),
        None => "Run a command".to_owned(),
    }
 }
@@ -875,31 +835,3 @@ pub(super) fn tail(text: &str) -> String {
 fn str_of(v: &Value, key: &str) -> Option<String> {
    v.get(key).and_then(Value::as_str).map(str::to_owned)
 }
-
-/// Session-scoped MCP configuration, carried in thread/start, resume and fork.
-pub(super) fn mcp_config(params: &Value) -> Option<Value> {
-    let mut servers = serde_json::Map::new();
-    for server in params.get("mcpServers")?.as_array()? {
-        if server.get("type").and_then(Value::as_str).is_some_and(|t| t != "stdio") {
-            continue;
-        }
-        let (Some(name), Some(command)) =
-            (server.get("name").and_then(Value::as_str), server.get("command").and_then(Value::as_str))
-        else {
-            continue;
-        };
-        let env: serde_json::Map<String, Value> = server
-            .get("env")
-            .and_then(Value::as_array)
-            .into_iter()
-            .flatten()
-            .filter_map(|v| Some((v.get("name")?.as_str()?.to_owned(), v.get("value")?.clone())))
-            .collect();
-        servers.insert(
-            name.into(),
-            json!({"command":command,
-            "args":server.get("args").cloned().unwrap_or_else(||json!([])),"env":env}),
-        );
-    }
-    (!servers.is_empty()).then(|| json!({"mcp_servers":servers}))
-}
@@ -2,10 +2,9 @@
 //! `<config>/agents/<id>.toml` (written by hand, or by installing one from the ACP
 //! Registry, see `registry`).

-use crate::{AcpImportOutcome, AgentCommandReadOnlyReason, AgentProvider, AgentSource, CustomAgentInput, EnvSecrets};
+use crate::{AgentCommandReadOnlyReason, AgentProvider, AgentSource};
 use ide_core::{IdeError, IdeResult};
 use serde::{Deserialize, Serialize};
-use serde_json::Value;
 use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};

@@ -59,14 +58,11 @@ const BUILTIN: &[(&str, &str, Driver, &[&str], &str)] = &[
    ("cursor", "Cursor", Driver::Acp, &["cursor-agent", "acp"], "Run `cursor-agent login` in a terminal."),
    ("opencode", "OpenCode", Driver::Acp, &["opencode", "acp"], "Run `opencode auth login` in a terminal."),
    ("qwen", "Qwen Code", Driver::Acp, &["qwen", "--experimental-acp"], "Run `qwen` in a terminal and sign in."),
-    ("qoder", "Qoder", Driver::Acp, &["qodercli", "--acp"], "Run `qodercli login` in a terminal."),
-    ("qodercn", "Qoder CN", Driver::Acp, &["qoderclicn", "--acp"], "Run `qoderclicn login` in a terminal."),
    ("kimi", "Kimi CLI", Driver::Acp, &["kimi", "acp"], "Run `kimi` in a terminal and sign in."),
    ("goose", "Goose", Driver::Acp, &["goose", "acp"], "Run `goose configure` in a terminal."),
    ("auggie", "Auggie", Driver::Acp, &["auggie", "--acp"], "Run `auggie login` in a terminal."),
    ("kiro", "Kiro", Driver::Acp, &["kiro-cli", "acp"], "Run `kiro-cli login` in a terminal."),
    ("vibe", "Mistral Vibe", Driver::Acp, &["vibe-acp"], "Run `vibe` in a terminal and sign in."),
-    ("omp", "OMP", Driver::Acp, &["omp", "acp"], "Run `omp` in a terminal and sign in."),
 ];

 fn builtins() -> Vec<ProviderSpec> {
@@ -85,162 +81,6 @@ fn builtins() -> Vec<ProviderSpec> {
        .collect()
 }

-impl ProviderSpec {
-    pub(crate) fn login_hint(&self, program: &Path) -> String {
-        if !program.is_absolute() {
-            return self.login_hint.clone();
-        }
-        let search = ide_core::process::host_var_os("PATH").unwrap_or_default();
-        let builtin = builtin_spec(&self.id);
-        let on_path = builtin.as_ref().and_then(|b| ide_core::process::find_executable(&b.command, &search));
-        render_login_hint(self, program, on_path.as_deref(), cfg!(windows))
-    }
-
-    pub(crate) fn sign_in_message(&self, auth_methods: &[Value]) -> String {
-        let name = &self.name;
-        let program = Path::new(&self.command);
-        let terminal_args = matches!(self.source, AgentSource::Registry { .. })
-            .then(|| {
-                auth_methods.iter().find_map(|method| {
-                    if method.get("type").and_then(Value::as_str) != Some("terminal") {
-                        return None;
-                    }
-                    method.get("args")?.as_array()?.iter().map(Value::as_str).collect::<Option<Vec<_>>>()
-                })
-            })
-            .flatten();
-        let hint = match terminal_args {
-            Some(args) => {
-                let command = render_login_command(program, args, cfg!(windows));
-                format!("Run `{command}` in a terminal.")
-            }
-            None => self.login_hint(program),
-        };
-        format!("{name} needs you to sign in. {hint}")
-    }
-
-    /// Resolve once before connecting, so authentication guidance names that same install.
-    pub(crate) fn resolve_for_launch(self, cwd: &Path) -> Self {
-        let strip = prefer_stored_copilot_auth();
-        self.resolve_for_launch_with_copilot_env(cwd, strip)
-    }
-
-    pub(crate) fn resolve_for_launch_with_copilot_env(mut self, cwd: &Path, strip_ambient_tokens: bool) -> Self {
-        if self.driver != Driver::Acp {
-            self.command = crate::native::newest_install(&self.command);
-        }
-        if is_copilot_provider(&self.id) {
-            self.env = sanitized_copilot_env(&self.env, strip_ambient_tokens);
-        }
-        let program = ide_jsonrpc::resolve_spawn_program(&self.command, &self.env);
-        self.command =
-            if program.components().count() > 1 && !program.is_absolute() { cwd.join(program) } else { program }
-                .to_string_lossy()
-                .into_owned();
-        self
-    }
-}
-
-const AMBIENT_COPILOT_AUTH_VARS: [&str; 3] = ["COPILOT_GITHUB_TOKEN", "GH_TOKEN", "GITHUB_TOKEN"];
-static PREFER_STORED_COPILOT_AUTH: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
-
-pub(crate) fn is_copilot_provider(id: &str) -> bool {
-    id == "copilot" || id.starts_with("copilot-")
-}
-
-pub(crate) fn prefer_stored_copilot_auth() -> bool {
-    PREFER_STORED_COPILOT_AUTH.load(std::sync::atomic::Ordering::Acquire)
-}
-
-pub(crate) fn mark_prefer_stored_copilot_auth() {
-    PREFER_STORED_COPILOT_AUTH.store(true, std::sync::atomic::Ordering::Release);
-}
-
-pub(crate) fn has_unconfigured_copilot_ambient_token(spec_env: &[(String, String)]) -> bool {
-    AMBIENT_COPILOT_AUTH_VARS.iter().any(|&key| {
-        !spec_env.iter().any(|(k, v)| k == key && !v.is_empty())
-            && ambient_copilot_env_value(key).is_some_and(|v| !v.is_empty())
-    })
-}
-
-fn ambient_copilot_env_value(key: &str) -> Option<String> {
-    ide_core::process::shell_env()
-        .find(|(k, _)| *k == key)
-        .map(|(_, v)| v.to_string_lossy().into_owned())
-        .or_else(|| ide_core::process::host_var_os(key).map(|v| v.to_string_lossy().into_owned()))
-}
-
-/// Builds child environment overrides for `copilot`:
-/// - Always clears ambient classic PATs (`ghp_…`), which Copilot CLI unconditionally rejects
-///   (`"Classic PATs are not supported"`) instead of falling back to Keychain / `gh` login.
-/// - When `strip_ambient_tokens` is true, clears unconfigured ambient `GITHUB_TOKEN` / `GH_TOKEN` /
-///   `COPILOT_GITHUB_TOKEN` so Copilot uses its stored login (`~/.copilot` or `gh auth` keyring),
-///   while preserving any token explicitly configured in OpenIDEA's agent `spec_env`.
-pub(crate) fn sanitized_copilot_env(
-    spec_env: &[(String, String)],
-    strip_ambient_tokens: bool,
-) -> Vec<(String, String)> {
-    sanitize_copilot_env_with(spec_env, strip_ambient_tokens, ambient_copilot_env_value)
-}
-
-pub(crate) fn sanitize_copilot_env_with(
-    spec_env: &[(String, String)],
-    strip_ambient_tokens: bool,
-    lookup: impl Fn(&str) -> Option<String>,
-) -> Vec<(String, String)> {
-    let mut out = Vec::with_capacity(spec_env.len() + AMBIENT_COPILOT_AUTH_VARS.len());
-    for key in AMBIENT_COPILOT_AUTH_VARS {
-        let explicit = spec_env.iter().any(|(k, v)| k == key && !v.is_empty());
-        if explicit {
-            continue;
-        }
-        if let Some(val) = lookup(key).filter(|v| !v.is_empty())
-            && (strip_ambient_tokens || val.trim().starts_with("ghp_"))
-        {
-            out.push((key.to_owned(), String::new()));
-        }
-    }
-    out.extend(spec_env.iter().cloned());
-    out
-}
-
-fn render_login_hint(spec: &ProviderSpec, program: &Path, on_path: Option<&Path>, windows: bool) -> String {
-    let Some(builtin) = builtin_spec(&spec.id) else { return spec.login_hint.clone() };
-    let prefix = format!("Run `{}", builtin.command);
-    let Some(rest) = spec.login_hint.strip_prefix(&prefix).filter(|rest| rest.starts_with([' ', '`'])) else {
-        return spec.login_hint.clone();
-    };
-    let same_path = |a: &Path, b: &Path| {
-        a == b || dunce::canonicalize(a).ok().zip(dunce::canonicalize(b).ok()).is_some_and(|(a, b)| a == b)
-    };
-    if on_path.is_some_and(|path| same_path(path, program)) {
-        return spec.login_hint.clone();
-    }
-    let (args, suffix) = rest.split_once('`').expect("built-in login hints delimit their command");
-    let command = render_login_command(program, args.split_whitespace(), windows);
-    match suffix {
-        " in a terminal." => format!("Run `{command}` in a terminal."),
-        " in a terminal and sign in." => format!("Run `{command}` in a terminal and sign in."),
-        _ => spec.login_hint.clone(),
-    }
-}
-
-fn render_login_command<'a>(program: &Path, args: impl IntoIterator<Item = &'a str>, windows: bool) -> String {
-    let quote = |word: &str| {
-        if windows { format!("'{}'", word.replace('\'', "''")) } else { format!("'{}'", word.replace('\'', "'\\''")) }
-    };
-    let mut command = format!("{}{}", if windows { "& " } else { "" }, quote(&program.to_string_lossy()));
-    for arg in args {
-        command.push(' ');
-        if !arg.is_empty() && arg.chars().all(|c| c.is_ascii_alphanumeric() || "-_=./".contains(c)) {
-            command.push_str(arg);
-        } else {
-            command.push_str(&quote(arg));
-        }
-    }
-    command
-}
-
 /// Whether `id` names a built-in agent that needs no registry install (native drivers
 /// and `npx -y` adapters). CLI built-ins (`copilot`, `gemini`, …) can be installed and
 /// updated from the ACP Registry into `<config>/agents/<id>.toml`.
@@ -258,14 +98,6 @@ pub(crate) fn builtin_spec(id: &str) -> Option<ProviderSpec> {
    builtins().into_iter().find(|s| s.id == id)
 }

-/// The ACP adapters of Claude Code and Codex, which the native drivers replace: they still
-/// launch, but are listed only once customized through an agent file or used by a task.
-const UNLISTED: &[&str] = &["claude-acp", "codex-acp"];
-
-pub(crate) fn is_unlisted(spec: &ProviderSpec) -> bool {
-    UNLISTED.contains(&spec.id.as_str()) && builtin_spec(&spec.id).as_ref() == Some(spec)
-}
-
 /// Public launch metadata, keeping the built-in defaults separate from agent-file overrides.
 pub(crate) fn describe(spec: &ProviderSpec) -> AgentProvider {
    let builtin = builtin_spec(&spec.id);
@@ -287,14 +119,13 @@ pub(crate) fn describe(spec: &ProviderSpec) -> AgentProvider {
        args: spec.args.clone(),
        default_program: builtin.as_ref().map(|b| b.command.clone()),
        default_args: builtin.as_ref().map(|b| b.args.clone()).unwrap_or_default(),
-        login_hint: Some(spec.login_hint(&ide_jsonrpc::resolve_spawn_program(&spec.command, &spec.env))),
+        login_hint: Some(spec.login_hint.clone()),
        command_overridden: builtin.as_ref().is_some_and(|b| b.command != spec.command),
        command_editable: reason.is_none(),
        command_read_only_reason: reason,
        installed: installed(&spec.command),
        env: spec.env.iter().cloned().collect(),
        config: vec![],
-        thought_levels: BTreeMap::new(),
        commands: vec![],
        source: spec.source.clone(),
    }
@@ -302,40 +133,23 @@ pub(crate) fn describe(spec: &ProviderSpec) -> AgentProvider {

 /// Overrides built-in `id`'s command through its agent file, preserving other
 /// customizations. `None` restores the built-in command and removes a redundant file.
-pub(crate) fn set_builtin_command(
-    custom_dir: &Path,
-    secrets: Option<&dyn EnvSecrets>,
-    id: &str,
-    command: Option<&str>,
-) -> IdeResult<()> {
-    update_builtin(custom_dir, secrets, id, |agent, builtin| {
-        agent.command = command.unwrap_or(&builtin.command).to_owned()
-    })
+pub(crate) fn set_builtin_command(custom_dir: &Path, id: &str, command: Option<&str>) -> IdeResult<()> {
+    update_builtin(custom_dir, id, |agent, builtin| agent.command = command.unwrap_or(&builtin.command).to_owned())
 }

 /// The environment built-in `id` starts with, through its agent file (empty clears it).
-pub(crate) fn set_builtin_env(
-    custom_dir: &Path,
-    secrets: Option<&dyn EnvSecrets>,
-    id: &str,
-    env: BTreeMap<String, String>,
-) -> IdeResult<()> {
-    update_builtin(custom_dir, secrets, id, |agent, _| agent.env = env)
+pub(crate) fn set_builtin_env(custom_dir: &Path, id: &str, env: BTreeMap<String, String>) -> IdeResult<()> {
+    update_builtin(custom_dir, id, |agent, _| agent.env = env)
 }

 /// Changes built-in `id`'s agent file; a file left with only the built-in's values is removed.
-fn update_builtin(
-    custom_dir: &Path,
-    secrets: Option<&dyn EnvSecrets>,
-    id: &str,
-    change: impl FnOnce(&mut CustomAgent, &ProviderSpec),
-) -> IdeResult<()> {
+fn update_builtin(custom_dir: &Path, id: &str, change: impl FnOnce(&mut CustomAgent, &ProviderSpec)) -> IdeResult<()> {
    let Some(builtin) = builtin_spec(id) else {
        return Err(IdeError::invalid(format!("{id} is not a built-in agent")));
    };
    let file = custom_dir.join(format!("{id}.toml"));
    let mut agent = if file.try_exists()? {
-        CustomAgent::read_with(&file, id, secrets).map_err(IdeError::invalid)?
+        CustomAgent::read(&file).map_err(IdeError::invalid)?
    } else {
        CustomAgent {
            name: Some(builtin.name.clone()),
@@ -360,145 +174,14 @@ fn update_builtin(
            Err(e) if e.kind() != std::io::ErrorKind::NotFound => return Err(e.into()),
            _ => {}
        }
-        forget_env(secrets, id, &[]);
        return Ok(());
    }
-    agent.write_with(&file, id, secrets)
-}
-
-/// 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,
-    secrets: Option<&dyn EnvSecrets>,
-    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_with(&file, &id, secrets)
-}
-
-/// Removes a custom agent's file; refuses built-in, ACP Registry and missing ids.
-pub(crate) fn remove_custom(custom_dir: &Path, secrets: Option<&dyn EnvSecrets>, 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()),
-        _ => {
-            forget_env(secrets, id, &[]);
-            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,
-    secrets: Option<&dyn EnvSecrets>,
-    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_with(&custom_dir.join(format!("{id}.toml")), &id, secrets)?;
-            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()
+    agent.write(&file)?;
+    Ok(())
 }

 /// An agent file, `<config>/agents/<id>.toml`.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub(crate) struct CustomAgent {
    #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -545,67 +228,11 @@ impl CustomAgent {
        std::fs::write(&tmp, text)?;
        std::fs::rename(&tmp, path)
    }
-
-    /// Reads agent `id`'s file with its environment values filled in from `secrets`; values
-    /// still written in the file (by hand, by an older version) move there first. A registry
-    /// install keeps the environment its registry entry gives it in the file.
-    pub(crate) fn read_with(path: &Path, id: &str, secrets: Option<&dyn EnvSecrets>) -> Result<Self, String> {
-        let mut agent = Self::read(path)?;
-        let Some(secrets) = secrets.filter(|_| agent.registry.is_none()) else {
-            return Ok(agent);
-        };
-        let written = agent.env.values().any(|v| !v.is_empty());
-        for (name, value) in agent.env.iter_mut() {
-            if value.is_empty()
-                && let Some(saved) = secrets.get(&env_key(id, name))
-            {
-                *value = saved;
-            }
-        }
-        if written && let Err(e) = agent.write_with(path, id, Some(secrets)) {
-            tracing::warn!("agent {id}: could not move environment values out of {}: {}", path.display(), e.message);
-        }
-        Ok(agent)
-    }
-
-    /// Writes agent `id`'s file with the environment's names only, its values saved in `secrets`.
-    pub(crate) fn write_with(&self, path: &Path, id: &str, secrets: Option<&dyn EnvSecrets>) -> IdeResult<()> {
-        let Some(secrets) = secrets.filter(|_| self.registry.is_none()) else {
-            return Ok(self.write(path)?);
-        };
-        let mut keys = Vec::with_capacity(self.env.len());
-        for (name, value) in &self.env {
-            let key = env_key(id, name);
-            if value.is_empty() {
-                secrets.delete(&key);
-            } else if secrets.get(&key).as_deref() != Some(value.as_str()) {
-                secrets.set(&key, value)?;
-            }
-            keys.push(key);
-        }
-        forget_env(Some(secrets), id, &keys);
-        let names = self.env.keys().map(|name| (name.clone(), String::new())).collect();
-        Ok(Self { env: names, ..self.clone() }.write(path)?)
-    }
-}
-
-fn env_key(id: &str, name: &str) -> String {
-    format!("agent/{id}/env/{}", name.replace('%', "%25").replace('/', "%2F"))
-}
-
-/// Forgets agent `id`'s saved environment values, except `keep`.
-fn forget_env(secrets: Option<&dyn EnvSecrets>, id: &str, keep: &[String]) {
-    let Some(secrets) = secrets else { return };
-    for key in secrets.keys(&format!("agent/{id}/env/")) {
-        if !keep.contains(&key) {
-            secrets.delete(&key);
-        }
-    }
 }

 /// Built-in agents, then the `*.toml` agents of `custom_dir`; a custom agent with a
 /// built-in id replaces it.
-pub(crate) fn load(custom_dir: Option<&Path>, secrets: Option<&dyn EnvSecrets>) -> Vec<ProviderSpec> {
+pub(crate) fn load(custom_dir: Option<&Path>) -> Vec<ProviderSpec> {
    let mut specs = builtins();
    let mut files: Vec<PathBuf> = custom_dir
        .and_then(|d| std::fs::read_dir(d).ok())
@@ -618,7 +245,7 @@ pub(crate) fn load(custom_dir: Option<&Path>, secrets: Option<&dyn EnvSecrets>)
    files.sort();
    for path in files {
        let Some(id) = path.file_stem().and_then(|s| s.to_str()).map(str::to_owned) else { continue };
-        let agent = match CustomAgent::read_with(&path, &id, secrets) {
+        let agent = match CustomAgent::read(&path) {
            Ok(a) => a,
            Err(e) => {
                tracing::warn!("skipping agent {}: {e}", path.display());
@@ -684,157 +311,11 @@ fn is_executable(p: &Path) -> bool {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use serde_json::json;
-
-    #[test]
-    fn qoder_global_and_cn_editions_are_both_built_in() {
-        let info = |id: &str| describe(&load(None, None).into_iter().find(|s| s.id == id).unwrap());
-        let (global, cn) = (info("qoder"), info("qodercn"));
-        assert_eq!((global.name.as_str(), global.command.as_str()), ("Qoder", "qodercli --acp"));
-        assert_eq!((cn.name.as_str(), cn.command.as_str()), ("Qoder CN", "qoderclicn --acp"));
-        assert_eq!(global.login_hint.as_deref(), Some("Run `qodercli login` in a terminal."));
-    }
-
-    #[test]
-    fn qodercn_is_available_without_a_file_and_preserves_existing_customizations() {
-        let dir = tempfile::tempdir().unwrap();
-        let qodercn = load(None, None).into_iter().find(|s| s.id == "qodercn").unwrap();
-        assert_eq!(qodercn.driver, Driver::Acp);
-        assert!(!is_unlisted(&qodercn));
-        let info = describe(&qodercn);
-        assert_eq!(info.name, "Qoder CN");
-        assert_eq!(info.command, "qoderclicn --acp");
-        assert_eq!(info.source, AgentSource::Builtin);
-        assert!(info.command_editable);
-        assert_eq!(info.login_hint.as_deref(), Some("Run `qoderclicn login` in a terminal."));
-
-        std::fs::write(
-            dir.path().join("qodercn.toml"),
-            "command = \"/custom/qoderclicn\"\nargs = [\"--acp\"]\n[env]\nK = \"v\"\n",
-        )
-        .unwrap();
-        let specs = load(Some(dir.path()), None);
-        assert_eq!(specs.iter().filter(|s| s.id == "qodercn").count(), 1);
-        let custom = specs.iter().find(|s| s.id == "qodercn").unwrap();
-        assert_eq!(custom.command, "/custom/qoderclicn");
-        assert_eq!(custom.env, [("K".into(), "v".into())]);
-        set_builtin_command(dir.path(), None, "qodercn", None).unwrap();
-        let reset = load(Some(dir.path()), None).into_iter().find(|s| s.id == "qodercn").unwrap();
-        assert_eq!(reset.command, "qoderclicn");
-        assert_eq!(reset.args, ["--acp"]);
-        assert_eq!(reset.env, custom.env);
-    }
-
-    #[test]
-    fn login_hints_cover_all_builtin_commands_and_preserve_separate_login_tools() {
-        for spec in builtins() {
-            let separate = matches!(spec.id.as_str(), "claude-acp" | "codex-acp" | "vibe");
-            for windows in [false, true] {
-                let program =
-                    if windows { Path::new(r"C:\Agent Tools\renamed.cmd") } else { Path::new("/agent tools/renamed") };
-                let hint = render_login_hint(&spec, program, None, windows);
-                if separate {
-                    assert_eq!(hint, spec.login_hint, "{}", spec.id);
-                } else {
-                    let prefix =
-                        if windows { "Run `& 'C:\\Agent Tools\\renamed.cmd'" } else { "Run `'/agent tools/renamed'" };
-                    assert!(hint.starts_with(prefix), "{}: {hint}", spec.id);
-                    assert_eq!(
-                        render_login_hint(&spec, program, Some(program), windows),
-                        spec.login_hint,
-                        "a PATH-resolved command stays bare: {}",
-                        spec.id
-                    );
-                    assert_eq!(render_login_hint(&spec, program, Some(Path::new("/other/install")), windows), hint);
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn login_commands_quote_shell_metacharacters_and_keep_arguments() {
-        let cursor = builtin_spec("cursor").unwrap();
-        assert_eq!(
-            render_login_hint(&cursor, Path::new("/agent's tools/$cli"), None, false),
-            "Run `'/agent'\\''s tools/$cli' login` in a terminal."
-        );
-        assert_eq!(
-            render_login_hint(&cursor, Path::new(r"C:\agent's tools\$cli.cmd"), None, true),
-            r"Run `& 'C:\agent''s tools\$cli.cmd' login` in a terminal."
-        );
-        let opencode = builtin_spec("opencode").unwrap();
-        assert_eq!(
-            render_login_hint(&opencode, Path::new("/registry/opencode"), None, false),
-            "Run `'/registry/opencode' auth login` in a terminal."
-        );
-        let mut custom = cursor;
-        custom.id = "custom".into();
-        custom.login_hint = "Sign in with the agent's own command line first.".into();
-        assert_eq!(render_login_hint(&custom, Path::new("/custom"), None, false), custom.login_hint);
-    }
-
-    #[test]
-    fn launch_resolution_uses_the_child_path_and_absolutizes_relative_overrides() {
-        let dir = tempfile::tempdir().unwrap();
-        let mut cursor = builtin_spec("cursor").unwrap();
-        let command = if cfg!(windows) { "cursor-agent.cmd" } else { "cursor-agent" };
-        let program = dir.path().join(command);
-        std::fs::write(&program, "").unwrap();
-        cursor.env.push(("PATH".into(), dir.path().to_string_lossy().into_owned()));
-        let resolved = cursor.clone().resolve_for_launch(dir.path());
-        assert_eq!(Path::new(&resolved.command), program);
-        assert!(resolved.sign_in_message(&[]).contains(&*program.to_string_lossy()));
-        cursor.command = format!("tools/{command}");
-        let resolved = cursor.resolve_for_launch(dir.path());
-        assert_eq!(Path::new(&resolved.command), dir.path().join("tools").join(command));
-    }
-
-    #[test]
-    fn terminal_login_commands_quote_the_binary_and_each_argument() {
-        for (windows, expected) in [
-            (false, "'/agent'\\''s tools/$cli' auth login --account 'user name' 'a'\\''b' '$token' ''"),
-            (true, "& '/agent''s tools/$cli' auth login --account 'user name' 'a''b' '$token' ''"),
-        ] {
-            assert_eq!(
-                render_login_command(
-                    Path::new("/agent's tools/$cli"),
-                    ["auth", "login", "--account", "user name", "a'b", "$token", ""],
-                    windows
-                ),
-                expected
-            );
-        }
-        let mut spec = builtin_spec("cursor").unwrap();
-        spec.id = "custom".into();
-        spec.source = AgentSource::Registry { version: "1.4.5".into(), update: None };
-        spec.login_hint = "Sign in with the agent's own command line first.".into();
-        for method in [
-            json!({"type": "terminal"}),
-            json!({"type": "terminal", "args": ["login", null]}),
-            json!({"type": "agent", "args": ["login"]}),
-        ] {
-            assert_eq!(
-                spec.sign_in_message(&[method]),
-                "Cursor needs you to sign in. Sign in with the agent's own command line first."
-            );
-        }
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn registry_login_hint_names_the_installed_executable() {
-        let mut spec = builtin_spec("cursor").unwrap();
-        spec.command = "/registry path/dist-package/cursor-agent".into();
-        assert_eq!(
-            describe(&spec).login_hint.as_deref(),
-            Some("Run `'/registry path/dist-package/cursor-agent' login` in a terminal.")
-        );
-    }

    #[test]
    fn launch_metadata_distinguishes_defaults_overrides_and_read_only_agents() {
        let dir = tempfile::tempdir().unwrap();
-        let list = || load(Some(dir.path()), None).iter().map(describe).collect::<Vec<_>>();
+        let list = || load(Some(dir.path())).iter().map(describe).collect::<Vec<_>>();
        let defaults = list();
        let codex = defaults.iter().find(|p| p.id == "codex").unwrap();
        assert_eq!(codex.program, "codex");
@@ -854,14 +335,14 @@ mod tests {
                p.id.ends_with("-acp").then_some(AgentCommandReadOnlyReason::PackageRunner)
            );
        }
-        set_builtin_command(dir.path(), None, "codex", Some("/path with spaces/codex")).unwrap();
+        set_builtin_command(dir.path(), "codex", Some("/path with spaces/codex")).unwrap();
        let overridden = list().into_iter().find(|p| p.id == "codex").unwrap();
        assert_eq!(overridden.program, "/path with spaces/codex");
        assert_eq!(overridden.args, codex.args);
        assert_eq!(overridden.default_program, codex.default_program);
        assert!(overridden.command_overridden && overridden.command_editable);
        assert_eq!(overridden.source, AgentSource::Builtin);
-        set_builtin_command(dir.path(), None, "codex", Some("codex")).unwrap();
+        set_builtin_command(dir.path(), "codex", Some("codex")).unwrap();
        assert!(!list().iter().find(|p| p.id == "codex").unwrap().command_overridden);
        std::fs::write(
            dir.path().join("gemini.toml"),
@@ -886,7 +367,7 @@ mod tests {
        write("mine.toml", "name = \"Mine\"\ncommand = \"/opt/mine\"\nargs = [\"acp\"]\n[env]\nK = \"v\"\n");
        write("gemini.toml", "command = \"gemini\"\nargs = [\"--acp\"]\n");
        write("broken.toml", "nope = 1\n");
-        let specs = load(Some(dir.path()), None);
+        let specs = load(Some(dir.path()));
        let mine = specs.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())]);
@@ -902,35 +383,25 @@ mod tests {
    fn set_builtin_env_writes_and_clears_the_environment() {
        let dir = tempfile::tempdir().unwrap();
        let env = BTreeMap::from([("CLAUDE_CODE_ENTRYPOINT".to_owned(), "openidea".to_owned())]);
-        set_builtin_env(dir.path(), None, "claude", env.clone()).unwrap();
-        let claude = load(Some(dir.path()), None).into_iter().find(|s| s.id == "claude").unwrap();
+        set_builtin_env(dir.path(), "claude", env.clone()).unwrap();
+        let claude = load(Some(dir.path())).into_iter().find(|s| s.id == "claude").unwrap();
        assert_eq!(claude.env, vec![("CLAUDE_CODE_ENTRYPOINT".to_owned(), "openidea".to_owned())]);
        assert_eq!(describe(&claude).env, env);
        // The command override and the environment are kept independently.
-        set_builtin_command(dir.path(), None, "claude", Some("/opt/claude")).unwrap();
-        set_builtin_command(dir.path(), None, "claude", None).unwrap();
+        set_builtin_command(dir.path(), "claude", Some("/opt/claude")).unwrap();
+        set_builtin_command(dir.path(), "claude", None).unwrap();
        assert!(dir.path().join("claude.toml").is_file());
-        set_builtin_env(dir.path(), None, "claude", BTreeMap::new()).unwrap();
+        set_builtin_env(dir.path(), "claude", BTreeMap::new()).unwrap();
        assert!(!dir.path().join("claude.toml").exists());
-        set_builtin_env(dir.path(), None, "not-a-builtin", env).unwrap_err();
-    }
-
-    #[test]
-    fn acp_adapters_of_native_agents_are_unlisted_until_customized() {
-        let dir = tempfile::tempdir().unwrap();
-        let unlisted =
-            |dir: &Path| load(Some(dir), None).into_iter().filter(is_unlisted).map(|s| s.id).collect::<Vec<_>>();
-        assert_eq!(unlisted(dir.path()), ["claude-acp", "codex-acp"]);
-        set_builtin_env(dir.path(), None, "codex-acp", BTreeMap::from([("A".to_owned(), "1".to_owned())])).unwrap();
-        assert_eq!(unlisted(dir.path()), ["claude-acp"]);
+        set_builtin_env(dir.path(), "not-a-builtin", env).unwrap_err();
    }

    #[test]
    fn set_builtin_command_overrides_and_clears_a_builtin() {
        let dir = tempfile::tempdir().unwrap();
-        set_builtin_command(dir.path(), None, "not-a-builtin", Some("/x")).unwrap_err();
-        set_builtin_command(dir.path(), None, "claude", Some("/opt/claude")).unwrap();
-        let claude = load(Some(dir.path()), None).into_iter().find(|s| s.id == "claude").unwrap();
+        set_builtin_command(dir.path(), "not-a-builtin", Some("/x")).unwrap_err();
+        set_builtin_command(dir.path(), "claude", Some("/opt/claude")).unwrap();
+        let claude = load(Some(dir.path())).into_iter().find(|s| s.id == "claude").unwrap();
        assert_eq!((claude.command.as_str(), claude.driver), ("/opt/claude", Driver::Claude));
        assert!(claude.args.is_empty());
        // A registry install is neither overwritten nor removed by a command override.
@@ -945,14 +416,14 @@ mod tests {
        }
        .write(&path)
        .unwrap();
-        set_builtin_command(dir.path(), None, "codex", Some("/x")).unwrap_err();
-        set_builtin_command(dir.path(), None, "codex", None).unwrap_err();
+        set_builtin_command(dir.path(), "codex", Some("/x")).unwrap_err();
+        set_builtin_command(dir.path(), "codex", None).unwrap_err();
        assert!(path.exists());
        // Clearing (twice) returns the built-in to auto-detection.
-        set_builtin_command(dir.path(), None, "claude", None).unwrap();
-        set_builtin_command(dir.path(), None, "claude", None).unwrap();
+        set_builtin_command(dir.path(), "claude", None).unwrap();
+        set_builtin_command(dir.path(), "claude", None).unwrap();
        assert!(!dir.path().join("claude.toml").exists());
-        assert_eq!(load(Some(dir.path()), None).iter().find(|s| s.id == "claude").unwrap().command, "claude");
+        assert_eq!(load(Some(dir.path())).iter().find(|s| s.id == "claude").unwrap().command, "claude");
    }

    #[test]
@@ -980,11 +451,11 @@ mod tests {
            }
            agent.write(&path).unwrap();

-            set_builtin_command(dir.path(), None, "claude", Some("/new/claude")).unwrap();
+            set_builtin_command(dir.path(), "claude", Some("/new/claude")).unwrap();
            agent.command = "/new/claude".into();
            assert_eq!(CustomAgent::read(&path).unwrap(), agent, "{field}");

-            set_builtin_command(dir.path(), None, "claude", None).unwrap();
+            set_builtin_command(dir.path(), "claude", None).unwrap();
            agent.command = "claude".into();
            assert_eq!(CustomAgent::read(&path).unwrap(), agent, "{field}");
        }
@@ -1000,11 +471,11 @@ mod tests {
        )
        .unwrap();

-        set_builtin_command(dir.path(), None, "codex", None).unwrap();
+        set_builtin_command(dir.path(), "codex", None).unwrap();

        assert!(!path.exists());
        assert_eq!(
-            load(Some(dir.path()), None).into_iter().find(|s| s.id == "codex").unwrap(),
+            load(Some(dir.path())).into_iter().find(|s| s.id == "codex").unwrap(),
            builtin_spec("codex").unwrap()
        );
    }
@@ -1025,170 +496,8 @@ mod tests {
        let text = std::fs::read_to_string(&path).unwrap();
        assert!(text.contains("[registry]") && !text.contains("driver"), "{text}");
        assert_eq!(CustomAgent::read(&path).unwrap(), agent);
-        let spec = load(Some(path.parent().unwrap()), None).into_iter().find(|s| s.id == "amp-acp").unwrap();
+        let spec = load(Some(path.parent().unwrap())).into_iter().find(|s| s.id == "amp-acp").unwrap();
        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(), None, &custom_input("mine")).unwrap();
-        let mine = load(Some(dir.path()), None).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(), None, "mine").unwrap();
-        assert!(!load(Some(dir.path()), None).iter().any(|s| s.id == "mine"));
-        remove_custom(dir.path(), None, "mine").unwrap_err();
-    }
-
-    #[test]
-    fn custom_agents_refuse_builtin_registry_and_bad_ids() {
-        let dir = tempfile::tempdir().unwrap();
-        save_custom(dir.path(), None, &custom_input("claude")).unwrap_err();
-        save_custom(dir.path(), None, &custom_input("../evil")).unwrap_err();
-        save_custom(dir.path(), None, &custom_input("")).unwrap_err();
-        let mut empty_command = custom_input("mine");
-        empty_command.command = "  ".into();
-        save_custom(dir.path(), None, &empty_command).unwrap_err();
-        save_custom(dir.path(), None, &custom_input("mine")).unwrap();
-        save_custom(dir.path(), None, &custom_input("mine")).unwrap_err();
-        remove_custom(dir.path(), None, "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, None, "../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(), None, &custom_input("amp-acp")).unwrap_err();
-        remove_custom(dir.path(), None, "amp-acp").unwrap_err();
-    }
-
-    #[derive(Default)]
-    struct MemorySecrets(parking_lot::Mutex<BTreeMap<String, String>>);
-
-    impl EnvSecrets for MemorySecrets {
-        fn get(&self, key: &str) -> Option<String> {
-            self.0.lock().get(key).cloned()
-        }
-        fn set(&self, key: &str, value: &str) -> IdeResult<()> {
-            self.0.lock().insert(key.to_owned(), value.to_owned());
-            Ok(())
-        }
-        fn delete(&self, key: &str) {
-            self.0.lock().remove(key);
-        }
-        fn keys(&self, prefix: &str) -> Vec<String> {
-            self.0.lock().keys().filter(|k| k.starts_with(prefix)).cloned().collect()
-        }
-    }
-
-    #[test]
-    fn environment_values_go_to_the_secrets_and_the_files_keep_the_names() {
-        let dir = tempfile::tempdir().unwrap();
-        let secrets = MemorySecrets::default();
-        let s = Some(&secrets as &dyn EnvSecrets);
-        let env = BTreeMap::from([("API_KEY".to_owned(), "v-91f".to_owned()), ("A/B".to_owned(), String::new())]);
-        set_builtin_env(dir.path(), s, "claude", env.clone()).unwrap();
-        save_custom(dir.path(), s, &CustomAgentInput { env: env.clone(), ..custom_input("mine") }).unwrap();
-        for id in ["claude", "mine"] {
-            let text = std::fs::read_to_string(dir.path().join(format!("{id}.toml"))).unwrap();
-            assert!(text.contains("API_KEY") && !text.contains("v-91f"), "{text}");
-            let spec = load(Some(dir.path()), s).into_iter().find(|p| p.id == id).unwrap();
-            assert_eq!(describe(&spec).env, env);
-        }
-        assert_eq!(secrets.keys("agent/"), ["agent/claude/env/API_KEY", "agent/mine/env/API_KEY"]);
-
-        set_builtin_command(dir.path(), s, "claude", Some("/opt/claude")).unwrap();
-        assert_eq!(secrets.get("agent/claude/env/API_KEY").as_deref(), Some("v-91f"));
-        set_builtin_env(dir.path(), s, "claude", BTreeMap::from([("OTHER".to_owned(), "x".to_owned())])).unwrap();
-        assert_eq!(secrets.keys("agent/claude/"), ["agent/claude/env/OTHER"]);
-        set_builtin_command(dir.path(), s, "claude", None).unwrap();
-        set_builtin_env(dir.path(), s, "claude", BTreeMap::new()).unwrap();
-        remove_custom(dir.path(), s, "mine").unwrap();
-        assert_eq!(secrets.keys("agent/"), Vec::<String>::new());
-    }
-
-    #[test]
-    fn values_written_in_agent_files_move_to_the_secrets_unless_installed_from_the_registry() {
-        let dir = tempfile::tempdir().unwrap();
-        let secrets = MemorySecrets::default();
-        let s = Some(&secrets as &dyn EnvSecrets);
-        std::fs::write(dir.path().join("mine.toml"), "command = \"/opt/mine\"\n[env]\nK = \"v-91f\"\nS = \"\"\n")
-            .unwrap();
-        secrets.set("agent/mine/env/S", "saved").unwrap();
-        let registry =
-            "command = \"/registry/amp\"\n[env]\nR = \"1\"\n[registry]\nid = \"amp-acp\"\nversion = \"1.0\"\n";
-        std::fs::write(dir.path().join("amp-acp.toml"), registry).unwrap();
-        let specs = load(Some(dir.path()), s);
-        assert_eq!(
-            specs.iter().find(|p| p.id == "mine").unwrap().env,
-            [("K".to_owned(), "v-91f".to_owned()), ("S".to_owned(), "saved".to_owned())]
-        );
-        assert!(!std::fs::read_to_string(dir.path().join("mine.toml")).unwrap().contains("v-91f"));
-        assert_eq!(secrets.keys("agent/"), ["agent/mine/env/K", "agent/mine/env/S"]);
-        assert_eq!(std::fs::read_to_string(dir.path().join("amp-acp.toml")).unwrap(), registry);
-    }
-
-    #[test]
-    fn acp_json_imports_servers_and_skips_collisions() {
-        let dir = tempfile::tempdir().unwrap();
-        save_custom(dir.path(), None, &custom_input("taken")).unwrap();
-        let outcomes = import_acp(
-            dir.path(),
-            None,
-            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()), None).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(), None, "not json").unwrap_err();
-        assert!(import_acp(dir.path(), None, "{}").unwrap().is_empty());
-    }
-
-    #[test]
-    fn sanitizes_classic_pats_and_ambient_tokens_while_preserving_explicit_agent_env() {
-        let lookup = |k: &str| match k {
-            "GITHUB_TOKEN" => Some("ghp_classic_pat_123".into()),
-            "GH_TOKEN" => Some("gho_oauth_token_456".into()),
-            _ => None,
-        };
-        assert_eq!(sanitize_copilot_env_with(&[], false, lookup), vec![("GITHUB_TOKEN".into(), String::new())]);
-        assert_eq!(
-            sanitize_copilot_env_with(&[], true, lookup),
-            vec![("GH_TOKEN".into(), String::new()), ("GITHUB_TOKEN".into(), String::new())]
-        );
-        let explicit = vec![("GH_TOKEN".into(), "github_pat_custom".into())];
-        assert_eq!(
-            sanitize_copilot_env_with(&explicit, true, lookup),
-            vec![("GITHUB_TOKEN".into(), String::new()), ("GH_TOKEN".into(), "github_pat_custom".into())]
-        );
-    }
 }
@@ -826,7 +826,7 @@ mod tests {
        assert!(!shown.iter().any(|a| a.id == "cline"));

        write_atomic(&p.cache_file, INDEX.as_bytes()).unwrap();
-        let mut providers: Vec<AgentProvider> = provider::load(Some(&p.agents_dir), None)
+        let mut providers: Vec<AgentProvider> = provider::load(Some(&p.agents_dir))
            .into_iter()
            .filter(|s| s.id == "amp-acp")
            .map(|s| provider::describe(&s))
@@ -918,7 +918,7 @@ mod tests {
        assert_eq!(agent.command, v1.to_string_lossy());
        assert_eq!((agent.args.as_slice(), agent.env["A"].as_str()), (&["acp".to_owned()][..], "1"));
        assert_eq!(agent.registry, Some(RegistryRef { id: "demo".into(), version: "1.0.0".into() }));
-        let spec = provider::load(Some(&p.agents_dir), None).into_iter().find(|s| s.id == "demo").unwrap();
+        let spec = provider::load(Some(&p.agents_dir)).into_iter().find(|s| s.id == "demo").unwrap();
        assert_eq!(spec.source, AgentSource::Registry { version: "1.0.0".into(), update: None });
        assert!(provider::installed(&spec.command));

@@ -991,7 +991,7 @@ mod tests {
        assert_eq!((shown[0].installed.as_deref(), shown[0].update), (Some("1.0.104"), true));

        write_atomic(&p.cache_file, index.as_bytes()).unwrap();
-        let spec = provider::load(Some(&p.agents_dir), None).into_iter().find(|s| s.id == "copilot").unwrap();
+        let spec = provider::load(Some(&p.agents_dir)).into_iter().find(|s| s.id == "copilot").unwrap();
        assert_eq!(spec.name, "GitHub Copilot");
        assert_eq!(spec.login_hint, "Run `copilot` in a terminal and sign in.");
        assert_eq!(spec.source, AgentSource::Registry { version: "1.0.104".into(), update: None });
@@ -1004,7 +1004,7 @@ mod tests {
        );

        remove(&p, "github-copilot-cli").unwrap();
-        let fallback = provider::load(Some(&p.agents_dir), None).into_iter().find(|s| s.id == "copilot").unwrap();
+        let fallback = provider::load(Some(&p.agents_dir)).into_iter().find(|s| s.id == "copilot").unwrap();
        assert_eq!(fallback.source, AgentSource::Builtin);
    }
 }
@@ -24,8 +24,6 @@ fn paths(dir: &Path) -> AgentPaths {
        models_file: dir.join("models.json"),
        custom_agents_dir: None,
        home_dir: None,
-        env_secrets: None,
-        catalogs: Arc::default(),
    }
 }

@@ -1,600 +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,
-}
-
-/// The shell command an ACP `session/request_permission` asks to run: only a tool call of kind
-/// `execute`, and only its structured `rawInput` command. A title is free text the agent
-/// writes, so it never names the command.
-pub fn extract_command(params: &Value) -> Option<String> {
-    let tool = params.get("toolCall").or_else(|| params.pointer("/subject/toolCall"))?;
-    if tool.get("kind").and_then(Value::as_str) != Some("execute") {
-        return None;
-    }
-    let raw_cmd = tool.pointer("/rawInput/command").or_else(|| tool.pointer("/rawInput/cmd"));
-    raw_cmd.and_then(command_from_value)
-}
-
-/// Whether allowing the request grants more than running its command, such as network access
-/// for it: the command policy may block such a request but never approves it.
-pub fn widens_access(params: &Value) -> bool {
-    let tool = params.get("toolCall").or_else(|| params.pointer("/subject/toolCall"));
-    tool.and_then(|t| t.pointer("/rawInput/networkApprovalContext")).is_some_and(|c| !c.is_null())
-}
-
-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
-}
-
-/// Whether every shell an agent may run `command` in (a POSIX shell, PowerShell, cmd.exe) reads
-/// it as the one command the policy sees. Outside double quotes no separator or redirection may
-/// remain after splitting (cmd.exe takes single quotes literally); `\` may only stand in a
-/// path (it escapes only in POSIX shells); no `^` may escape a quote (cmd.exe); no `%` (cmd.exe
-/// expands it before parsing); no carriage return; no typographic quotes (PowerShell ends
-/// strings at them).
-fn reads_alike_in_every_shell(command: &str) -> bool {
-    let chars: Vec<char> = command.chars().collect();
-    let mut in_double = false;
-    for (i, &c) in chars.iter().enumerate() {
-        let next = chars.get(i + 1).copied();
-        match c {
-            '"' => in_double = !in_double,
-            '\\' if !next.is_none_or(|n| n.is_ascii_alphanumeric() || matches!(n, '\\' | '.' | '_' | '-')) => {
-                return false;
-            }
-            '^' if matches!(next, Some('"' | '\'' | '\n' | '\r')) => return false,
-            '%' | '\r' | '\u{2018}'..='\u{201f}' => return false,
-            ';' | '&' | '|' | '<' | '>' | '\n' if !in_double => return false,
-            _ => {}
-        }
-    }
-    true
-}
-
-/// A command as blocked patterns are compared with it: lower case, single spaces, and the
-/// program without its folder or `.exe` (`/bin/rm` and `RM.EXE` are `rm`).
-fn normalized_for_blocking(command: &str) -> String {
-    let mut words = command.split_whitespace().map(str::to_lowercase);
-    let Some(program) = words.next() else { return String::new() };
-    let program = program.rsplit(['/', '\\']).next().unwrap_or(&program);
-    let program = program.strip_suffix(".exe").unwrap_or(program);
-    std::iter::once(program.to_owned()).chain(words).collect::<Vec<_>>().join(" ")
-}
-
-/// 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);
-
-    let normalized: Vec<String> =
-        std::iter::once(cmd).chain(subcommands.iter().copied()).map(normalized_for_blocking).collect();
-    for pat in &settings.blocked_commands {
-        let pat = pat.trim();
-        if pat.is_empty() {
-            continue;
-        }
-        let normalized_pat = normalized_for_blocking(pat);
-        if matches_command(pat, cmd)
-            || subcommands.iter().any(|sub| matches_command(pat, sub))
-            || normalized.iter().any(|c| matches_command(&normalized_pat, c))
-        {
-            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) || !reads_alike_in_every_shell(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()));
-    }
-
-    /// The command may run in PowerShell or cmd.exe as well as a POSIX shell: what any of them
-    /// would split or expand differently from the policy's reading is never auto-approved.
-    #[test]
-    fn what_another_shell_reads_as_two_commands_is_not_auto_approved() {
-        let settings = AgentSecuritySettings {
-            allowed_commands: vec!["git status".into(), "git commit".into()],
-            blocked_commands: vec![],
-        };
-        for cmd in [
-            // `\` escapes only in POSIX shells.
-            "git status \\; calc.exe",
-            "git status \\& calc.exe",
-            "git status \\| calc.exe",
-            "git status \\\\\\; calc.exe",
-            "git status \"\\\" ; calc.exe ; \\\"\"",
-            // cmd.exe: single quotes don't quote, `^` escapes a quote, `%` expands first.
-            "git status '&' calc.exe",
-            "git status ';' calc.exe",
-            "git status '>' out.txt",
-            "git status ^\" & calc.exe ^\"",
-            "git status %COMSPEC%",
-            // PowerShell also closes a string at a typographic quote.
-            "git status \"a \u{201d} ; calc.exe ; \u{201c} b\"",
-            "git status \u{2018}x\u{2019}",
-            // A carriage return ends the command line too.
-            "git status\r calc.exe",
-        ] {
-            assert_eq!(evaluate_command(cmd, &settings), PolicyDecision::AskUser, "{cmd:?}");
-        }
-        // Text every shell reads alike stays approvable.
-        for cmd in [
-            "git status -s",
-            "git status && git status",
-            "git commit -m \"fix <bug> & (issue); done\"",
-            "git status src\\main.rs C:\\work\\repo",
-            "git status HEAD^",
-        ] {
-            assert_eq!(evaluate_command(cmd, &settings), PolicyDecision::Allowed, "{cmd:?}");
-        }
-    }
-
-    #[test]
-    fn blocked_patterns_ignore_case_spacing_and_the_programs_folder() {
-        let settings = AgentSecuritySettings::default();
-        for cmd in
-            ["rm  -rf /", "RM -RF /", "/bin/rm -rf /", "Rm -Rf  /tmp/x", "C:\\Windows\\System32\\shutdown.exe /s"]
-        {
-            assert!(matches!(evaluate_command(cmd, &settings), PolicyDecision::Blocked(_)), "{cmd:?}");
-        }
-        assert_eq!(evaluate_command("git status", &settings), PolicyDecision::AskUser);
-    }
-
-    #[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);
-    }
-
-    /// Only a tool call of kind `execute` runs a command, and its command is in `rawInput`:
-    /// a title says what the agent wants it to say.
-    #[test]
-    fn a_request_is_a_command_only_by_its_kind_and_input() {
-        let escalation = json!({ "sessionId": "t", "toolCall": {
-            "toolCallId": "i1", "title": "Run git status", "kind": "other", "status": "pending",
-            "rawInput": { "fileSystem": { "write": ["C:\\"] }, "network": { "enabled": true } } },
-            "options": [ { "optionId": "turn", "name": "Allow for this turn", "kind": "allow_once" },
-                         { "optionId": "decline", "name": "Decline", "kind": "reject_once" } ] });
-        assert_eq!(extract_command(&escalation), None);
-        let titled_only = json!({ "toolCall": { "title": "Run git status", "kind": "execute" } });
-        assert_eq!(extract_command(&titled_only), None);
-        let named_only = json!({ "toolCall": { "title": "git status", "name": "Bash" } });
-        assert_eq!(extract_command(&named_only), None);
-        let mislabelled = json!({ "toolCall": { "title": "Run git status", "kind": "edit",
-            "rawInput": { "command": "git status" } } });
-        assert_eq!(extract_command(&mislabelled), None);
-        let network = json!({ "toolCall": { "title": "Allow network access to example.com", "kind": "execute",
-            "rawInput": { "command": "curl https://example.com", "networkApprovalContext": { "host": "example.com" } } } });
-        assert_eq!(extract_command(&network).as_deref(), Some("curl https://example.com"));
-        assert!(widens_access(&network));
-        let plain = json!({ "toolCall": { "title": "Run git status", "kind": "execute",
-            "rawInput": { "command": "git status" } } });
-        assert!(!widens_access(&plain));
-    }
-}
@@ -2,7 +2,7 @@
 //! skills (`.claude/skills/<dir>/SKILL.md`) and custom commands (`.claude/commands/**/*.md`)
 //! of the working directory and every directory above it, then the user's `~/.claude`.

-use crate::{AgentCommand, AgentCommandSource};
+use crate::AgentCommand;
 use std::collections::HashSet;
 use std::path::Path;

@@ -36,14 +36,9 @@ pub(crate) fn discover(cwd: &Path, home: Option<&Path>) -> Vec<AgentCommand> {

 /// `first` (the agent's own list) plus the commands of `more` it lacks.
 pub(crate) fn merge(first: Vec<AgentCommand>, more: Vec<AgentCommand>) -> Vec<AgentCommand> {
+    let names: HashSet<String> = first.iter().map(|c| c.name.clone()).collect();
    let mut out = first;
-    for c in more {
-        if let Some(offered) = out.iter_mut().find(|offered| offered.name == c.name) {
-            offered.source = c.source;
-        } else {
-            out.push(c);
-        }
-    }
+    out.extend(more.into_iter().filter(|c| !names.contains(&c.name)));
    out
 }

@@ -66,7 +61,7 @@ fn skills(dir: &Path) -> Vec<AgentCommand> {
                return None;
            }
            let name = meta.get("name").filter(|n| !n.is_empty()).map(str::to_owned).or_else(|| file_name(&path))?;
-            Some(meta.command(name, &text, AgentCommandSource::Skill))
+            Some(meta.command(name, &text))
        })
        .collect();
    out.sort_by(|a, b| a.name.cmp(&b.name));
@@ -84,7 +79,7 @@ fn commands(dir: &Path, prefix: &str, depth: usize, out: &mut Vec<AgentCommand>)
        } else if let Some(stem) = name.strip_suffix(".md")
            && let Ok(text) = std::fs::read_to_string(&path)
        {
-            out.push(Frontmatter::parse(&text).command(format!("{prefix}{stem}"), &text, AgentCommandSource::Command));
+            out.push(Frontmatter::parse(&text).command(format!("{prefix}{stem}"), &text));
        }
    }
 }
@@ -152,7 +147,7 @@ impl Frontmatter {
    }

    /// `description`, else the body's first line.
-    fn command(&self, name: String, text: &str, source: AgentCommandSource) -> AgentCommand {
+    fn command(&self, name: String, text: &str) -> AgentCommand {
        let description = self.get("description").filter(|d| !d.is_empty()).map(str::to_owned).unwrap_or_else(|| {
            let body = text.get(self.body..).unwrap_or_default();
            body.lines()
@@ -163,7 +158,6 @@ impl Frontmatter {
        });
        AgentCommand {
            name,
-            source,
            description: truncate(&description),
            hint: self.get("argument-hint").filter(|h| !h.is_empty()).map(str::to_owned),
        }
@@ -200,20 +194,13 @@ mod tests {
    }

    fn cmd(name: &str, description: &str) -> AgentCommand {
-        AgentCommand {
-            name: name.into(),
-            description: description.into(),
-            hint: None,
-            source: AgentCommandSource::Command,
-        }
+        AgentCommand { name: name.into(), description: description.into(), hint: None }
    }

    #[test]
    fn project_and_user_skills_and_commands() {
        let tmp = tempfile::tempdir().unwrap();
-        // Home is an ancestor of the project, so the walk stops there instead of climbing
-        // past it into the real profile (a temp dir under the user's home holds its skills).
-        let home = tmp.path().to_path_buf();
+        let home = tmp.path().join("home");
        let repo = tmp.path().join("work").join("idea");
        let skills = repo.join(".claude/skills");
        write(
@@ -240,12 +227,6 @@ mod tests {
            ["issue-fix", "triage", "verify", "git:commit", "review", "parent", "lint", "brooks-review"]
        );
        let by = |n: &str| found.iter().find(|c| c.name == n).unwrap();
-        for name in ["issue-fix", "triage", "verify", "lint"] {
-            assert_eq!(by(name).source, AgentCommandSource::Skill);
-        }
-        for name in ["git:commit", "review", "parent", "brooks-review"] {
-            assert_eq!(by(name).source, AgentCommandSource::Command);
-        }
        assert_eq!(by("triage").description, "One pass over open issues and PRs");
        assert_eq!(by("issue-fix").description, "Fix an issue");
        assert_eq!(by("verify").description, "Build and drive the app");
@@ -281,14 +262,10 @@ mod tests {
    fn the_agents_entries_win() {
        let merged = merge(
            vec![cmd("triage", "from the agent"), cmd("compact", "Compact")],
-            vec![
-                AgentCommand { source: AgentCommandSource::Skill, ..cmd("triage", "from disk") },
-                cmd("verify", "Verify"),
-            ],
+            vec![cmd("triage", "from disk"), cmd("verify", "Verify")],
        );
        assert_eq!(names(&merged), ["triage", "compact", "verify"]);
        assert_eq!(merged[0].description, "from the agent");
-        assert_eq!(merged[0].source, AgentCommandSource::Skill);
    }

    #[test]
@@ -290,8 +290,7 @@ impl Timeline {
    /// and records when the turn ended (`done`) on the message that started it.
    pub fn end_turn(&mut self, done: Option<f64>) -> Vec<usize> {
        let mut changed = Vec::new();
-        // A steered message rides along in a running turn; the one that started it owns its end.
-        let started = self.entries.iter().rposition(|e| matches!(e, AgentEntry::User { steered: false, .. }));
+        let started = self.entries.iter().rposition(|e| matches!(e, AgentEntry::User { .. }));
        for (i, e) in self.entries.iter_mut().enumerate() {
            match e {
                AgentEntry::User { done_ms, .. } if Some(i) == started && done.is_some() && done_ms.is_none() => {
@@ -438,7 +437,6 @@ mod tests {
        t.push(AgentEntry::Permission {
            id: 1,
            title: "Run?".into(),
-            command: None,
            options: vec![],
            questions: vec![],
            chosen: None,
@@ -470,27 +468,6 @@ mod tests {
        assert_eq!(t.end_turn(Some(9.0)), Vec::<usize>::new());
    }

-    #[test]
-    fn end_turn_records_on_the_message_that_started_the_turn() {
-        let user = |sent: f64, steered: bool| AgentEntry::User {
-            text: "q".into(),
-            attachments: vec![],
-            images: vec![],
-            sent_ms: Some(sent),
-            done_ms: None,
-            steered,
-        };
-        let mut t = Timeline::default();
-        t.push(user(1.0, false));
-        t.push(AgentEntry::Agent { text: "a".into() });
-        t.push(user(2.0, true));
-        // The steered message rides along in the turn: the reply's time belongs to the
-        // message that started it.
-        assert_eq!(t.end_turn(Some(5.0)), vec![0]);
-        assert!(matches!(t.entries[0], AgentEntry::User { done_ms: Some(5.0), .. }));
-        assert!(matches!(t.entries[2], AgentEntry::User { done_ms: None, .. }));
-    }
-
    #[test]
    fn long_output_keeps_its_tail() {
        let s = tail("é".repeat(MAX_OUTPUT));
@@ -7,9 +7,7 @@ license.workspace = true

 [dependencies]
 blake3.workspace = true
-chardetng.workspace = true
 dunce.workspace = true
-encoding_rs.workspace = true
 ide-core.workspace = true
 zip.workspace = true
 serde.workspace = true
@@ -79,26 +79,23 @@ fn scan(
    Ok(())
 }

-/// One planned step as fingerprinted: resolved program, args, cwd and env.
-type StepFingerprint = (PathBuf, Vec<String>, PathBuf, BTreeMap<String, String>);
-
-/// Environment, planned steps and input paths shared by every Maven build
-/// fingerprint: the filtered process environment plus the wrapper, settings
-/// and JDK files the planned invocation reads.
-struct Collected {
-    inputs: Vec<PathBuf>,
-    environment: BTreeMap<String, String>,
-    steps: Vec<StepFingerprint>,
-    inherited_hash: u64,
-}
-
-fn collect(
+/// `None` means an input cannot be resolved safely: build normally without reuse.
+/// All filesystem work belongs on the caller's blocking thread.
+pub fn launch_fingerprint(
    root: &Path,
-    projects: &[&maven::MavenProject],
-    plan: &BuildPlan,
+    model: &BuildModel,
+    module: &Path,
+    test: bool,
    local_repo: Option<PathBuf>,
-) -> IdeResult<Option<Collected>> {
-    let Some(mut inputs) = maven::launch_inputs(root, projects, local_repo) else { return Ok(None) };
+    cancel: &CancellationToken,
+) -> IdeResult<Option<LaunchFingerprint>> {
+    let Some(m) = &model.maven else { return Ok(None) };
+    let projects = maven_launch_projects(root, m, module, test);
+    if projects.is_empty() {
+        return Ok(None);
+    }
+    let Some(mut inputs) = maven::launch_inputs(root, &projects, local_repo) else { return Ok(None) };
+    let plan = launch_plan(root, model, module, test)?;
    let mut environment: BTreeMap<String, String> = std::env::vars()
        .map(|(key, value)| (key.to_ascii_uppercase(), value))
        .filter(|(key, _)| {
@@ -168,132 +165,23 @@ fn collect(
            Path::new(home).join(if cfg!(windows) { "bin/java.exe" } else { "bin/java" }),
        ]);
    }
-    let steps = plan
-        .steps
-        .iter()
-        .map(|s| (process::program_path(&s.program, &s.env), s.args.clone(), s.cwd.clone(), s.env.clone()))
-        .collect();
+    let steps: Vec<_> =
+        plan.steps.iter().map(|s| (process::program_path(&s.program, &s.env), &s.args, &s.cwd, &s.env)).collect();
    // Profiles and plugins can read arbitrary environment variables. Keep a signature
    // of the inherited environment without persisting unrelated credentials.
    let inherited: BTreeMap<_, _> = std::env::vars_os().collect();
    let mut inherited_hash = std::hash::DefaultHasher::new();
    inherited.hash(&mut inherited_hash);
-    Ok(Some(Collected { inputs, environment, steps, inherited_hash: inherited_hash.finish() }))
-}
-
-/// Scans every input, storing project inputs relative to the project.
-fn scan_all(
-    root: &Path,
-    inputs: Vec<PathBuf>,
-    cancel: &CancellationToken,
-) -> IdeResult<BTreeMap<PathBuf, Option<Stamp>>> {
+    let parameters =
+        serde_json::to_string(&(root, module, test, steps, environment, inherited_hash.finish(), projects))
+            .map_err(|e| IdeError::internal(e.to_string()))?;
    let mut files = BTreeMap::new();
    for path in inputs {
        scan(root, &path, &mut files, &mut HashSet::new(), cancel)?;
    }
    // Store project inputs relative to the project, including each file's relative path.
-    Ok(files.into_iter().map(|(p, stamp)| (p.strip_prefix(root).unwrap_or(&p).to_path_buf(), stamp)).collect())
-}
-
-/// `None` means an input cannot be resolved safely: build normally without reuse.
-/// All filesystem work belongs on the caller's blocking thread.
-pub fn launch_fingerprint(
-    root: &Path,
-    model: &BuildModel,
-    module: &Path,
-    test: bool,
-    local_repo: Option<PathBuf>,
-    cancel: &CancellationToken,
-) -> IdeResult<Option<LaunchFingerprint>> {
-    let Some(m) = &model.maven else { return Ok(None) };
-    let projects = maven_launch_projects(root, m, module, test);
-    if projects.is_empty() {
-        return Ok(None);
-    }
-    let plan = launch_plan(root, model, module, test, BuildKind::Build)?;
-    let Some(collected) = collect(root, &projects, &plan, local_repo)? else { return Ok(None) };
-    let Collected { inputs, environment, steps, inherited_hash } = collected;
-    let parameters = serde_json::to_string(&(root, module, test, steps, environment, inherited_hash, projects))
-        .map_err(|e| IdeError::internal(e.to_string()))?;
-    Ok(Some(LaunchFingerprint { version: 2, parameters, files: scan_all(root, inputs, cancel)? }))
-}
-
-/// Inputs fingerprint of a menu build (`Build Project` / `Build Module`): the
-/// built modules' sources, resources and POM chain plus the exact planned
-/// steps, so an unchanged project skips Maven entirely (#2476). Only `Build`
-/// callers reuse it, never `Rebuild` or `Artifacts`; `None` disables reuse.
-/// All filesystem work belongs on the caller's blocking thread.
-pub fn menu_fingerprint(
-    root: &Path,
-    model: &BuildModel,
-    file: Option<&Path>,
-    cancel: &CancellationToken,
-) -> IdeResult<Option<LaunchFingerprint>> {
-    let plan = plan(root, model, BuildKind::Build, file, None)?;
-    if plan.system != BuildSystem::Maven {
-        return Ok(None);
-    }
-    let Some(m) = &model.maven else { return Ok(None) };
-    let projects: Vec<&maven::MavenProject> = match file {
-        Some(file) => {
-            // The innermost linked project owning the file, as in single-file compilation.
-            let rel = rel_str(root, file);
-            let module = m
-                .projects
-                .iter()
-                .filter(|p| rel == p.dir || rel.starts_with(&format!("{}/", p.dir)) || p.dir.is_empty())
-                .max_by_key(|p| p.dir.len());
-            match module {
-                Some(project) if project.packaging != "pom" => {
-                    maven_launch_projects(root, m, &subdir(root, &project.dir), true)
-                }
-                _ => return Ok(None),
-            }
-        }
-        // A project build walks every linked project.
-        None => m.projects.iter().collect(),
-    };
-    if projects.is_empty() {
-        return Ok(None);
-    }
-    let Some(collected) = collect(root, &projects, &plan, None)? else { return Ok(None) };
-    let Collected { inputs, environment, steps, inherited_hash } = collected;
-    let scope = file.map(|f| rel_str(root, f));
-    let parameters = serde_json::to_string(&("menu-build", scope, steps, environment, inherited_hash))
-        .map_err(|e| IdeError::internal(e.to_string()))?;
-    Ok(Some(LaunchFingerprint { version: 2, parameters, files: scan_all(root, inputs, cancel)? }))
-}
-
-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
-    /// skip these sources as "unchanged", so the rebuild the fingerprint triggers
-    /// compiles nothing and the stale outputs get re-recorded as fresh. Callers
-    /// re-stamp the returned paths before building. Inputs without a content hash
-    /// (directories, files outside the project) are never reported.
-    pub fn mtime_preserved_edits(&self, current: &Self) -> Vec<PathBuf> {
-        let mut edits = Vec::new();
-        for (path, current_stamp) in &current.files {
-            let Some(current_stamp) = current_stamp else { continue };
-            let Some(previous_stamp) = self.files.get(path).and_then(|stamp| stamp.as_ref()) else { continue };
-            let (len, mtime, Some(current_hash)) = current_stamp else { continue };
-            let (prev_len, prev_mtime, Some(prev_hash)) = previous_stamp else { continue };
-            if current_hash != prev_hash && len == prev_len && mtime == prev_mtime {
-                edits.push(path.clone());
-            }
-        }
-        edits.sort();
-        edits
-    }
+    let files = files.into_iter().map(|(p, stamp)| (p.strip_prefix(root).unwrap_or(&p).to_path_buf(), stamp)).collect();
+    Ok(Some(LaunchFingerprint { version: 2, parameters, files }))
 }

 #[cfg(test)]
@@ -394,60 +282,6 @@ mod tests {
        assert_ne!(before, after, "a same-length, same-mtime content change must invalidate the fingerprint");
    }

-    #[test]
-    fn mtime_preserved_edits_only_reports_lying_timestamps() {
-        fn stamp(len: u64, hash: &str) -> Option<Stamp> {
-            Some((len, SystemTime::UNIX_EPOCH + std::time::Duration::from_secs(42), Some(hash.into())))
-        }
-        fn prints(
-            previous: BTreeMap<PathBuf, Option<Stamp>>,
-            current: BTreeMap<PathBuf, Option<Stamp>>,
-        ) -> Vec<PathBuf> {
-            let previous = LaunchFingerprint { version: 2, parameters: String::new(), files: previous };
-            let current = LaunchFingerprint { version: 2, parameters: String::new(), files: current };
-            previous.mtime_preserved_edits(&current)
-        }
-        // Same length and mtime, different content: the builder would skip it.
-        assert_eq!(
-            prints([("a.java".into(), stamp(5, "old"))].into(), [("a.java".into(), stamp(5, "new"))].into()),
-            vec![PathBuf::from("a.java")]
-        );
-        // A normal edit bumps the mtime: the builder already sees it.
-        let mut touched = stamp(5, "new").unwrap();
-        touched.1 += std::time::Duration::from_secs(1);
-        assert!(
-            prints([("a.java".into(), stamp(5, "old"))].into(), [("a.java".into(), Some(touched))].into()).is_empty()
-        );
-        // Added, deleted, and hash-less inputs (directories, files outside the
-        // project) carry no comparable content: never reported.
-        assert!(
-            prints(
-                [("gone.java".into(), stamp(5, "old")), ("dir".into(), None)].into(),
-                [("new.java".into(), stamp(5, "new")), ("dir".into(), None)].into()
-            )
-            .is_empty()
-        );
-    }
-
-    #[test]
-    fn lying_source_is_found_against_a_real_fingerprint() {
-        let dir = tempfile::tempdir().unwrap();
-        let root = dir.path();
-        let model = fixture(root);
-        let source = root.join("lib/src/main/kotlin/Channel.kt");
-        let before = fingerprint(root, &model).unwrap();
-        let mtime = fs::metadata(&source).unwrap().modified().unwrap();
-        // Same 5-byte length, different content, preserved mtime.
-        write(root, "lib/src/main/kotlin/Channel.kt", "valve");
-        fs::File::options().write(true).open(&source).unwrap().set_modified(mtime).unwrap();
-        let after = fingerprint(root, &model).unwrap();
-        assert_eq!(before.mtime_preserved_edits(&after), [PathBuf::from("lib/src/main/kotlin/Channel.kt")]);
-        // A normal edit (mtime advances) needs no repair.
-        write(root, "lib/src/main/kotlin/Channel.kt", "valve!");
-        let normal = fingerprint(root, &model).unwrap();
-        assert!(before.mtime_preserved_edits(&normal).is_empty());
-    }
-
    #[test]
    fn profile_options_jdk_goal_and_wrapper_invalidate_without_using_class_outputs() {
        let dir = tempfile::tempdir().unwrap();
@@ -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,18 +4,9 @@
 //! 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, module_classpath, single_file_classpath,
-    single_file_target,
-};
-pub use up_to_date::{menu_up_to_date, record_menu_build};
+pub use fingerprint::{LaunchFingerprint, launch_fingerprint};

 use crate::process::{self, Stream};
 use crate::{BuildModel, maven};
@@ -53,8 +44,6 @@ pub enum BuildSystem {
    TypeScript,
    #[serde(rename = "cmake")]
    CMake,
-    #[serde(rename = "dotnet")]
-    Dotnet,
 }

 /// One command of a build.
@@ -78,11 +67,6 @@ impl BuildStep {
        }
    }

-    /// A CMake configure/build invocation, parsed as compiler output in the Build view.
-    pub fn cmake(program: &str, args: Vec<String>, cwd: PathBuf, env: BTreeMap<String, String>) -> Self {
-        Self { program: program.into(), args, cwd, env, format: Format::Gcc }
-    }
-
    /// The command line as echoed in the console.
    pub fn display(&self) -> String {
        let program = Path::new(&self.program).file_name().map_or(self.program.clone(), |n| n.to_string_lossy().into());
@@ -167,11 +151,9 @@ fn detect_dir(dir: &Path, model: &BuildModel, root: &Path) -> Option<BuildSystem
        || has(dir, &["build.gradle", "build.gradle.kts", "settings.gradle", "settings.gradle.kts"])
    {
        Some(BuildSystem::Gradle)
-    } else if dotnet_target(dir).is_some() {
-        Some(BuildSystem::Dotnet)
    } else if has(dir, &["Cargo.toml"]) {
        Some(BuildSystem::Cargo)
-    } else if has(dir, &["go.mod", "go.work"]) {
+    } else if has(dir, &["go.mod"]) {
        Some(BuildSystem::Go)
    } else if has(dir, &["tsconfig.json", "package.json"]) {
        Some(BuildSystem::TypeScript)
@@ -229,7 +211,7 @@ pub fn plan(
        .or((!model.gradle.is_empty()).then_some(BuildSystem::Gradle))
        .or_else(|| model.maven.as_ref().filter(|m| !m.projects.is_empty()).map(|_| BuildSystem::Maven))
        .ok_or_else(|| {
-            IdeError::not_found("no supported build system (Maven, Gradle, .NET, Cargo, Go, TypeScript, CMake) found")
+            IdeError::not_found("no supported build system (Maven, Gradle, Cargo, Go, TypeScript, CMake) found")
        })?;
    let module = module_dir.as_deref().filter(|d| *d != root);
    let title = match module {
@@ -245,10 +227,9 @@ pub fn plan(
        BuildSystem::Gradle => gradle_steps(root, model, kind, module_dir.as_deref())?,
        BuildSystem::Cargo => cargo_steps(&dir, kind),
        // Go builds the file's package (a module holds many).
-        BuildSystem::Go => go_steps(file.and_then(Path::parent).unwrap_or(&dir), kind)?,
+        BuildSystem::Go => go_steps(file.and_then(Path::parent).unwrap_or(&dir), kind),
        BuildSystem::TypeScript => ts_steps(&dir, kind),
        BuildSystem::CMake => cmake_steps(&dir, kind, cmake.and_then(<[_]>::first)),
-        BuildSystem::Dotnet => dotnet_steps(&dir, kind)?,
    };
    Ok(BuildPlan { system, title, steps })
 }
@@ -272,26 +253,13 @@ 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"));
    }
    let step = |p: &maven::MavenProject, extra: &[String]| {
-        let mut s = BuildStep::new(
-            &p.command,
-            &["-B", "-Dstyle.color=never", maven::LOCAL_REPO_TRACKING_ARG],
-            &subdir(root, &p.dir),
-            Format::Maven,
-        );
+        let mut s = BuildStep::new(&p.command, &["-B", "-Dstyle.color=never"], &subdir(root, &p.dir), 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();
@@ -406,33 +374,7 @@ fn cmake_steps(dir: &Path, kind: BuildKind, profile: Option<&CMakeProfile>) -> V
    steps
 }

-fn go_steps(dir: &Path, kind: BuildKind) -> IdeResult<Vec<BuildStep>> {
-    if dir.join("go.work").is_file() {
-        let work_file = dunce::canonicalize(dir.join("go.work"))?;
-        let modules = ide_core::go::work_modules(&std::fs::read_to_string(dir.join("go.work"))?);
-        if modules.is_empty() {
-            return Err(IdeError::invalid("The Go workspace contains no modules"));
-        }
-        let mut steps = Vec::new();
-        for module in modules {
-            let module = dir.join(module);
-            if !module.join("go.mod").is_file() {
-                return Err(IdeError::not_found(format!("Go workspace module has no go.mod: {}", module.display())));
-            }
-            // Go compares workspace membership against cwd paths lexically.
-            let module = dunce::canonicalize(module)?;
-            let mut module_steps = go_module_steps(&module, kind);
-            for step in &mut module_steps {
-                step.env.insert("GOWORK".into(), work_file.to_string_lossy().into_owned());
-            }
-            steps.extend(module_steps);
-        }
-        return Ok(steps);
-    }
-    Ok(go_module_steps(dir, kind))
-}
-
-fn go_module_steps(dir: &Path, kind: BuildKind) -> Vec<BuildStep> {
+fn go_steps(dir: &Path, kind: BuildKind) -> Vec<BuildStep> {
    let module_root = dir.ancestors().find(|d| d.join("go.mod").is_file()).unwrap_or(dir);
    let target = if module_root == dir { "./...".to_owned() } else { format!("./{}/...", rel_str(module_root, dir)) };
    let mut args = vec!["build"];
@@ -456,33 +398,6 @@ fn has_build_script(dir: &Path) -> bool {
        .is_some_and(|v| v.pointer("/scripts/build").is_some_and(serde_json::Value::is_string))
 }

-/// The solution (`.sln` / `.slnx`) or project (`.csproj` / `.fsproj` / `.vbproj`) file `dir`
-/// builds: a solution first, then a project; the first by name when there are several.
-fn dotnet_target(dir: &Path) -> Option<PathBuf> {
-    let mut files: Vec<PathBuf> =
-        std::fs::read_dir(dir).ok()?.flatten().map(|e| e.path()).filter(|p| p.is_file()).collect();
-    files.sort();
-    let ext = |p: &Path| p.extension().map(|e| e.to_string_lossy().to_ascii_lowercase()).unwrap_or_default();
-    let solution = files.iter().find(|p| matches!(ext(p).as_str(), "sln" | "slnx"));
-    solution.or_else(|| files.iter().find(|p| matches!(ext(p).as_str(), "csproj" | "fsproj" | "vbproj"))).cloned()
-}
-
-/// `dotnet build` of the directory's solution or project; Rebuild skips incremental builds,
-/// Build Artifacts publishes. The summary that repeats every message is left out.
-fn dotnet_steps(dir: &Path, kind: BuildKind) -> IdeResult<Vec<BuildStep>> {
-    let target = dotnet_target(dir).ok_or_else(|| IdeError::not_found("no .NET solution or project found"))?;
-    let target = target.file_name().map_or_else(String::new, |n| n.to_string_lossy().into_owned());
-    let verb = if kind == BuildKind::Artifacts { "publish" } else { "build" };
-    let mut step = BuildStep::new("dotnet", &[verb, &target, "-nologo", "-clp:NoSummary"], dir, Format::Msbuild);
-    if kind == BuildKind::Rebuild {
-        step.args.push("--no-incremental".into());
-    }
-    // The classic console logger prints the canonical `file(line,col): error` lines; the
-    // terminal logger (.NET 8+) only appears on a terminal, but rules it out for older SDKs too.
-    step.env.insert("MSBUILDTERMINALLOGGER".into(), "off".into());
-    Ok(vec![step])
-}
-
 fn ts_steps(dir: &Path, kind: BuildKind) -> Vec<BuildStep> {
    let script = has_build_script(dir);
    if script && (kind == BuildKind::Artifacts || !dir.join("tsconfig.json").is_file()) {
@@ -826,7 +741,13 @@ pub fn launch_has_non_java_sources(root: &Path, model: &BuildModel, module: &Pat
    has_non_java_sources(module)
 }

-fn launch_plan(root: &Path, model: &BuildModel, module: &Path, test: bool, kind: BuildKind) -> IdeResult<BuildPlan> {
+fn launch_plan(root: &Path, model: &BuildModel, module: &Path, test: bool) -> IdeResult<BuildPlan> {
+    let kind = if model.maven.as_ref().is_some_and(|m| m.projects.iter().any(|p| subdir(root, &p.dir) == module)) {
+        // JDT may have left newer error stubs in Maven's output directories.
+        BuildKind::Rebuild
+    } else {
+        BuildKind::Build
+    };
    let mut plan = plan(root, model, kind, Some(module), None)?;
    if plan.system == BuildSystem::Maven && !test {
        for step in &mut plan.steps {
@@ -838,12 +759,6 @@ fn launch_plan(root: &Path, model: &BuildModel, module: &Path, test: bool, kind:
    Ok(plan)
 }

-#[derive(Debug)]
-pub struct LaunchBuild {
-    pub class_dirs: Vec<PathBuf>,
-    pub failure: Option<String>,
-}
-
 /// Compiles the module at `module` with its build system before a JVM launch and
 /// returns the class directories it wrote, to put ahead of the jdtls classpath.
 pub fn build_for_launch(
@@ -851,12 +766,11 @@ pub fn build_for_launch(
    model: &BuildModel,
    module: &Path,
    test: bool,
-    kind: BuildKind,
    cancel: &CancellationToken,
-) -> IdeResult<LaunchBuild> {
-    let plan = launch_plan(root, model, module, test, kind)?;
+) -> IdeResult<Vec<PathBuf>> {
+    let plan = launch_plan(root, model, module, test)?;
    let result = run(root, &plan, cancel, &|_| {})?;
-    let failure = if !result.success {
+    if !result.success {
        let errors: Vec<String> = result
            .messages
            .iter()
@@ -867,21 +781,17 @@ pub fn build_for_launch(
                _ => m.text.clone(),
            })
            .collect();
-        Some(format!("Build failed:\n{}", errors.join("\n")))
-    } else {
-        None
-    };
-    let class_dirs = if plan.system == BuildSystem::Maven
+        return Err(IdeError::internal(format!("Build failed:\n{}", errors.join("\n"))));
+    }
+    if plan.system == BuildSystem::Maven
        && let Some(m) = &model.maven
    {
-        maven_launch_projects(root, m, module, test)
+        return Ok(maven_launch_projects(root, m, module, test)
            .iter()
            .flat_map(|p| launch_class_dirs(plan.system, &subdir(root, &p.dir), test && subdir(root, &p.dir) == module))
-            .collect()
-    } else {
-        launch_class_dirs(plan.system, module, test)
-    };
-    Ok(LaunchBuild { class_dirs, failure })
+            .collect());
+    }
+    Ok(launch_class_dirs(plan.system, module, test))
 }

 fn launch_class_dirs(system: BuildSystem, module: &Path, test: bool) -> Vec<PathBuf> {
@@ -903,79 +813,6 @@ fn launch_class_dirs(system: BuildSystem, module: &Path, test: bool) -> Vec<Path

 #[cfg(test)]
 mod tests {
-    #[test]
-    fn go_workspace_build_commands_compile_members_with_local_dependencies() {
-        let Some(go) = ide_core::process::find_executable("go", &ide_core::tool_path::search_path()) else {
-            return;
-        };
-        let tmp = tempfile::tempdir().unwrap();
-        let root = &tmp.path().join("workspace");
-        write(root, "go.work", "go 1.22\nuse (\n ./app\n ./lib\n ../external\n)\n");
-        write(root, "lib/go.mod", "module example.com/lib\ngo 1.22\n");
-        write(root, "lib/lib.go", "package lib\nfunc Value() int { return 1 }\n");
-        write(root, "app/go.mod", "module example.com/app\ngo 1.22\nrequire example.com/lib v0.0.0\n");
-        write(root, "app/main.go", "package main\nimport \"example.com/lib\"\nfunc main(){_ = lib.Value()}\n");
-        write(root, "../external/go.mod", "module example.com/external\ngo 1.22\nrequire example.com/lib v0.0.0\n");
-        write(root, "../external/main.go", "package main\nimport \"example.com/lib\"\nfunc main(){_ = lib.Value()}\n");
-        // std canonicalization also exercises verbatim paths on Windows.
-        for root in [root.to_path_buf(), std::fs::canonicalize(root).unwrap()] {
-            let plan = plan(&root, &BuildModel::default(), BuildKind::Build, None, None).unwrap();
-            for step in plan.steps {
-                let result = std::process::Command::new(&go)
-                    .args(&step.args)
-                    .envs(&step.env)
-                    .env("GOPROXY", "off")
-                    .current_dir(&step.cwd)
-                    .output()
-                    .unwrap();
-                assert!(result.status.success(), "{step:?}: {}", String::from_utf8_lossy(&result.stderr));
-            }
-        }
-    }
-
-    #[test]
-    fn go_workspace_builds_every_use_module() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path().join("workspace");
-        write(&root, "go.work", "go 1.22\nuse (\n  ./api\n  \"./lib with spaces\"\n  ../shared\n)\n");
-        for module in ["api", "lib with spaces", "../shared"] {
-            write(&root.join(module), "go.mod", "module example.com/p\ngo 1.22\n");
-        }
-        // Cover native paths, Windows verbatim paths and non-normalized module paths.
-        let canonical = std::fs::canonicalize(&root).unwrap();
-        for root in [&root, &canonical, &canonical.join("..").join("workspace")] {
-            for kind in [BuildKind::Build, BuildKind::Rebuild, BuildKind::Artifacts] {
-                let p = plan(root, &BuildModel::default(), kind, None, None).unwrap();
-                assert_eq!(p.system, BuildSystem::Go);
-                assert_eq!(p.steps.len(), 3);
-                for (step, module) in p.steps.iter().zip(["api", "lib with spaces", "../shared"]) {
-                    assert_eq!(step.cwd, dunce::canonicalize(root.join(module)).unwrap());
-                    assert_eq!(
-                        step.env["GOWORK"],
-                        dunce::canonicalize(root.join("go.work")).unwrap().to_string_lossy()
-                    );
-                    let expected =
-                        if kind == BuildKind::Rebuild { vec!["build", "-a", "./..."] } else { vec!["build", "./..."] };
-                    assert_eq!(step.args, expected);
-                }
-            }
-        }
-        let member =
-            plan(&root, &BuildModel::default(), BuildKind::Build, Some(&root.join("api/pkg/a.go")), None).unwrap();
-        assert_eq!(member.steps.len(), 1);
-        assert_eq!(member.steps[0].cwd, root.join("api"));
-        assert_eq!(member.steps[0].args, ["build", "./pkg/..."]);
-        write(&root, "go.work", "use ./missing\n");
-        assert!(
-            plan(&root, &BuildModel::default(), BuildKind::Build, None, None)
-                .unwrap_err()
-                .to_string()
-                .contains("go.mod")
-        );
-        write(&root, "go.work", "go 1.22\n");
-        assert!(plan(&root, &BuildModel::default(), BuildKind::Build, None, None).is_err());
-    }
-
    #[test]
    fn independent_gradle_builds_keep_their_launchers_and_task_paths() {
        let wrapper = if cfg!(windows) { "gradlew.bat" } else { "gradlew" };
@@ -1082,22 +919,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();
@@ -1114,25 +935,9 @@ 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", "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,
-            [
-                "-B",
-                "-Dstyle.color=never",
-                maven::LOCAL_REPO_TRACKING_ARG,
-                "-Djacoco.skip=true",
-                "-pl",
-                "core",
-                "-am",
-                "clean",
-                "test-compile"
-            ]
-        );
+        assert_eq!(p.steps[0].args, ["-B", "-Dstyle.color=never", "-pl", "core", "-am", "clean", "test-compile"]);
        assert_eq!(p.steps[0].cwd, root);
        assert_eq!(p.title, "demo: build module 'core'");

@@ -1173,24 +978,6 @@ mod tests {
            ("pnpm", &["run".to_owned(), "build".to_owned()][..])
        );

-        // .NET: the solution, else the project; a module build is the file's project. An ASP.NET
-        // project's package.json (its front end) doesn't make it a TypeScript build.
-        let net = tmp.path().join("net");
-        write(&net, "App.sln", "");
-        write(&net, "src/Api/Api.csproj", "<Project/>");
-        write(&net, "src/Api/package.json", "{}");
-        write(&net, "src/Api/Program.cs", "");
-        let p = plan(&net, &BuildModel::default(), BuildKind::Build, None, None).unwrap();
-        assert_eq!(p.system, BuildSystem::Dotnet);
-        assert_eq!(p.steps[0].args, ["build", "App.sln", "-nologo", "-clp:NoSummary"]);
-        assert_eq!(p.steps[0].env["MSBUILDTERMINALLOGGER"], "off");
-        let p = plan(&net, &BuildModel::default(), BuildKind::Rebuild, Some(&net.join("src/Api/Program.cs")), None)
-            .unwrap();
-        assert_eq!(p.steps[0].args, ["build", "Api.csproj", "-nologo", "-clp:NoSummary", "--no-incremental"]);
-        assert_eq!(p.steps[0].cwd, net.join("src/Api"));
-        let p = plan(&net, &BuildModel::default(), BuildKind::Artifacts, None, None).unwrap();
-        assert_eq!(p.steps[0].args[0], "publish");
-
        let cm = tmp.path().join("cm");
        write(&cm, "CMakeLists.txt", "project(app)");
        let args = |p: &BuildPlan| p.steps.iter().map(|s| s.args.join(" ")).collect::<Vec<_>>();
@@ -1418,44 +1205,14 @@ mod tests {
        write(root, "app/pom.xml", "<project/>");
        let model = reactor_model();
        for (test, goal) in [(false, "compile"), (true, "test-compile")] {
-            // A normal launch is incremental: no `clean` (IDEA's Make, not Rebuild).
-            let plan = launch_plan(root, &model, &root.join("app"), test, BuildKind::Build).unwrap();
+            let plan = launch_plan(root, &model, &root.join("app"), test).unwrap();
            let step = &plan.steps[0];
            assert_eq!(step.cwd, root);
            assert_eq!(step.program, "mvnw");
            assert_eq!(step.env["JAVA_HOME"], "/jdk");
            assert_eq!(
                step.args,
-                [
-                    "-B",
-                    "-Dstyle.color=never",
-                    maven::LOCAL_REPO_TRACKING_ARG,
-                    "-s",
-                    "settings.xml",
-                    "-Djacoco.skip=true",
-                    "-pl",
-                    "app",
-                    "-am",
-                    goal
-                ]
-            );
-            // Rebuild cleans first, as IDEA's Rebuild does.
-            let plan = launch_plan(root, &model, &root.join("app"), test, BuildKind::Rebuild).unwrap();
-            assert_eq!(
-                plan.steps[0].args,
-                [
-                    "-B",
-                    "-Dstyle.color=never",
-                    maven::LOCAL_REPO_TRACKING_ARG,
-                    "-s",
-                    "settings.xml",
-                    "-Djacoco.skip=true",
-                    "-pl",
-                    "app",
-                    "-am",
-                    "clean",
-                    goal
-                ]
+                ["-B", "-Dstyle.color=never", "-s", "settings.xml", "-pl", "app", "-am", "clean", goal]
            );
        }
    }
@@ -1476,10 +1233,9 @@ mod tests {
        std::fs::set_permissions(&wrapper, std::fs::Permissions::from_mode(0o755)).unwrap();
        let mut model = reactor_model();
        model.maven.as_mut().unwrap().projects[0].command = wrapper.to_string_lossy().into_owned();
-        let dirs = build_for_launch(root, &model, &root.join("app"), true, BuildKind::Build, &CancellationToken::new())
-            .unwrap();
+        let dirs = build_for_launch(root, &model, &root.join("app"), true, &CancellationToken::new()).unwrap();
        assert_eq!(
-            dirs.class_dirs,
+            dirs,
            ["app/target/test-classes", "app/target/classes", "middle/target/classes", "lib/target/classes"]
                .map(|p| root.join(p))
        );
@@ -1488,16 +1244,12 @@ mod tests {
            "mvnw",
            "#!/bin/sh\necho '[ERROR] Kotlin compilation failed: unresolved reference broken' >&2\nexit 1\n",
        );
-        let error =
-            build_for_launch(root, &model, &root.join("app"), false, BuildKind::Build, &CancellationToken::new())
-                .unwrap()
-                .failure
-                .unwrap();
-        assert!(error.contains("Kotlin compilation failed"), "{error}");
+        let error = build_for_launch(root, &model, &root.join("app"), false, &CancellationToken::new()).unwrap_err();
+        assert!(error.message.contains("Kotlin compilation failed"), "{}", error.message);
        let cancel = CancellationToken::new();
        cancel.cancel();
        assert_eq!(
-            build_for_launch(root, &model, &root.join("app"), false, BuildKind::Build, &cancel).unwrap_err().kind,
+            build_for_launch(root, &model, &root.join("app"), false, &cancel).unwrap_err().kind,
            ide_core::error::ErrorKind::Cancelled
        );
    }
@@ -7,7 +7,6 @@
 //! [`super::resolve`] turns them into IDE coordinates.

 use ide_core::Severity;
-pub(crate) use ide_core::output_encoding::strip_ansi;
 use serde_json::Value;

 /// Output dialect of a build step.
@@ -25,8 +24,6 @@ pub(crate) enum Format {
    Go,
    /// GCC / Clang (through `cmake --build`): `src/a.cpp:12:5: error: msg`.
    Gcc,
-    /// MSBuild (`dotnet build`): `C:\p\A.cs(12,5): error CS1002: msg [C:\p\App.csproj]`.
-    Msbuild,
 }

 /// What a printed column counts.
@@ -101,6 +98,32 @@ pub(crate) struct OutputParser {
    pending: Option<Pending>,
 }

+/// Removes ANSI escape sequences (colour, cursor movement).
+pub(crate) fn strip_ansi(s: &str) -> String {
+    if !s.contains('\u{1b}') {
+        return s.to_owned();
+    }
+    let mut out = String::with_capacity(s.len());
+    let mut chars = s.chars().peekable();
+    while let Some(c) = chars.next() {
+        if c != '\u{1b}' {
+            out.push(c);
+            continue;
+        }
+        if chars.peek() == Some(&'[') {
+            chars.next();
+            for c in chars.by_ref() {
+                if c.is_ascii_alphabetic() || c == '~' {
+                    break;
+                }
+            }
+        } else {
+            chars.next();
+        }
+    }
+    out
+}
+
 fn num(s: &str) -> Option<u32> {
    s.trim().parse().ok().filter(|n| *n > 0)
 }
@@ -146,13 +169,6 @@ fn bracket_pos(s: &str) -> Option<(u32, Option<u32>, &str)> {
    Some((line, col, rest.trim_start()))
 }

-/// `/C:/p/A.java` → `C:/p/A.java`: Maven and file URIs put a `/` before the drive letter on Windows.
-/// Joined as is, it would become the drive-relative `C:p/A.java`.
-fn drive_path(p: &str) -> &str {
-    let b = p.as_bytes();
-    if b.len() > 2 && b[0] == b'/' && b[1].is_ascii_alphabetic() && b[2] == b':' { &p[1..] } else { p }
-}
-
 /// `file:///p/A.kt` → `/p/A.kt` (percent-decoded).
 fn from_file_uri(s: &str) -> String {
    let Some(rest) = s.strip_prefix("file://") else { return s.to_owned() };
@@ -171,7 +187,9 @@ fn from_file_uri(s: &str) -> String {
        out.push(bytes[i]);
        i += 1;
    }
-    drive_path(&String::from_utf8_lossy(&out)).to_owned()
+    let path = String::from_utf8_lossy(&out).into_owned();
+    // `file:///C:/x` on Windows.
+    if path.len() > 2 && path.as_bytes()[0] == b'/' && path.as_bytes()[2] == b':' { path[1..].to_owned() } else { path }
 }

 /// Kotlin: `file:///p/A.kt:12:5 msg` or `/p/A.kt: (12, 5): msg`, after the `e: ` / `w: ` prefix.
@@ -229,7 +247,7 @@ fn maven_line(line: &str) -> Option<RawMessage> {
        && looks_like_source_path(path)
        && let Some((ln, col, msg)) = bracket_pos(&format!("[{pos}"))
    {
-        return Some(RawMessage::new(severity, msg, ColUnit::Char).at(drive_path(path), ln, col));
+        return Some(RawMessage::new(severity, msg, ColUnit::Char).at(path, ln, col));
    }
    if let Some(m) = kotlin_line(rest) {
        return Some(m);
@@ -270,43 +288,6 @@ fn tsc_line(line: &str) -> Option<RawMessage> {
    Some(m)
 }

-/// MSBuild's canonical form: `path(12,5): error CS1002: msg [project]`, `path(12,5,12,9): …`,
-/// or `path : error NU1101: msg [project]` for a project-level message (no position).
-/// The path may contain spaces (`C:\Users\Jane Doe\…`); "error" / "warning" are never localized.
-fn msbuild_line(line: &str) -> Option<RawMessage> {
-    let line = line.trim();
-    // The project the message came from, appended by the console logger.
-    let line = match line.rfind(" [") {
-        Some(i) if line.ends_with(']') => &line[..i],
-        _ => line,
-    };
-    let (head, severity, rest) =
-        [(" error ", Severity::Error), (" warning ", Severity::Warning)].into_iter().find_map(|(word, severity)| {
-            let i = line.find(&format!(":{word}"))?;
-            Some((&line[..i], severity, &line[i + word.len() + 1..]))
-        })?;
-    let (code, msg) = rest.split_once(':')?;
-    let code = code.trim();
-    if code.is_empty() || code.contains(' ') {
-        return None;
-    }
-    let head = head.trim_end();
-    let (path, pos) = match head.strip_suffix(')').and_then(|h| h.rsplit_once('(')) {
-        Some((path, pos)) => (path, pos.split(',').map(num).collect::<Vec<_>>()),
-        None => (head, Vec::new()),
-    };
-    let at = |i: usize| pos.get(i).copied().flatten();
-    // `MSBUILD : error MSB1009` and the like name no file.
-    let file = path.rsplit(['/', '\\']).next().is_some_and(|n| n.contains('.'));
-    let mut m = RawMessage::new(severity, msg.trim(), ColUnit::Utf16);
-    if file {
-        m.path = Some(path.trim().to_owned());
-        (m.line, m.col, m.end_line, m.end_col) = (at(0), at(1), at(2), at(3));
-    }
-    m.code = Some(code.to_owned());
-    Some(m)
-}
-
 /// go: `./a.go:12:5: msg` (errors only; `go vet` style `a.go:12: msg` too).
 fn go_line(line: &str) -> Option<RawMessage> {
    let (path, ln, col, rest) = path_line_col(line)?;
@@ -443,7 +424,6 @@ impl OutputParser {
            Format::Tsc => tsc_line(&line),
            Format::Go => go_line(&line),
            Format::Gcc => gcc_line(&line),
-            Format::Msbuild => msbuild_line(&line),
            Format::Cargo => None,
        };
        if let Some(msg) = parsed {
@@ -501,20 +481,6 @@ mod tests {
        assert_eq!(out[1].unit, ColUnit::Char);
    }

-    #[test]
-    fn maven_windows_paths_drop_the_slash_before_the_drive() {
-        let out = parse(
-            Format::Maven,
-            "[ERROR] /C:/dev/p/src/main/java/a/A.java:[18,41] package a.b does not exist\n\
-             [ERROR] C:\\dev\\p\\B.java:[3,8] cannot find symbol\n\
-             [ERROR] file:///C:/dev/p/K.kt:4:9 Unresolved reference 'x'.\n",
-        );
-        assert_eq!(out.len(), 3, "{out:?}");
-        assert_eq!(pos(&out[0]), (Severity::Error, "C:/dev/p/src/main/java/a/A.java", 18, Some(41)));
-        assert_eq!(pos(&out[1]), (Severity::Error, "C:\\dev\\p\\B.java", 3, Some(8)));
-        assert_eq!(pos(&out[2]), (Severity::Error, "C:/dev/p/K.kt", 4, Some(9)));
-    }
-
    #[test]
    fn maven_detail_lines_with_level_prefix_and_kotlin() {
        let out = parse(
@@ -591,27 +557,6 @@ mod tests {
        assert!(plain.messages.is_empty() && plain.console.is_none());
    }

-    #[test]
-    fn msbuild_canonical_messages() {
-        let out = parse(
-            Format::Msbuild,
-            "  Determining projects to restore...\n\
-             C:\\Users\\Jane Doe\\App\\Program.cs(12,5): error CS1002: ; expected [C:\\Users\\Jane Doe\\App\\App.csproj]\n\
-             /p/App/Models/User.cs(3,8,3,12): warning CS0168: The variable 'e' is declared but never used [/p/App/App.csproj]\n\
-             /p/App/App.csproj : error NU1101: Unable to find package Foo. [/p/App/App.csproj]\n\
-             MSBUILD : error MSB1009: Project file does not exist.\n\
-             Build FAILED.\n",
-        );
-        assert_eq!(out.len(), 4, "{out:?}");
-        assert_eq!(pos(&out[0]), (Severity::Error, "C:\\Users\\Jane Doe\\App\\Program.cs", 12, Some(5)));
-        assert_eq!((out[0].code.as_deref(), out[0].text.as_str()), (Some("CS1002"), "; expected"));
-        assert_eq!(pos(&out[1]), (Severity::Warning, "/p/App/Models/User.cs", 3, Some(8)));
-        assert_eq!((out[1].end_line, out[1].end_col), (Some(3), Some(12)));
-        assert_eq!((out[2].path.as_deref(), out[2].line), (Some("/p/App/App.csproj"), None));
-        assert_eq!(out[2].text, "Unable to find package Foo.");
-        assert_eq!((out[3].path.as_deref(), out[3].code.as_deref()), (None, Some("MSB1009")));
-    }
-
    #[test]
    fn tsc_plain_and_pretty() {
        let out = parse(
@@ -1,538 +0,0 @@
-//! Single-file Java compilation with `javac` for the Compile File action (#2476).
-//!
-//! A module build (`-pl … -am`) still walks every upstream module, and packaging
-//! walks the whole reactor; compiling one file only needs that file's module
-//! outputs plus its dependency classpath, which is much faster to assemble.
-use super::*;
-use serde::{Deserialize, Serialize};
-use std::fs;
-use std::process::Command as ProcCommand;
-
-/// Output file of the `dependency:build-classpath` probe, relative to each module.
-const CP_FILE: &str = "target/ide-compile-cp.txt";
-
-/// The resolved dependency classpath for one module and scope, tied to the same
-/// inputs as its launch build so POM, JDK, settings and profile changes invalidate it.
-#[derive(Debug, Deserialize, Serialize)]
-struct CachedClasspath {
-    fingerprint: LaunchFingerprint,
-    classpath: String,
-}
-
-/// A `.java` source and the module build that compiles it.
-pub struct SingleFileTarget {
-    /// Absolute module directory.
-    pub module: PathBuf,
-    /// The source is under `src/test`: compile to test classes with the test classpath.
-    pub test: bool,
-    /// Absolute `target/classes` (or `target/test-classes`).
-    pub out_dir: PathBuf,
-    /// Reactor root building the module (owns the Maven command and options).
-    pub top: maven::MavenProject,
-    /// `-pl` value of the module relative to the reactor root; empty when the
-    /// module is the root itself.
-    pub pl: String,
-    /// `maven.compiler.release` (or equivalent) of the module's project.
-    pub java_version: Option<u32>,
-}
-
-/// Locates the linked Maven module owning a `.java` source file.
-pub fn single_file_target(root: &Path, model: &BuildModel, file: &Path) -> IdeResult<SingleFileTarget> {
-    if file.extension().is_none_or(|ext| ext != "java") {
-        return Err(IdeError::invalid("only Java sources can be compiled as a single file"));
-    }
-    if !file.is_file() {
-        return Err(IdeError::not_found("no Java source found for single-file compilation"));
-    }
-    let Some(m) = &model.maven else {
-        return Err(IdeError::not_found("no linked Maven project found for module"));
-    };
-    // The innermost project whose directory contains the file owns it; the
-    // aggregator root (`""`) is a prefix of everything, so take the longest match.
-    let rel = rel_str(root, file);
-    let project = m
-        .projects
-        .iter()
-        .filter(|p| rel == p.dir || rel.starts_with(&format!("{}/", p.dir)) || p.dir.is_empty())
-        .max_by_key(|p| p.dir.len())
-        .ok_or_else(|| IdeError::not_found("no linked Maven project found for module"))?;
-    if project.packaging == "pom" {
-        // An aggregator owns no sources itself: a file that only matches it
-        // belongs to no linked module.
-        return Err(IdeError::not_found("no linked Maven project found for module"));
-    }
-    let module = subdir(root, &project.dir);
-    let top = maven_reactor(m, &project.dir)
-        .ok_or_else(|| IdeError::not_found("no linked Maven project found for module"))?;
-    let top_dir = subdir(root, &top.dir);
-    let pl = module.strip_prefix(&top_dir).map(|r| r.to_string_lossy().replace('\\', "/")).unwrap_or_default();
-    // Test sources see the test classpath and compile into test classes.
-    let parts: Vec<&str> = rel.split('/').collect();
-    let test = parts.windows(2).any(|w| w == ["src", "test"]);
-    let out_dir = module.join("target").join(if test { "test-classes" } else { "classes" });
-    Ok(SingleFileTarget { module, test, out_dir, top: top.clone(), pl, java_version: project.java_version })
-}
-
-/// The Maven reactor target for a launch module whose source file is not known yet.
-fn module_target(root: &Path, model: &BuildModel, module: &Path, test: bool) -> IdeResult<SingleFileTarget> {
-    let Some(m) = &model.maven else {
-        return Err(IdeError::not_found("no linked Maven project found for module"));
-    };
-    let module = if module.is_absolute() { module.to_path_buf() } else { root.join(module) };
-    let project = m
-        .projects
-        .iter()
-        .find(|p| root.join(&p.dir) == module)
-        .ok_or_else(|| IdeError::not_found("no linked Maven project found for module"))?;
-    if project.packaging == "pom" {
-        return Err(IdeError::not_found("the launch module is a Maven aggregator without sources"));
-    }
-    let top = maven_reactor(m, &project.dir)
-        .ok_or_else(|| IdeError::not_found("no linked Maven reactor found for module"))?;
-    let top_dir = subdir(root, &top.dir);
-    let pl = module.strip_prefix(&top_dir).map(|r| r.to_string_lossy().replace('\\', "/")).unwrap_or_default();
-    let out_dir = module.join("target").join(if test { "test-classes" } else { "classes" });
-    Ok(SingleFileTarget { module, test, out_dir, top: top.clone(), pl, java_version: project.java_version })
-}
-
-/// `javac` for the module: its `JAVA_HOME`, else `PATH`.
-pub fn find_javac(env: &BTreeMap<String, String>) -> String {
-    let home = env.get("JAVA_HOME").map(Path::new);
-    let exe = if cfg!(windows) { "javac.exe" } else { "javac" };
-    if let Some(javac) = home.map(|h| h.join("bin").join(exe)).filter(|p| p.is_file()) {
-        return javac.to_string_lossy().into_owned();
-    }
-    exe.to_owned()
-}
-
-/// Dependency classpath of the module: existing reactor class directories plus
-/// `mvn dependency:build-classpath` (which resolves without compiling anything,
-/// so `-am` stays cheap). Entries are platform-separated (`;` on Windows).
-pub fn single_file_classpath(root: &Path, model: &BuildModel, target: &SingleFileTarget) -> IdeResult<String> {
-    classpath(root, model, target, "test", false)
-}
-
-/// Runtime (or test) dependency classpath for a launch module.
-///
-/// The Java language server runs on its own JDK, so its Maven model can select a
-/// different JDK profile and dependency classifier than the project launch. Use the
-/// same Maven process that builds the module instead.
-pub fn module_classpath(
-    root: &Path,
-    model: &BuildModel,
-    module: &Path,
-    test: bool,
-    local_repo: Option<PathBuf>,
-    cache: &Path,
-    cancel: &ide_core::CancellationToken,
-) -> IdeResult<String> {
-    let target = module_target(root, model, module, test)?;
-    let fingerprint = launch_fingerprint(root, model, &target.module, test, local_repo, cancel)?;
-    let cache_path = classpath_cache_path(root, cache, &target.module, test);
-    if let (Some(fingerprint), Some(path)) = (&fingerprint, &cache_path)
-        && let Ok(bytes) = fs::read(path)
-        && let Ok(cached) = serde_json::from_slice::<CachedClasspath>(&bytes)
-        && cached.fingerprint == *fingerprint
-        && classpath_entries_exist(root, &cached.classpath)
-    {
-        return Ok(cached.classpath);
-    }
-    let classpath = classpath(root, model, &target, if test { "test" } else { "runtime" }, true)?;
-    if cancel.is_cancelled() {
-        return Err(IdeError::cancelled());
-    }
-    if let (Some(fingerprint), Some(path)) = (fingerprint, cache_path) {
-        let cached = CachedClasspath { fingerprint, classpath: classpath.clone() };
-        if let Err(error) = cache_classpath(&path, &cached) {
-            tracing::debug!(path = %path.display(), %error, "Cannot cache the Java launch classpath");
-        }
-    }
-    Ok(classpath)
-}
-
-/// One cache file per module and scope. Mirroring the module path keeps nested
-/// modules and their different dependency scopes from overwriting each other.
-fn classpath_cache_path(root: &Path, cache: &Path, module: &Path, test: bool) -> Option<PathBuf> {
-    let relative = module.strip_prefix(root).ok()?;
-    let mut path = cache.join("java-launch/classpaths");
-    path.push(if relative.as_os_str().is_empty() { Path::new("_root") } else { relative });
-    path.push(if test { "test.json" } else { "runtime.json" });
-    Some(path)
-}
-
-/// Best-effort cache persistence. A failed write only costs one later Maven
-/// probe, so the launch still succeeds even when the cache directory is unusable.
-fn cache_classpath(path: &Path, cached: &CachedClasspath) -> IdeResult<()> {
-    if let Some(parent) = path.parent() {
-        fs::create_dir_all(parent)?;
-    }
-    fs::write(path, serde_json::to_vec(cached).map_err(|e| IdeError::internal(e.to_string()))?)?;
-    Ok(())
-}
-
-/// A cache entry stays valid while every file exists. Maven also emits reactor
-/// output directories for modules with no classes, which may legitimately never be
-/// created; the launch snapshot already supplies the module's classes in that case.
-fn classpath_entries_exist(root: &Path, classpath: &str) -> bool {
-    // Temp directories on macOS are commonly reached through `/var`, while Maven
-    // reports the canonical `/private/var` path. Compare against both spellings.
-    let canonical_root = dunce::canonicalize(root).unwrap_or_else(|_| root.to_path_buf());
-    std::env::split_paths(classpath).all(|entry| {
-        entry.exists()
-            || ((entry.starts_with(root) || entry.starts_with(&canonical_root))
-                && (entry.ends_with(Path::new("target/classes")) || entry.ends_with(Path::new("target/test-classes"))))
-    })
-}
-
-fn classpath(
-    root: &Path,
-    model: &BuildModel,
-    target: &SingleFileTarget,
-    scope: &str,
-    compile_first: bool,
-) -> 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.
-        for project in maven_launch_projects(root, m, &target.module, target.test) {
-            let dir = subdir(root, &project.dir);
-            if dir == target.module {
-                continue;
-            }
-            for classes in ["target/classes", "target/test-classes"] {
-                let path = dir.join(classes);
-                if path.is_dir() {
-                    entries.push(path.to_string_lossy().into_owned());
-                }
-            }
-        }
-    }
-    let probe = CP_FILE;
-    let mut args = vec!["-B", "-Dstyle.color=never", maven::LOCAL_REPO_TRACKING_ARG];
-    args.extend(target.top.options.iter().map(String::as_str));
-    if !target.pl.is_empty() {
-        args.extend(["-pl", target.pl.as_str(), "-am"]);
-    }
-    let output_arg = format!("-Dmdep.outputFile={probe}");
-    let scope_arg = format!("-Dmdep.includeScope={scope}");
-    // A launch build may only have reached `compile`. Running `compile` in this
-    // same Maven session lets the dependency plugin resolve Reactor siblings from
-    // their target/classes without paying for package-phase plugins.
-    if compile_first {
-        args.push("compile");
-    }
-    args.extend(["dependency:build-classpath", output_arg.as_str(), scope_arg.as_str(), "-q"]);
-    let top_dir = subdir(root, &target.top.dir);
-    let status = ProcCommand::new(&target.top.command)
-        .args(&args)
-        .envs(&target.top.env)
-        .current_dir(&top_dir)
-        .output()
-        .map_err(|e| IdeError::internal(format!("cannot resolve the compile classpath: {e}")))?;
-    if !status.status.success() {
-        let stdout = String::from_utf8_lossy(&status.stdout);
-        let stderr = String::from_utf8_lossy(&status.stderr);
-        // Maven reports reactor/dependency failures on stdout, not only stderr.
-        let tail: Vec<&str> = stdout.lines().chain(stderr.lines()).filter(|l| !l.trim().is_empty()).collect();
-        let tail = tail.iter().rev().take(5).rev().cloned().collect::<Vec<_>>().join("\n");
-        return Err(IdeError::internal(format!("cannot resolve the compile classpath:\n{tail}")));
-    }
-    // With `-am` every visited module writes its own file; only this module's counts.
-    let cp_file = target.module.join(probe);
-    let content = fs::read_to_string(&cp_file).map_err(|e| {
-        IdeError::internal(format!("cannot resolve the compile classpath: {} ({e})", cp_file.display()))
-    })?;
-    let separator = if cfg!(windows) { ';' } else { ':' };
-    entries.extend(content.split([separator, '\n', '\r']).map(str::trim).filter(|e| !e.is_empty()).map(str::to_owned));
-    entries.dedup();
-    Ok(entries.join(&separator.to_string()))
-}
-
-/// The `javac` step compiling `file` into `target`'s output directory.
-pub fn javac_step(target: &SingleFileTarget, file: &Path, classpath: &str, javac: &str) -> IdeResult<BuildStep> {
-    fs::create_dir_all(&target.out_dir)
-        .map_err(|e| IdeError::internal(format!("cannot create {} ({e})", target.out_dir.display())))?;
-    let mut step = BuildStep::new(javac, &[], &target.module, Format::Gradle);
-    // Raw `javac` prints `path:line: error: …`, the same form Gradle forwards.
-    step.args.push("-encoding".into());
-    step.args.push("UTF-8".into());
-    step.args.push("-d".into());
-    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());
-    }
-    step.args.push(file.to_string_lossy().into_owned());
-    step.env = target.top.env.clone();
-    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)?;
-    let classpath = single_file_classpath(root, model, &target)?;
-    let javac = find_javac(&target.top.env);
-    let name = file.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default();
-    Ok(BuildPlan {
-        system: BuildSystem::Maven,
-        title: format!("Compile {name}"),
-        steps: vec![javac_step(&target, file, &classpath, &javac)?],
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn write(root: &Path, rel: &str, value: &str) {
-        let path = root.join(rel);
-        fs::create_dir_all(path.parent().unwrap()).unwrap();
-        fs::write(path, value).unwrap();
-    }
-
-    fn fixture(root: &Path) -> BuildModel {
-        write(
-            root,
-            "pom.xml",
-            r#"<project><groupId>demo</groupId><artifactId>parent</artifactId><version>1</version>
-            <packaging>pom</packaging><modules><module>lib</module><module>app</module></modules></project>"#,
-        );
-        write(
-            root,
-            "lib/pom.xml",
-            r#"<project><parent><groupId>demo</groupId><artifactId>parent</artifactId><version>1</version></parent>
-            <artifactId>lib</artifactId></project>"#,
-        );
-        write(
-            root,
-            "app/pom.xml",
-            r#"<project><parent><groupId>demo</groupId><artifactId>parent</artifactId><version>1</version></parent>
-            <artifactId>app</artifactId><dependencies><dependency><groupId>demo</groupId><artifactId>lib</artifactId><version>1</version></dependency></dependencies></project>"#,
-        );
-        write(root, "app/src/main/java/demo/Main.java", "class Main {}");
-        write(root, "app/src/test/java/demo/MainTest.java", "class MainTest {}");
-        write(root, "lib/target/classes/Lib.class", "built");
-        crate::load(root, &root.join("cache"), None)
-    }
-
-    #[test]
-    fn target_finds_the_owning_module_and_the_test_scope() {
-        let dir = tempfile::tempdir().unwrap();
-        let root = dir.path();
-        let model = fixture(root);
-        let main = single_file_target(root, &model, &root.join("app/src/main/java/demo/Main.java")).unwrap();
-        assert_eq!(main.module, root.join("app"));
-        assert!(!main.test);
-        assert_eq!(main.out_dir, root.join("app/target/classes"));
-        let test = single_file_target(root, &model, &root.join("app/src/test/java/demo/MainTest.java")).unwrap();
-        assert!(test.test);
-        assert_eq!(test.out_dir, root.join("app/target/test-classes"));
-    }
-
-    #[test]
-    fn target_rejects_non_java_missing_and_unlinked_files() {
-        let dir = tempfile::tempdir().unwrap();
-        let root = dir.path();
-        let model = fixture(root);
-        write(root, "app/pom.xml", "<project/>");
-        assert!(single_file_target(root, &model, &root.join("app/pom.xml")).is_err());
-        assert!(single_file_target(root, &model, &root.join("app/src/main/java/demo/Missing.java")).is_err());
-        write(root, "other/Main.java", "class Main {}");
-        assert!(single_file_target(root, &model, &root.join("other/Main.java")).is_err());
-    }
-
-    #[test]
-    fn javac_prefers_the_module_jdk_and_scopes_test_sources() {
-        let dir = tempfile::tempdir().unwrap();
-        let root = dir.path();
-        let model = fixture(root);
-        let file = root.join("app/src/test/java/demo/MainTest.java");
-        let target = single_file_target(root, &model, &file).unwrap();
-        let jdk = root.join("jdk");
-        fs::create_dir_all(jdk.join("bin")).unwrap();
-        let exe = if cfg!(windows) { "javac.exe" } else { "javac" };
-        fs::write(jdk.join("bin").join(exe), "fake").unwrap();
-        let mut target = target;
-        target.top.env.insert("JAVA_HOME".into(), jdk.to_string_lossy().into_owned());
-        let step = javac_step(&target, &file, "/repo/a.jar", &find_javac(&target.top.env)).unwrap();
-        assert!(step.program.ends_with(exe));
-        assert!(target.out_dir.is_dir());
-        let args = step.args.join(" ");
-        assert!(args.contains("-encoding UTF-8"), "{args}");
-        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);
-    }
-
-    /// The classpath probe runs the project's Maven command with `-pl … -am`
-    /// `dependency:build-classpath`; the fake `mvnw` below only records its
-    /// arguments and writes a canned classpath file for the `-pl` module.
-    #[cfg(unix)]
-    #[test]
-    fn classpath_probe_writes_one_file_per_module_and_reads_the_compiled_one() {
-        use std::os::unix::fs::PermissionsExt;
-
-        let dir = tempfile::tempdir().unwrap();
-        let root = dir.path();
-        fixture(root);
-        let script = root.join("mvnw");
-        fs::write(
-            &script,
-            "#!/bin/sh\nprintf '%s\\n' \"$@\" > args.txt\npl='.'\nwhile [ $# -gt 0 ]; do\nif [ \"$1\" = \"-pl\" ]; then pl=\"$2\"; shift 2; else shift; fi\ndone\nmkdir -p \"$pl/target\"\nprintf '/repo/a.jar:/repo/b.jar' > \"$pl/target/ide-compile-cp.txt\"\n",
-        )
-        .unwrap();
-        fs::set_permissions(&script, fs::Permissions::from_mode(0o755)).unwrap();
-        let model = crate::load(root, &root.join("cache"), None);
-        let file = root.join("app/src/main/java/demo/Main.java");
-        let target = single_file_target(root, &model, &file).unwrap();
-        assert!(target.top.command.ends_with("mvnw"));
-        assert_eq!(target.pl, "app");
-        let cp = single_file_classpath(root, &model, &target).unwrap();
-        let separator = ':';
-        // 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}");
-        let args = fs::read_to_string(root.join("args.txt")).unwrap();
-        assert!(!args.lines().any(|a| a == "compile" || a == "package"), "{args}");
-    }
-
-    /// A launch uses runtime dependencies, while tests additionally see test-scope ones.
-    #[cfg(unix)]
-    #[test]
-    fn launch_module_classpath_uses_the_matching_dependency_scope() {
-        use std::os::unix::fs::PermissionsExt;
-
-        let dir = tempfile::tempdir().unwrap();
-        let root = dir.path();
-        fixture(root);
-        let script = root.join("mvnw");
-        fs::write(
-            &script,
-            "#!/bin/sh\nprintf '%s\\n' \"$@\" > args.txt\npl='.'\nwhile [ $# -gt 0 ]; do\nif [ \"$1\" = \"-pl\" ]; then pl=\"$2\"; shift 2; else shift; fi\ndone\nmkdir -p \"$pl/target\"\nprintf '/repo/runtime.jar:/repo/test.jar' > \"$pl/target/ide-compile-cp.txt\"\n",
-        )
-        .unwrap();
-        fs::set_permissions(&script, fs::Permissions::from_mode(0o755)).unwrap();
-        let model = crate::load(root, &root.join("cache"), None);
-
-        let cache = root.join("cache");
-        let runtime =
-            module_classpath(root, &model, &root.join("app"), false, None, &cache, &CancellationToken::new()).unwrap();
-        assert!(runtime.contains("/repo/runtime.jar"), "{runtime}");
-        let args = fs::read_to_string(root.join("args.txt")).unwrap();
-        assert!(args.lines().any(|a| a == "compile"), "{args}");
-        assert!(!args.lines().any(|a| a == "package"), "{args}");
-        assert!(args.lines().any(|a| a == "-Dmdep.includeScope=runtime"), "{args}");
-
-        let test =
-            module_classpath(root, &model, &root.join("app"), true, None, &cache, &CancellationToken::new()).unwrap();
-        assert!(test.contains("/repo/test.jar"), "{test}");
-        let args = fs::read_to_string(root.join("args.txt")).unwrap();
-        assert!(args.lines().any(|a| a == "-Dmdep.includeScope=test"), "{args}");
-    }
-
-    /// The launch classpath follows the Maven runner JDK and is reused until that
-    /// build input changes; the probe does not run packaging plugins.
-    #[cfg(unix)]
-    #[test]
-    fn launch_classpath_cache_follows_the_runner_jdk() {
-        use std::os::unix::fs::PermissionsExt;
-
-        let dir = tempfile::tempdir().unwrap();
-        let root = dir.path();
-        fixture(root);
-        let script = root.join("mvnw");
-        // `dependency:build-classpath` reports reactor outputs as absolute paths. Keep
-        // the fake probe faithful so the cache's existence check sees the output.
-        fs::write(
-            &script,
-            "#!/bin/sh\nprintf x >> calls.txt\npl='.'\nwhile [ $# -gt 0 ]; do\nif [ \"$1\" = \"-pl\" ]; then pl=\"$2\"; shift 2; else shift; fi\ndone\nmkdir -p \"$pl/target/classes\" \"$JAVA_HOME/classpath\"\n: > \"$JAVA_HOME/classpath/jdk.jar\"\nprintf '%s/classpath/jdk.jar:%s/%s/target/classes:%s/empty/target/classes' \"$JAVA_HOME\" \"$(pwd)\" \"$pl\" \"$(pwd)\" > \"$pl/target/ide-compile-cp.txt\"\n",
-        )
-        .unwrap();
-        fs::set_permissions(&script, fs::Permissions::from_mode(0o755)).unwrap();
-        let mut model = crate::load(root, &root.join("cache"), None);
-        for (name, version) in [("jdk21", "21"), ("jdk8", "8")] {
-            let home = root.join(name);
-            fs::create_dir_all(home.join("bin")).unwrap();
-            fs::write(home.join("release"), format!("JAVA_VERSION=\"{version}\"\n")).unwrap();
-            fs::write(home.join("bin/java"), "").unwrap();
-        }
-        let cache = root.join("classpath-cache");
-        let cancel = CancellationToken::new();
-        let jdk21 = root.join("jdk21");
-        for project in &mut model.maven.as_mut().unwrap().projects {
-            project.env.insert("JAVA_HOME".into(), jdk21.to_string_lossy().into_owned());
-        }
-        let first = module_classpath(root, &model, &root.join("app"), false, None, &cache, &cancel).unwrap();
-        assert!(first.contains("jdk21/classpath/jdk.jar"), "{first}");
-        assert!(!first.contains("jdk8/classpath/jdk.jar"), "{first}");
-        let second = module_classpath(root, &model, &root.join("app"), false, None, &cache, &cancel).unwrap();
-        assert_eq!(second, first);
-        assert_eq!(fs::read_to_string(root.join("calls.txt")).unwrap(), "x");
-
-        let jdk8 = root.join("jdk8");
-        for project in &mut model.maven.as_mut().unwrap().projects {
-            project.env.insert("JAVA_HOME".into(), jdk8.to_string_lossy().into_owned());
-        }
-        let switched = module_classpath(root, &model, &root.join("app"), false, None, &cache, &cancel).unwrap();
-        assert!(switched.contains("jdk8/classpath/jdk.jar"), "{switched}");
-        assert!(!switched.contains("jdk21/classpath/jdk.jar"), "{switched}");
-        assert_eq!(fs::read_to_string(root.join("calls.txt")).unwrap(), "xx");
-    }
-}
@@ -1,253 +0,0 @@
-//! Up-to-date checks for menu builds (`Build Project` / `Build Module`, #2476).
-//!
-//! Menu builds have no fingerprint record on the launch path, so a second
-//! click always pays a full offline Maven run. This module stores one JSON
-//! record per scope (project, or one module file's build) after a successful
-//! build and compares it before the next build; on a match the build is
-//! skipped entirely. Like launch reuse, timestamp-preserving external edits
-//! are re-stamped first so Maven actually recompiles them on the next run.
-
-use super::*;
-use std::fs;
-
-/// Record of the last successful menu build of one scope.
-#[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 {
-    let base = cache.join("menu-build").join("records");
-    match file {
-        Some(f) => base.join(f.strip_prefix(root).unwrap_or(f)).with_extension("json"),
-        None => base.join("project.json"),
-    }
-}
-
-/// Re-stamps files whose content changed without advancing mtime (git
-/// checkout, external sync): timestamp-incremental Maven would otherwise skip
-/// them as "unchanged" and the rebuild would compile nothing.
-fn restamp(root: &Path, edits: &[PathBuf]) {
-    let now = std::time::SystemTime::now();
-    for rel in edits {
-        let path = root.join(rel);
-        let _ = fs::File::options().write(true).open(&path).and_then(|f| f.set_modified(now)).or_else(|_| {
-            fs::OpenOptions::new()
-                .create(true)
-                .truncate(false)
-                .write(true)
-                .open(&path)
-                .and_then(|f| f.set_modified(now))
-        });
-    }
-}
-
-/// Whether the last successful menu build of this scope is still fresh: its
-/// record exists and the fingerprint matches. On a mismatch caused by
-/// timestamp-preserving external edits the files are re-stamped first, so the
-/// rebuild Maven runs actually recompiles them.
-pub fn menu_up_to_date(
-    cache: &Path,
-    root: &Path,
-    model: &BuildModel,
-    file: Option<&Path>,
-    cancel: &CancellationToken,
-) -> bool {
-    let current = match menu_fingerprint(root, model, file, cancel) {
-        Ok(Some(current)) => current,
-        _ => return false,
-    };
-    let bytes = match fs::read(record_path(cache, root, file)) {
-        Ok(bytes) => bytes,
-        _ => return false,
-    };
-    let record: Record = match serde_json::from_slice(&bytes) {
-        Ok(record) => record,
-        _ => return false,
-    };
-    if record.fingerprint != current {
-        restamp(root, &record.fingerprint.mtime_preserved_edits(&current));
-        return false;
-    }
-    record.outputs.iter().all(|out| root.join(out).is_dir())
-}
-
-/// Records a successful menu build as the baseline for future up-to-date
-/// checks. Failures are swallowed: a missing record only costs one Maven run.
-pub fn record_menu_build(
-    cache: &Path,
-    root: &Path,
-    model: &BuildModel,
-    file: Option<&Path>,
-    cancel: &CancellationToken,
-) {
-    let current = match menu_fingerprint(root, model, file, cancel) {
-        Ok(Some(current)) => current,
-        _ => return,
-    };
-    // A torn write fails to parse later and is treated as "no record", so a
-    // plain write is enough.
-    let path = record_path(cache, root, file);
-    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 }) {
-        Ok(bytes) => bytes,
-        _ => return,
-    };
-    let _ = fs::write(&path, bytes);
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn write(root: &Path, rel: &str, value: &str) {
-        let path = root.join(rel);
-        fs::create_dir_all(path.parent().unwrap()).unwrap();
-        fs::write(path, value).unwrap();
-    }
-
-    fn fixture(root: &Path) -> BuildModel {
-        maven_two_module(root, "int x;");
-        BuildModel { maven: Some(maven::load(root)), ..Default::default() }
-    }
-
-    fn maven_two_module(root: &Path, extra_app: &str) {
-        write(
-            root,
-            "pom.xml",
-            r#"<project><modelVersion>4.0.0</modelVersion><groupId>t</groupId><artifactId>root</artifactId><version>1</version><packaging>pom</packaging><modules><module>app</module><module>lib</module></modules></project>"#,
-        );
-        write(
-            root,
-            "app/pom.xml",
-            r#"<project><modelVersion>4.0.0</modelVersion><parent><groupId>t</groupId><artifactId>root</artifactId><version>1</version></parent><artifactId>app</artifactId><dependencies><dependency><groupId>t</groupId><artifactId>lib</artifactId><version>1</version></dependency></dependencies></project>"#,
-        );
-        write(
-            root,
-            "lib/pom.xml",
-            r#"<project><modelVersion>4.0.0</modelVersion><parent><groupId>t</groupId><artifactId>root</artifactId><version>1</version></parent><artifactId>lib</artifactId></project>"#,
-        );
-        write(root, "app/src/main/java/t/A.java", &format!("package t; public class A {{ {extra_app} }}"));
-        write(root, "lib/src/main/java/t/L.java", "package t; public class L {}");
-    }
-
-    #[test]
-    fn record_then_skip_without_changes() {
-        let dir = tempfile::tempdir().unwrap();
-        let root = dir.path();
-        let model = fixture(root);
-        let cache = root.join("cache");
-        let file = root.join("app/src/main/java/t/A.java");
-        let cancel = CancellationToken::new();
-
-        assert!(!menu_up_to_date(&cache, root, &model, Some(&file), &cancel));
-        record_menu_build(&cache, root, &model, Some(&file), &cancel);
-        assert!(menu_up_to_date(&cache, root, &model, Some(&file), &cancel));
-        // The project scope is independent of the module scope.
-        assert!(!menu_up_to_date(&cache, root, &model, None, &cancel));
-        record_menu_build(&cache, root, &model, None, &cancel);
-        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();
-        let root = dir.path();
-        let model = fixture(root);
-        let cache = root.join("cache");
-        let file = root.join("app/src/main/java/t/A.java");
-        let cancel = CancellationToken::new();
-
-        record_menu_build(&cache, root, &model, Some(&file), &cancel);
-        assert!(menu_up_to_date(&cache, root, &model, Some(&file), &cancel));
-        write(root, "app/src/main/java/t/A.java", "package t; public class A { int y; }");
-        assert!(!menu_up_to_date(&cache, root, &model, Some(&file), &cancel));
-        record_menu_build(&cache, root, &model, Some(&file), &cancel);
-        assert!(menu_up_to_date(&cache, root, &model, Some(&file), &cancel));
-    }
-
-    #[test]
-    fn mtime_preserved_edit_forces_rebuild_and_restamps() {
-        let dir = tempfile::tempdir().unwrap();
-        let root = dir.path();
-        let model = fixture(root);
-        let cache = root.join("cache");
-        let rel = "app/src/main/java/t/A.java";
-        let file = root.join(rel);
-        let cancel = CancellationToken::new();
-
-        record_menu_build(&cache, root, &model, Some(&file), &cancel);
-        let before = fs::metadata(&file).unwrap().modified().unwrap();
-        // Same length, same mtime, different content: an external edit that
-        // preserved the timestamp.
-        write(root, rel, "package t; public class A { int z; }");
-        fs::File::options().write(true).open(&file).and_then(|f| f.set_modified(before)).unwrap();
-        assert!(!menu_up_to_date(&cache, root, &model, Some(&file), &cancel));
-        assert!(fs::metadata(&file).unwrap().modified().unwrap() > before);
-    }
-
-    #[test]
-    fn corrupt_record_never_skips() {
-        let dir = tempfile::tempdir().unwrap();
-        let root = dir.path();
-        let model = fixture(root);
-        let cache = root.join("cache");
-        let file = root.join("app/src/main/java/t/A.java");
-        let cancel = CancellationToken::new();
-
-        fs::create_dir_all(cache.join("menu-build").join("records").join("app/src/main/java/t")).unwrap();
-        fs::write(cache.join("menu-build").join("records").join("app/src/main/java/t/A.json"), b"{not json").unwrap();
-        assert!(!menu_up_to_date(&cache, root, &model, Some(&file), &cancel));
-    }
-
-    #[test]
-    fn unsupported_builds_never_skip() {
-        let dir = tempfile::tempdir().unwrap();
-        let root = dir.path();
-        let model = fixture(root);
-        write(root, "other/Main.java", "public class Main {}");
-        let cache = root.join("cache");
-        let cancel = CancellationToken::new();
-
-        // A file outside any non-aggregator module has no fingerprint.
-        let stray = root.join("other/Main.java");
-        record_menu_build(&cache, root, &model, Some(&stray), &cancel);
-        assert!(!menu_up_to_date(&cache, root, &model, Some(&stray), &cancel));
-    }
-}
@@ -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 {
@@ -109,11 +109,11 @@ fn strip_comments(text: &str) -> String {
 /// Quoted string literals in `s`.
 fn literals(s: &str) -> Vec<String> {
    let mut out = Vec::new();
-    let mut rest = s;
-    while let Some(start) = rest.find(['"', '\'']) {
-        let Some((value, used)) = literal(&rest[start..]) else { break };
-        out.push(value);
-        rest = &rest[start + used..];
+    let mut chars = s.chars();
+    while let Some(c) = chars.next() {
+        if c == '"' || c == '\'' {
+            out.push(chars.by_ref().take_while(|&n| n != c).collect());
+        }
    }
    out
 }
@@ -204,7 +204,7 @@ pub fn parse_settings(text: &str) -> Settings {
 }

 /// `a/b/../c` → `a/c`, without touching the filesystem.
-pub(crate) fn normalize(p: &Path) -> PathBuf {
+fn normalize(p: &Path) -> PathBuf {
    let mut out = PathBuf::new();
    for c in p.components() {
        match c {
@@ -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";
@@ -578,12 +565,11 @@ fn is_dependency_configuration(name: &str) -> bool {
 /// `(group, artifact, version)` of the external dependencies a build script declares:
 /// `implementation 'g:a:v'`, `api("g:a:v:classifier@jar")`, and the map notation
 /// `implementation group: 'g', name: 'a', version: 'v'` (Groovy) / `group = "g", …` (Kotlin).
-/// Versions written as `${gsonVersion}` are filled in from `properties` (`ext` values, see
-/// [`script_properties`]); ranges, unknown names and catalog aliases (`libs.x`) are skipped.
-pub fn script_dependencies(text: &str, properties: &BTreeMap<String, String>) -> Vec<(String, String, String)> {
+/// Versions with interpolations, ranges and catalog aliases (`libs.x`) are skipped.
+pub fn script_dependencies(text: &str) -> Vec<(String, String, String)> {
    let text = strip_comments(text);
    let mut out = Vec::new();
-    for line in text.lines().flat_map(statements) {
+    for line in text.lines().flat_map(|l| l.split(['{', ';'])) {
        let line = line.trim_start();
        let name: String = line.chars().take_while(|c| c.is_ascii_alphanumeric() || *c == '_').collect();
        if name.is_empty() || !is_dependency_configuration(&name) {
@@ -605,7 +591,6 @@ pub fn script_dependencies(text: &str, properties: &BTreeMap<String, String>) ->
            }),
        };
        if let Some((g, a, v)) = coordinate {
-            let v = interpolate(&v, properties);
            let plain = |s: &str| {
                !s.is_empty() && s.chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '.' | '-' | '_' | '+'))
            };
@@ -617,354 +602,11 @@ pub fn script_dependencies(text: &str, properties: &BTreeMap<String, String>) ->
    out
 }

-/// `line` split at `{` and `;` outside quoted strings, so a `${version}` stays in one piece.
-fn statements(line: &str) -> Vec<&str> {
-    let mut out = Vec::new();
-    let mut start = 0;
-    let mut index = 0;
-    while index < line.len() {
-        let c = line[index..].chars().next().unwrap();
-        if c == '"' || c == '\'' {
-            index += literal(&line[index..]).map_or(line.len() - index, |(_, used)| used);
-            continue;
-        }
-        if matches!(c, '{' | '}' | ';' | '\n') {
-            out.push(&line[start..index]);
-            start = index + c.len_utf8();
-        }
-        index += c.len_utf8();
-    }
-    out.push(&line[start..]);
-    out
-}
-
-/// `apply from: 'x.gradle'` (Groovy) and `apply(from = "x.gradle.kts")` (Kotlin DSL)
-/// targets, as written in the script.
-pub fn applied_scripts(text: &str) -> Vec<String> {
-    let text = strip_comments(text);
-    let mut out = Vec::new();
-    for (index, word) in code_words(&text) {
-        if word != "apply" || !starts_word(&text, index) {
-            continue;
-        }
-        let mut rest = text[index + "apply".len()..].trim_start();
-        if let Some(inner) = rest.strip_prefix('(') {
-            rest = inner.trim_start();
-        }
-        let Some(rest) = rest.strip_prefix("from") else { continue };
-        let Some(rest) = rest.trim_start().strip_prefix(':').or_else(|| rest.trim_start().strip_prefix('=')) else {
-            continue;
-        };
-        let mut rest = rest.trim_start();
-        if let Some(inner) = rest.strip_prefix("file") {
-            let inner = inner.trim_start();
-            if let Some(inner) = inner.strip_prefix('(') {
-                rest = inner.trim_start();
-            }
-        }
-        if let Some((path, _)) = literal(rest) {
-            out.push(path);
-        }
-    }
-    out
-}
-
-/// Literal extra properties declared by Groovy's `ext` or Kotlin's `extra`.
-pub fn script_properties(text: &str) -> BTreeMap<String, String> {
-    let text = strip_comments(text);
-    let mut out = BTreeMap::new();
-    for (index, word) in code_words(&text) {
-        if !starts_word(&text, index) {
-            continue;
-        }
-        let rest = text[index + word.len()..].trim_start();
-        if word == "val" || word == "var" {
-            let (name, rest) = identifier(rest);
-            let Some(rest) = rest.trim_start().strip_prefix("by").map(str::trim_start) else { continue };
-            let Some(rest) = rest.strip_prefix("extra").map(str::trim_start) else { continue };
-            if let Some(rest) = rest.strip_prefix('(')
-                && let Some((value, used)) = literal(rest.trim_start())
-                && rest.trim_start()[used..].trim_start().starts_with(')')
-                && !name.is_empty()
-            {
-                out.insert(name.to_owned(), value);
-            }
-            continue;
-        }
-        if word != "ext" && word != "extra" {
-            continue;
-        }
-        if let Some(block) = rest.strip_prefix('{') {
-            if let Some(end) = matching_brace(block) {
-                out.extend(assignments(&block[..end]));
-            }
-        } else if let Some(rest) = rest.strip_prefix('.') {
-            let (name, rest) = identifier(rest);
-            if let Some(value) = assigned_literal(rest)
-                && !name.is_empty()
-            {
-                out.insert(name.to_owned(), value);
-            }
-        } else if let Some(rest) = rest.strip_prefix('[')
-            && let Some((name, used)) = literal(rest.trim_start())
-            && let Some(rest) = rest.trim_start()[used..].trim_start().strip_prefix(']')
-            && let Some(value) = assigned_literal(rest)
-        {
-            out.insert(name, value);
-        }
-    }
-    out
-}
-
-pub(crate) fn file_properties(build_dir: &Path) -> BTreeMap<String, String> {
-    let text = std::fs::read_to_string(build_dir.join("gradle.properties")).unwrap_or_default();
-    text.lines()
-        .filter_map(|line| {
-            let line = line.trim();
-            if line.starts_with(['#', '!']) {
-                return None;
-            }
-            let separator = line.find(|c: char| c == '=' || c == ':' || c.is_whitespace())?;
-            let (key, rest) = line.split_at(separator);
-            let value = rest.trim_start().trim_start_matches(['=', ':']).trim_start();
-            (!key.is_empty()).then(|| (key.to_owned(), value.to_owned()))
-        })
-        .collect()
-}
-
-/// The build script of a project and, recursively, the scripts it applies with `apply from`,
-/// read from disk: absolute path and text. Targets that do not exist are skipped.
-pub fn scripts_of(root: &Path, project_dir: &Path, build_dir: &Path, build_file: &Path) -> Vec<(PathBuf, String)> {
-    const MAX_SCRIPTS: usize = 256;
-    const MAX_DEPTH: usize = 32;
-    let mut out = Vec::new();
-    let mut seen = std::collections::HashSet::new();
-    let first = normalize(&root.join(build_file));
-    let Ok(identity) = dunce::canonicalize(&first) else { return out };
-    seen.insert(identity);
-    let mut stack = vec![(first, 0)];
-    while let Some((path, depth)) = stack.pop() {
-        let Ok(text) = std::fs::read_to_string(&path) else { continue };
-        if depth < MAX_DEPTH {
-            let mut targets = Vec::new();
-            for spec in applied_scripts(&text) {
-                if seen.len() >= MAX_SCRIPTS {
-                    break;
-                }
-                if let Some(target) = resolve_script(&spec, &path, project_dir, build_dir)
-                    && let Ok(identity) = dunce::canonicalize(&target)
-                    && seen.insert(identity)
-                {
-                    targets.push((target, depth + 1));
-                }
-            }
-            stack.extend(targets.into_iter().rev());
-        }
-        out.push((path, text));
-    }
-    out
-}
-
-/// Relative targets are project-scoped, with a lenient fallback beside the applying script.
-fn resolve_script(spec: &str, script: &Path, project_dir: &Path, build_dir: &Path) -> Option<PathBuf> {
-    let spec = spec.trim();
-    if spec.contains("://") {
-        return None;
-    }
-    let properties = BTreeMap::from([
-        ("rootDir".into(), build_dir.to_string_lossy().into_owned()),
-        ("rootProject.projectDir".into(), build_dir.to_string_lossy().into_owned()),
-        ("projectDir".into(), project_dir.to_string_lossy().into_owned()),
-    ]);
-    let spec = interpolate(spec, &properties);
-    if spec.contains('$') {
-        return None;
-    }
-    let path = Path::new(&spec);
-    if path.is_absolute() {
-        return path.is_file().then(|| normalize(path));
-    }
-    let project_path = normalize(&project_dir.join(path));
-    if project_path.is_file() {
-        return Some(project_path);
-    }
-    let path = normalize(&script.parent()?.join(path));
-    path.is_file().then_some(path)
-}
-
-pub(crate) fn project_build_dir(root: &Path, model: &GradleModel, project: &GradleProject) -> PathBuf {
-    let dir = project.build.as_ref().and_then(|build| model.projects.iter().find(|p| &p.path == build));
-    root.join(dir.map_or(&model.dir, |p| &p.dir))
-}
-
-/// `2.8.9` for `${gsonVersion}` / `$gsonVersion` / `${ext.gsonVersion}`; unknown names and
-/// expressions are left as written, so ranges and catalogs stay skipped.
-fn interpolate(value: &str, properties: &BTreeMap<String, String>) -> String {
-    if !value.contains('$') {
-        return value.to_owned();
-    }
-    let mut out = String::with_capacity(value.len());
-    let mut chars = value.chars().peekable();
-    while let Some(c) = chars.next() {
-        if c != '$' {
-            out.push(c);
-            continue;
-        }
-        let braced = chars.peek() == Some(&'{');
-        if braced {
-            chars.next();
-        }
-        let mut name = String::new();
-        if braced {
-            for n in chars.by_ref() {
-                if n == '}' {
-                    break;
-                }
-                name.push(n);
-            }
-        } else {
-            while let Some(&n) = chars.peek() {
-                if n.is_alphanumeric() || n == '_' || n == '.' {
-                    name.push(n);
-                    chars.next();
-                } else {
-                    break;
-                }
-            }
-        }
-        let key = name.strip_prefix("ext.").or_else(|| name.strip_prefix("extra.")).unwrap_or(&name);
-        let bracket = name.strip_prefix("ext[").or_else(|| name.strip_prefix("extra[")).and_then(|rest| {
-            let (key, used) = literal(rest.trim_start())?;
-            (rest.trim_start()[used..].trim() == "]").then_some(key)
-        });
-        match properties.get(bracket.as_deref().unwrap_or(key)) {
-            Some(v) if !name.is_empty() => out.push_str(v),
-            _ => {
-                out.push('$');
-                if braced {
-                    out.push('{');
-                }
-                out.push_str(&name);
-                if braced {
-                    out.push('}');
-                }
-            }
-        }
-    }
-    out
-}
-
-/// Whether `index` starts a whole word in `text` (not `reapply`, `my.apply`).
-fn starts_word(text: &str, index: usize) -> bool {
-    text[..index].chars().next_back().is_none_or(|c| !(c.is_alphanumeric() || c == '_' || c == '.'))
-}
-
-/// Identifiers outside quoted strings, with their byte positions.
-fn code_words(text: &str) -> Vec<(usize, &str)> {
-    let mut out = Vec::new();
-    let mut index = 0;
-    while index < text.len() {
-        let c = text[index..].chars().next().unwrap();
-        if c == '"' || c == '\'' {
-            index += literal(&text[index..]).map_or(text.len() - index, |(_, used)| used);
-        } else if c.is_alphabetic() || c == '_' {
-            let (word, _) = identifier(&text[index..]);
-            out.push((index, word));
-            index += word.len();
-        } else {
-            index += c.len_utf8();
-        }
-    }
-    out
-}
-
-fn identifier(text: &str) -> (&str, &str) {
-    let end = text.find(|c: char| !(c.is_alphanumeric() || c == '_')).unwrap_or(text.len());
-    text.split_at(end)
-}
-
-fn assigned_literal(text: &str) -> Option<String> {
-    let rest = text.trim_start().strip_prefix('=')?.trim_start();
-    let (value, used) = literal(rest)?;
-    // Do not turn a computed value (`'1.' + suffix`) into a concrete version.
-    let tail = rest[used..].trim_start_matches([' ', '\t', '\r']);
-    (tail.is_empty() || tail.starts_with(['\n', ';', '}'])).then_some(value)
-}
-
-/// The quoted string at the start of `s`, and how many bytes it spans.
-fn literal(s: &str) -> Option<(String, usize)> {
-    let quote = s.chars().next().filter(|c| *c == '"' || *c == '\'')?;
-    let rest = &s[quote.len_utf8()..];
-    let mut index = 0;
-    while index < rest.len() {
-        let c = rest[index..].chars().next()?;
-        if c == quote {
-            return Some((rest[..index].to_owned(), quote.len_utf8() + index + c.len_utf8()));
-        }
-        if c == '\\' {
-            index += c.len_utf8();
-            index += rest[index..].chars().next()?.len_utf8();
-        } else if quote == '"' && rest[index..].starts_with("${") {
-            index += 2;
-            index += matching_brace(&rest[index..])? + 1;
-        } else {
-            index += c.len_utf8();
-        }
-    }
-    None
-}
-
-/// Byte index of the `}` closing a `{` that was already consumed, ignoring quoted text.
-fn matching_brace(text: &str) -> Option<usize> {
-    let mut depth = 1usize;
-    let mut index = 0;
-    while index < text.len() {
-        let c = text[index..].chars().next()?;
-        if c == '"' || c == '\'' {
-            index += literal(&text[index..])?.1;
-            continue;
-        }
-        if c == '{' {
-            depth += 1;
-        } else if c == '}' {
-            depth -= 1;
-            if depth == 0 {
-                return Some(index);
-            }
-        }
-        index += c.len_utf8();
-    }
-    None
-}
-
-/// `name = 'value'` pairs in `text`.
-fn assignments(text: &str) -> Vec<(String, String)> {
-    statements(text)
-        .into_iter()
-        .filter_map(|statement| {
-            let (name, rest) = identifier(statement.trim_start());
-            let value = assigned_literal(rest)?;
-            (!name.is_empty()).then(|| (name.to_owned(), value))
-        })
-        .collect()
-}
-
 /// Every settings and build script of the model (for change detection).
 pub fn build_files(root: &Path, model: &GradleModel) -> Vec<PathBuf> {
    let dir = root.join(&model.dir);
    let mut out: Vec<PathBuf> = SETTINGS_FILES.iter().map(|f| dir.join(f)).filter(|p| p.is_file()).collect();
    out.extend(model.projects.iter().filter_map(|p| p.build_file.as_ref().map(|f| root.join(f))));
-    // Scripts a build script applies are build files too: editing one can change the model.
-    for project in &model.projects {
-        let Some(file) = project.build_file.as_deref() else { continue };
-        let build_dir = project_build_dir(root, model, project);
-        let properties = build_dir.join("gradle.properties");
-        if properties.is_file() {
-            out.push(properties);
-        }
-        let applied = scripts_of(root, &root.join(&project.dir), &build_dir, Path::new(file));
-        out.extend(applied.into_iter().skip(1).map(|(path, _)| path));
-    }
    // The settings of each nested build (its root project's folder).
    for p in model.projects.iter().filter(|p| p.build.as_deref() == Some(p.path.as_str())) {
        let nested = root.join(&p.dir);
@@ -982,8 +624,6 @@ pub fn build_files(root: &Path, model: &GradleModel) -> Vec<PathBuf> {
        catalogs.sort();
        out.extend(catalogs);
    }
-    out.sort();
-    out.dedup();
    out
 }

@@ -1168,7 +808,7 @@ dependencies {
    classpath 'not:a:library'
 }
 "#;
-        let deps = script_dependencies(script, &BTreeMap::new());
+        let deps = script_dependencies(script);
        let names: Vec<String> = deps.iter().map(|(g, a, v)| format!("{g}:{a}:{v}")).collect();
        assert_eq!(
            names,
@@ -1182,291 +822,6 @@ dependencies {
        );
    }

-    #[test]
-    fn applied_scripts_read_groovy_and_kotlin_forms() {
-        let script = r#"
-            apply plugin: 'java'
-            apply from: 'gradle/dependencies.gradle'
-            apply from: file('gradle/extra.gradle')
-            apply(from = "gradle/kotlin.gradle.kts")
-            apply(from = file("gradle/kotlin-file.gradle.kts"))
-            // apply from: 'commented.gradle'
-            reapply from: 'not-a-call.gradle'
-        "#;
-        assert_eq!(
-            applied_scripts(script),
-            [
-                "gradle/dependencies.gradle",
-                "gradle/extra.gradle",
-                "gradle/kotlin.gradle.kts",
-                "gradle/kotlin-file.gradle.kts"
-            ]
-        );
-    }
-
-    #[test]
-    fn ext_values_fill_in_dependency_versions() {
-        let script = r#"
-            ext {
-                gsonVersion = '2.8.9'
-                junit = "4.13.2"
-            }
-            ext.logback = '1.4.14'
-            dependencies {
-                implementation "com.google.code.gson:gson:${gsonVersion}"
-                testImplementation "junit:junit:$junit"
-                implementation "ch.qos.logback:logback-classic:${ext.logback}"
-                implementation 'org.plain:literal:1.0'
-                implementation "org.x:unknown:${missing}"
-            }
-        "#;
-        let names: Vec<String> = script_dependencies(script, &script_properties(script))
-            .into_iter()
-            .map(|(g, a, v)| format!("{g}:{a}:{v}"))
-            .collect();
-        assert_eq!(
-            names,
-            [
-                "com.google.code.gson:gson:2.8.9",
-                "junit:junit:4.13.2",
-                "ch.qos.logback:logback-classic:1.4.14",
-                "org.plain:literal:1.0",
-            ]
-        );
-    }
-
-    #[test]
-    fn extra_properties_support_brackets_and_kotlin_delegates() {
-        for declaration in [
-            "ext.x = '1.2'",
-            "ext { x = '1.2' }",
-            "ext[\"x\"] = '1.2'",
-            "extra[\"x\"] = \"1.2\"",
-            "val x by extra(\"1.2\")",
-        ] {
-            let script = format!("{declaration}\ndependencies {{ implementation \"g:a:${{x}}\" }}");
-            assert_eq!(
-                script_dependencies(&script, &script_properties(&script)),
-                [("g".into(), "a".into(), "1.2".into())],
-                "{declaration}"
-            );
-        }
-    }
-
-    #[test]
-    fn parsers_ignore_apply_and_ext_inside_strings() {
-        let script = r#"
-            println "apply from: 'fake.gradle'"
-            println "ext.x = 'bogus'"
-            ext.real = '1'
-        "#;
-        assert!(applied_scripts(script).is_empty());
-        assert_eq!(script_properties(script), BTreeMap::from([("real".into(), "1".into())]));
-    }
-
-    #[test]
-    fn dependency_statements_preserve_interpolation_and_escaped_quotes() {
-        let script = r#"dependencies { implementation "g:a:${v}"; api(group = "g", name = "b", version = "${v}-RC1") }; dependencies { runtimeOnly 'g:c:2' }"#;
-        let properties = BTreeMap::from([("v".into(), "1.2".into())]);
-        assert_eq!(
-            script_dependencies(script, &properties),
-            [
-                ("g".into(), "a".into(), "1.2".into()),
-                ("g".into(), "b".into(), "1.2-RC1".into()),
-                ("g".into(), "c".into(), "2".into())
-            ]
-        );
-        assert_eq!(
-            statements(r#"println "escaped\"; {still quoted}"; implementation 'g:a:1'"#),
-            [r#"println "escaped\"; {still quoted}""#, " implementation 'g:a:1'"]
-        );
-    }
-
-    #[test]
-    fn dependency_versions_skip_unresolved_names_and_expressions() {
-        let script = r#"dependencies {
-            implementation "g:missing:${unknown}"
-            implementation "g:expression:${1 + 2}"
-            implementation "g:cyclic:${cycle}"
-            implementation 'g:range:[1,2)'
-            implementation 'g:dynamic:1.+'
-        }"#;
-        let properties = BTreeMap::from([("cycle".into(), "${cycle}".into())]);
-        assert!(script_dependencies(script, &properties).is_empty());
-    }
-
-    #[test]
-    fn extra_property_references_support_qualified_and_bracket_access() {
-        let script = r#"dependencies {
-            implementation "g:a:${ext.x}"
-            implementation "g:b:${extra.x}"
-            implementation "g:c:${ext['x']}"
-            implementation "g:d:${extra["x"]}"
-        }"#;
-        let properties = BTreeMap::from([("x".into(), "1".into())]);
-        assert_eq!(script_dependencies(script, &properties).len(), 4);
-    }
-
-    #[test]
-    fn applied_scripts_are_read_recursively_and_survive_cycles() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        std::fs::create_dir_all(root.join("gradle")).unwrap();
-        std::fs::write(root.join("build.gradle"), "apply from: 'gradle/deps.gradle'\n").unwrap();
-        std::fs::write(root.join("gradle/deps.gradle"), "apply from: '$rootDir/gradle/more.gradle'\n").unwrap();
-        std::fs::write(root.join("gradle/more.gradle"), "apply from: 'deps.gradle'\n").unwrap();
-
-        let scripts: Vec<String> = scripts_of(root, root, root, Path::new("build.gradle"))
-            .into_iter()
-            .map(|(path, _)| path.strip_prefix(root).unwrap().to_string_lossy().replace('\\', "/"))
-            .collect();
-        assert_eq!(scripts, ["build.gradle", "gradle/deps.gradle", "gradle/more.gradle"]);
-        assert_eq!(build_files(root, &load(root).unwrap()).len(), 3);
-    }
-
-    #[test]
-    fn applied_paths_prefer_the_project_directory() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        std::fs::create_dir_all(root.join("gradle")).unwrap();
-        std::fs::write(root.join("build.gradle"), "apply from: 'gradle/deps.gradle'").unwrap();
-        std::fs::write(root.join("gradle/deps.gradle"), "apply from: 'versions.gradle'").unwrap();
-        std::fs::write(root.join("versions.gradle"), "right").unwrap();
-        std::fs::write(root.join("gradle/versions.gradle"), "wrong").unwrap();
-        let scripts = scripts_of(root, root, root, Path::new("build.gradle"));
-        assert_eq!(scripts.len(), 3);
-        assert_eq!(scripts[2].1, "right");
-    }
-
-    #[test]
-    fn nested_applied_paths_are_relative_to_the_project_directory() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        std::fs::create_dir_all(root.join("gradle")).unwrap();
-        std::fs::write(root.join("build.gradle"), "apply from: 'gradle/a.gradle'").unwrap();
-        std::fs::write(root.join("gradle/a.gradle"), "apply from: 'gradle/b.gradle'").unwrap();
-        std::fs::write(root.join("gradle/b.gradle"), "").unwrap();
-        let scripts = scripts_of(root, root, root, Path::new("build.gradle"));
-        assert_eq!(scripts.len(), 3);
-        assert_eq!(scripts[2].0, root.join("gradle/b.gradle"));
-    }
-
-    #[test]
-    fn applied_paths_fall_back_to_the_applying_script_directory() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        std::fs::create_dir_all(root.join("gradle")).unwrap();
-        std::fs::write(root.join("build.gradle"), "apply from: 'gradle/a.gradle'").unwrap();
-        std::fs::write(root.join("gradle/a.gradle"), "apply from: 'c.gradle'").unwrap();
-        std::fs::write(root.join("gradle/c.gradle"), "").unwrap();
-        let scripts = scripts_of(root, root, root, Path::new("build.gradle"));
-        assert_eq!(scripts.len(), 3);
-        assert_eq!(scripts[2].0, root.join("gradle/c.gradle"));
-    }
-
-    #[test]
-    fn applied_paths_resolve_gradle_directory_variables() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        let project = root.join("app");
-        let script = project.join("gradle/deps.gradle");
-        std::fs::create_dir_all(script.parent().unwrap()).unwrap();
-        std::fs::write(root.join("shared.gradle"), "").unwrap();
-        std::fs::write(project.join("local.gradle"), "").unwrap();
-        for prefix in ["$rootDir", "${rootDir}", "$rootProject.projectDir", "${rootProject.projectDir}"] {
-            assert_eq!(
-                resolve_script(&format!("{prefix}/shared.gradle"), &script, &project, root),
-                Some(root.join("shared.gradle")),
-                "{prefix}"
-            );
-        }
-        for prefix in ["$projectDir", "${projectDir}"] {
-            assert_eq!(
-                resolve_script(&format!("{prefix}/local.gradle"), &script, &project, root),
-                Some(project.join("local.gradle")),
-                "{prefix}"
-            );
-        }
-        assert_eq!(
-            resolve_script(root.join("shared.gradle").to_str().unwrap(), &script, &project, root),
-            Some(root.join("shared.gradle"))
-        );
-    }
-
-    #[test]
-    fn applied_scripts_skip_urls_and_missing_files() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        // Even a local path resembling a URL must not be read.
-        if !cfg!(windows) {
-            for scheme in ["http", "https"] {
-                let local = root.join(format!("{scheme}:/example.com/deps.gradle"));
-                std::fs::create_dir_all(local.parent().unwrap()).unwrap();
-                std::fs::write(local, "implementation 'g:remote:1'").unwrap();
-            }
-        }
-        std::fs::write(root.join("build.gradle"), "apply from: 'http://example.com/deps.gradle'\napply(from = \"https://example.com/deps.gradle\")\napply from: 'missing.gradle'").unwrap();
-        assert_eq!(scripts_of(root, root, root, Path::new("build.gradle")).len(), 1);
-    }
-
-    #[test]
-    fn applied_scripts_deduplicate_self_application_and_path_aliases() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        std::fs::create_dir_all(root.join("gradle")).unwrap();
-        std::fs::write(
-            root.join("build.gradle"),
-            "apply from: 'build.gradle'\napply from: 'gradle/../build.gradle'\napply from: 'gradle/a.gradle'",
-        )
-        .unwrap();
-        std::fs::write(root.join("gradle/a.gradle"), "apply from: '../build.gradle'").unwrap();
-        assert_eq!(scripts_of(root, root, root, Path::new("build.gradle")).len(), 2);
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn applied_scripts_deduplicate_symlink_cycles() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        std::fs::write(root.join("build.gradle"), "apply from: 'alias/build.gradle'").unwrap();
-        std::os::unix::fs::symlink(root, root.join("alias")).unwrap();
-        assert_eq!(scripts_of(root, root, root, Path::new("build.gradle")).len(), 1);
-    }
-
-    #[test]
-    fn applied_script_traversal_bounds_depth_and_total_files() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        for i in 0..300 {
-            std::fs::write(root.join(format!("{i}.gradle")), format!("apply from: '{}.gradle'", i + 1)).unwrap();
-        }
-        let chain = scripts_of(root, root, root, Path::new("0.gradle"));
-        assert_eq!(chain.len(), 33);
-        let fanout: String = (0..300).map(|i| format!("apply from: '{i}.gradle'\n")).collect();
-        std::fs::write(root.join("build.gradle"), fanout).unwrap();
-        assert_eq!(scripts_of(root, root, root, Path::new("build.gradle")).len(), 256);
-    }
-
-    #[test]
-    fn applied_scripts_use_their_composite_build_root() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        std::fs::create_dir_all(root.join("included/app")).unwrap();
-        std::fs::write(root.join("build.gradle"), "").unwrap();
-        std::fs::write(root.join("included/build.gradle"), "").unwrap();
-        std::fs::write(root.join("included/app/build.gradle"), "apply from: \"${rootDir}/deps.gradle\"").unwrap();
-        std::fs::write(root.join("included/deps.gradle"), "implementation 'g:included:1'").unwrap();
-        let mut model = load(root).unwrap();
-        for (path, dir) in [(":included", "included"), (":included:app", "included/app")] {
-            let mut project = project_at(root, path.into(), path.into(), &root.join(dir));
-            project.build = Some(":included".into());
-            model.projects.push(project);
-        }
-        assert!(build_files(root, &model).contains(&root.join("included/deps.gradle")));
-        let model = crate::BuildModel { maven: None, gradle: vec![model] };
-        assert_eq!(crate::dependency_coordinates(root, &model)[0].artifact_id, "included");
-    }
-
    use super::*;

    #[test]
@@ -528,18 +528,7 @@ mod tests {
            for (step, name) in plan.steps.iter().zip(["java", "kotlin"]) {
                assert_eq!(step.cwd, root.join(name));
                assert_eq!(step.program, format!("{name}-mvnw"));
-                assert_eq!(
-                    step.args,
-                    [
-                        "-B",
-                        "-Dstyle.color=never",
-                        crate::maven::LOCAL_REPO_TRACKING_ARG,
-                        "-o",
-                        "-Peditor",
-                        "-Djacoco.skip=true",
-                        "test-compile"
-                    ]
-                );
+                assert_eq!(step.args, ["-B", "-Dstyle.color=never", "-o", "-Peditor", "test-compile"]);
                assert_eq!(step.env.get("JAVA_HOME").map(String::as_str), Some("/jdk"));
            }
        }
@@ -76,7 +76,7 @@ pub fn load_linked(
    gradle_settings: &ide_core::settings::GradleSettings,
 ) -> BuildModel {
    let maven = maven::has_projects(root, settings).then(|| {
-        let profiles = settings.profiles(&sync::maven_profiles(cache_dir));
+        let profiles = sync::maven_profiles(cache_dir);
        let repo = maven_repo.or_else(maven::default_local_repo);
        let mut m = maven::load_with_linked(root, repo, &profiles, &settings.linked_projects);
        maven::UnlinkedProjects::from_model(&m, settings).filter(&mut m);
@@ -122,14 +122,6 @@ pub fn gradle_external_roots(
    gradle::external_roots(root, dirs.iter().map(String::as_str))
 }

-/// Directories of Maven POMs linked from outside `root`, outermost only.
-/// Reads just those explicit paths (no POM parse and no directory walk).
-pub fn maven_external_roots(root: &Path, linked: &[String]) -> Vec<PathBuf> {
-    let dirs = maven::external_pom_dirs(root, linked);
-    let owned: Vec<String> = dirs.iter().map(|dir| dir.to_string_lossy().into_owned()).collect();
-    gradle::external_roots(root, owned.iter().map(String::as_str))
-}
-
 /// Source, resource and build folders of the last Gradle sync, absolute.
 pub fn gradle_source_roots(
    root: &Path,
@@ -155,8 +147,7 @@ pub struct DependencyCoordinate {

 /// The external libraries of `model`, sorted and deduplicated: Maven dependencies
 /// (with the transitive ones the last sync read), except the build's own modules,
-/// `pom` imports and `system` scope; dependencies declared in the Gradle build scripts,
-/// including the scripts they pull in with `apply from`.
+/// `pom` imports and `system` scope; dependencies declared in the Gradle build scripts.
 pub fn dependency_coordinates(root: &Path, model: &BuildModel) -> Vec<DependencyCoordinate> {
    let mut out = Vec::new();
    if let Some(m) = &model.maven {
@@ -186,26 +177,11 @@ pub fn dependency_coordinates(root: &Path, model: &BuildModel) -> Vec<Dependency
        }
    }
    for g in &model.gradle {
-        for p in &g.projects {
-            let Some(build_file) = p.build_file.as_deref() else { continue };
-            let build_dir = gradle::project_build_dir(root, g, p);
-            let scripts = gradle::scripts_of(root, &root.join(&p.dir), &build_dir, Path::new(build_file));
-            // The script's own `ext` values win over the scripts it applies.
-            let mut properties = std::collections::BTreeMap::new();
-            for (_, text) in scripts.iter().rev() {
-                properties.extend(gradle::script_properties(text));
-            }
-            properties.extend(gradle::file_properties(&build_dir));
-            for (_, text) in &scripts {
-                out.extend(gradle::script_dependencies(text, &properties).into_iter().map(
-                    |(group_id, artifact_id, version)| DependencyCoordinate {
-                        gradle: true,
-                        group_id,
-                        artifact_id,
-                        version,
-                    },
-                ));
-            }
+        for script in g.projects.iter().filter_map(|p| p.build_file.as_ref()) {
+            let Ok(text) = std::fs::read_to_string(root.join(script)) else { continue };
+            out.extend(gradle::script_dependencies(&text).into_iter().map(|(group_id, artifact_id, version)| {
+                DependencyCoordinate { gradle: true, group_id, artifact_id, version }
+            }));
        }
    }
    out.sort();
@@ -246,30 +222,6 @@ mod tests {
        assert!(gradle_external_roots(&root, &temp.path().join("cache"), &settings).is_empty());
    }

-    #[test]
-    fn settings_profiles_and_checkbox_choices_control_modules_before_sync() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        std::fs::create_dir(root.join("extra")).unwrap();
-        std::fs::write(root.join("extra/pom.xml"), "<project><artifactId>extra</artifactId></project>").unwrap();
-        std::fs::write(
-            root.join("pom.xml"),
-            r#"<project><artifactId>root</artifactId><packaging>pom</packaging>
-            <profiles><profile><id>extra</id><modules><module>extra</module></modules></profile></profiles></project>"#,
-        )
-        .unwrap();
-        let cache = root.join("cache");
-        let settings = ide_core::settings::MavenSettings { active_profiles: "extra".into(), ..Default::default() };
-        let modules = |settings: &ide_core::settings::MavenSettings| {
-            load_linked(root, &cache, None, settings, &Default::default()).maven.unwrap().projects[0].modules.clone()
-        };
-        assert!(modules(&Default::default()).is_empty());
-        assert_eq!(modules(&settings), ["extra/pom.xml"]);
-        assert_eq!(maven::load_linked(root, &settings).projects[0].modules, ["extra/pom.xml"]);
-        save_maven_profiles(&cache, &["!extra".into()]).unwrap();
-        assert!(modules(&settings).is_empty());
-    }
-
    #[test]
    fn detects_build_systems_and_build_files() {
        let tmp = tempfile::tempdir().unwrap();
@@ -336,39 +288,4 @@ mod tests {
            .collect();
        assert_eq!(names, ["M org.b:y:2", "M org.c:z:3", "G org.a:x:1.0"]);
    }
-
-    #[test]
-    fn dependency_coordinates_read_scripts_brought_in_by_apply_from() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        std::fs::create_dir_all(root.join("gradle")).unwrap();
-        std::fs::write(root.join("build.gradle"), "apply from: 'gradle/dependencies.gradle'\n").unwrap();
-        std::fs::write(
-            root.join("gradle/dependencies.gradle"),
-            "ext { gson = '2.8.9' }\ndependencies { implementation \"com.google.code.gson:gson:${gson}\" }\n",
-        )
-        .unwrap();
-        let model = BuildModel { maven: None, gradle: gradle::load(root).into_iter().collect() };
-        let names: Vec<String> = dependency_coordinates(root, &model)
-            .into_iter()
-            .map(|c| format!("{}:{}:{}", c.group_id, c.artifact_id, c.version))
-            .collect();
-        assert_eq!(names, ["com.google.code.gson:gson:2.8.9"]);
-    }
-
-    #[test]
-    fn gradle_properties_override_script_extra_values() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        std::fs::write(root.join("build.gradle"), "ext.v = 'wrong'\napply from: 'deps.gradle'").unwrap();
-        std::fs::write(
-            root.join("deps.gradle"),
-            "ext.v = 'alsoWrong'\nimplementation \"g:a:${v}\"\nimplementation \"g:b:${onlyInProperties}\"",
-        )
-        .unwrap();
-        std::fs::write(root.join("gradle.properties"), "# versions\nv = 1.2\nonlyInProperties: 2.3\n").unwrap();
-        let model = BuildModel { maven: None, gradle: gradle::load(root).into_iter().collect() };
-        let versions: Vec<_> = dependency_coordinates(root, &model).into_iter().map(|c| c.version).collect();
-        assert_eq!(versions, ["1.2", "2.3"]);
-    }
 }
@@ -16,17 +16,6 @@ use std::io::Read;
 use std::path::{Path, PathBuf};
 use std::sync::{Mutex, OnceLock};

-pub mod completion;
-pub mod sources;
-
-/// Lets the IDE's own Maven runs (Reload, Build) use what the local repository already
-/// has. Maven 3.9 re-resolves an artifact whose recorded origin repository (`_remote.repositories`)
-/// isn't declared in the build, such as a vendor jar downloaded through another project or
-/// installed by hand, and fails when no declared repository has it. Tracking under another
-/// file name makes such artifacts count as locally installed. Maven goals the user runs keep
-/// plain Maven's behaviour.
-pub const LOCAL_REPO_TRACKING_ARG: &str = "-Daether.enhancedLocalRepository.trackingFilename=openidea.repositories";
-
 /// Phases shown under "Lifecycle" (IDEA's default list).
 pub const LIFECYCLE: &[&str] =
    &["clean", "validate", "compile", "test", "package", "verify", "install", "site", "deploy"];
@@ -82,9 +71,6 @@ pub struct MavenModel {
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct MavenProject {
-    /// Owning project folder when displayed in a workspace.
-    #[specta(optional)]
-    pub project_root: Option<String>,
    /// Project-relative, `/`-separated (`pom.xml`, `core/pom.xml`).
    pub pom: String,
    /// Project-relative directory; `""` = the project root.
@@ -107,9 +93,7 @@ pub struct MavenProject {
    pub profiles: Vec<String>,
    /// Java feature version the project compiles for (`maven.compiler.release`, `java.version`…).
    pub java_version: Option<u32>,
-    /// Maven launcher: the nearest `mvnw` (absolute), else `mvn`. Inside the opened
-    /// project the search stops at its root; outside it, the search stops before
-    /// that root so a linked project keeps its own wrapper.
+    /// Maven launcher: the nearest `mvnw` up to the project root (absolute), else `mvn`.
    pub command: String,
    /// Options before the goals (`-s`, `-Dmaven.repo.local=`); filled in by the shell from settings.
    pub options: Vec<String>,
@@ -185,9 +169,6 @@ pub enum Omission {
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct MavenProfile {
-    /// Owning project folder when displayed in a workspace.
-    #[specta(optional)]
-    pub project_root: Option<String>,
    pub id: String,
    pub active_by_default: bool,
 }
@@ -300,7 +281,7 @@ fn read_plugin(e: &Element) -> Option<RawPlugin> {
    })
 }

-pub(crate) fn read_properties(e: Option<&Element>) -> Vec<(String, String)> {
+fn read_properties(e: Option<&Element>) -> Vec<(String, String)> {
    e.map(|p| p.children.iter().map(|c| (c.name.clone(), c.text.trim().to_owned())).collect()).unwrap_or_default()
 }

@@ -510,7 +491,7 @@ pub fn user_settings_file(root: &Path, settings: &ide_core::settings::MavenSetti
 /// IDEA lists them): checked by default when `<activeProfiles>` names them or they are
 /// `activeByDefault`.
 pub fn settings_profiles(settings: &Path) -> Vec<MavenProfile> {
-    let Some(root) = xml::read_text(settings).as_deref().and_then(xml::parse) else {
+    let Some(root) = std::fs::read_to_string(settings).ok().and_then(|text| xml::parse(&text)) else {
        return Vec::new();
    };
    let active: Vec<String> =
@@ -522,7 +503,7 @@ pub fn settings_profiles(settings: &Path) -> Vec<MavenProfile> {
            continue;
        }
        let by_default = profile.at("activation/activeByDefault").is_some_and(|e| e.text.trim() == "true");
-        profiles.push(MavenProfile { active_by_default: by_default || active.contains(&id), id, ..Default::default() });
+        profiles.push(MavenProfile { active_by_default: by_default || active.contains(&id), id });
    }
    profiles
 }
@@ -530,7 +511,7 @@ pub fn settings_profiles(settings: &Path) -> Vec<MavenProfile> {
 /// `<localRepository>` of a settings file, when it names one: the repository a build
 /// with `-s <file>` resolves into, which is not necessarily the user's default.
 pub fn local_repository_of(settings: &Path) -> Option<PathBuf> {
-    let text = xml::read_text(settings)?;
+    let text = std::fs::read_to_string(settings).ok()?;
    let root = xml::parse(&text)?;
    let repo = root.text_of("localRepository")?.trim().to_owned();
    if repo.is_empty() {
@@ -556,7 +537,7 @@ impl Resolver {
    fn pom(&mut self, path: &Path) -> Option<RawPom> {
        self.poms
            .entry(path.to_path_buf())
-            .or_insert_with(|| xml::read_text(path).as_deref().and_then(parse_pom))
+            .or_insert_with(|| std::fs::read_to_string(path).ok().and_then(|t| parse_pom(&t)))
            .clone()
    }

@@ -712,27 +693,18 @@ pub(crate) fn launch_inputs(
        // Profile activation may depend on the presence of an otherwise unrelated file.
        let activation = parent == "file" && matches!(el.name.as_str(), "exists" | "missing");
        if input || activation {
-            // A source root under Maven's build directory is generated by the build itself.
-            // Skip it without resolving the property: `<build><directory>` may be custom, and
-            // hashing its rewritten files would make every launch look changed.
-            if !(input && el.text.contains("${project.build.directory}")) {
-                // Other properties can be overridden by -D, profiles or settings. Without
-                // Maven's effective model, leave them unresolved to conservatively disable reuse.
-                let value = el
-                    .text
-                    .trim()
-                    .replace("${project.basedir}", &dir.to_string_lossy())
-                    .replace("${basedir}", &dir.to_string_lossy());
-                if value.contains("${") {
-                    return None;
-                }
-                if !value.is_empty() {
-                    let path = dir.join(value);
-                    // Conventional generated sources under target are also build outputs.
-                    if !(input && path.starts_with(dir.join("target"))) {
-                        out.push(path);
-                    }
-                }
+            // Other properties can be overridden by -D, profiles or settings.
+            // Without Maven's effective roots, conservatively disable reuse for them.
+            let value = el
+                .text
+                .trim()
+                .replace("${project.basedir}", &dir.to_string_lossy())
+                .replace("${basedir}", &dir.to_string_lossy());
+            if value.contains("${") {
+                return None;
+            }
+            if !value.is_empty() {
+                out.push(dir.join(value));
            }
        }
        for child in &el.children {
@@ -756,7 +728,7 @@ pub(crate) fn launch_inputs(
                return None;
            }
            out.push(path.clone());
-            let text = xml::read_text(&path)?;
+            let text = std::fs::read_to_string(&path).ok()?;
            roots(&xml::parse(&text)?, "", &dir, &mut out)?;
            let raw = resolver.pom(&path)?;
            let Some(parent) = raw.parent else { break };
@@ -1044,6 +1016,10 @@ pub(crate) fn plugin(

 const MAX_PROJECTS: usize = 1000;

+fn rel_path(root: &Path, p: &Path) -> String {
+    p.strip_prefix(root).unwrap_or(p).to_string_lossy().replace('\\', "/")
+}
+
 /// The POMs that are not modules of another one: the root `pom.xml`, else the
 /// shallowest `pom.xml` of each branch (a folder holding several builds). An
 /// aggregate POM directly inside `src/` counts too (issue #1001: `src/pom.xml`
@@ -1057,29 +1033,18 @@ pub fn is_maven_project(root: &Path) -> bool {
    !top_level_poms(root).is_empty()
 }

-/// The `mvnw` nearest to `dir`. Inside `root` the walk stops at `root`. Outside it,
-/// the walk stops before entering `root` or any ancestor of `root`: a sibling project
-/// keeps its own wrapper, and the search does not continue to the filesystem root.
+/// The `mvnw` nearest to `dir`, looking up to `root`.
 fn wrapper(root: &Path, dir: &Path) -> String {
    let name = if cfg!(windows) { "mvnw.cmd" } else { "mvnw" };
-    let root = dunce::canonicalize(root).unwrap_or_else(|_| root.to_path_buf());
-    let dir = dunce::canonicalize(dir).unwrap_or_else(|_| dir.to_path_buf());
-    let external = !dir.starts_with(&root);
-    let mut cur = Some(dir.as_path());
+    let mut cur = Some(dir);
    while let Some(d) = cur {
        if d.join(name).is_file() {
            return d.join(name).to_string_lossy().into_owned();
        }
-        if !external && d == root {
+        if d == root {
            break;
        }
-        let Some(parent) = d.parent() else { break };
-        // `parent` inside the opened project, or an ancestor of it (the common parent,
-        // then the filesystem root). Stop before inspecting those.
-        if external && (parent.starts_with(&root) || root.starts_with(parent)) {
-            break;
-        }
-        cur = Some(parent);
+        cur = d.parent();
    }
    if cfg!(windows) { "mvn.cmd".into() } else { "mvn".into() }
 }
@@ -1098,7 +1063,7 @@ pub fn load(root: &Path) -> MavenModel {

 /// [`load`] with the POMs `settings` link (Add Maven Projects).
 pub fn load_linked(root: &Path, settings: &ide_core::settings::MavenSettings) -> MavenModel {
-    load_with_linked(root, default_local_repo(), &settings.profiles(&[]), &settings.linked_projects)
+    load_with_linked(root, default_local_repo(), &[], &settings.linked_projects)
 }

 pub(crate) fn load_with_repo(root: &Path, local_repo: Option<PathBuf>) -> MavenModel {
@@ -1123,118 +1088,24 @@ pub(crate) fn load_with(root: &Path, local_repo: Option<PathBuf>, profiles: &[St
    load_with_linked(root, local_repo, profiles, &[])
 }

-/// The `pom.xml` files `linked` names. Each entry is used as written (project-relative,
-/// `../sibling/pom.xml`, or absolute) and canonicalized; a path that is not an existing
-/// `pom.xml` is skipped. Nothing here lists a directory or walks parents looking for builds.
+/// The POMs of `linked` (project-relative, from Settings) that exist inside `root`.
 fn linked_poms(root: &Path, linked: &[String]) -> Vec<PathBuf> {
    let base = dunce::canonicalize(root).unwrap_or_else(|_| root.to_path_buf());
    let mut out: Vec<PathBuf> = Vec::new();
    for pom in linked {
-        let Some(path) = dunce::canonicalize(base.join(pom.trim())).ok() else { continue };
-        if is_pom_file(&path) && !out.contains(&path) {
+        let pom = normalized_pom(pom);
+        if pom.is_empty() || pom.starts_with("../") || pom == ".." {
+            continue;
+        }
+        let path = root.join(&pom);
+        let inside = dunce::canonicalize(&path).is_ok_and(|p| p.starts_with(&base));
+        if path.is_file() && inside && !out.contains(&path) {
            out.push(path);
        }
    }
    out
 }

-fn is_pom_file(path: &Path) -> bool {
-    path.is_file()
-        && path
-            .file_name()
-            .and_then(|name| name.to_str())
-            .is_some_and(|name| if cfg!(windows) { name.eq_ignore_ascii_case("pom.xml") } else { name == "pom.xml" })
-}
-
-/// Identity of `path` (both canonical) within `root`: project-relative inside it,
-/// otherwise the absolute path with forward slashes.
-fn project_rel(root: &Path, path: &Path) -> String {
-    path.strip_prefix(root).unwrap_or(path).to_string_lossy().replace('\\', "/")
-}
-
-/// Canonical `pom.xml` paths named by `linked`, keyed by the spelling to store and to
-/// show so unlink removes the same entry settings hold. The first spelling wins.
-fn linked_identities(root: &Path, linked: &[String]) -> HashMap<PathBuf, String> {
-    let mut out = HashMap::new();
-    for entry in linked {
-        let entry = entry.trim();
-        if entry.is_empty() {
-            continue;
-        }
-        let Some(path) = dunce::canonicalize(root.join(entry)).ok() else { continue };
-        if is_pom_file(&path) {
-            out.entry(path).or_insert_with(|| entry.replace('\\', "/"));
-        }
-    }
-    out
-}
-
-/// Stable, deduplicated form of `poms` for `languages.java.maven.linkedProjects`.
-/// An existing `pom.xml` inside `root` is project-relative; one outside it is the
-/// canonical absolute path. Spellings of the same file (`../B/pom.xml`, an absolute
-/// path, a symlink) collapse to one entry. A path that exists and is not a `pom.xml`
-/// is dropped. A `pom.xml` that cannot be resolved yet is kept, so a link is not
-/// discarded while its volume is offline. No directory is scanned.
-pub fn normalize_linked_poms(root: &Path, poms: &[String]) -> Vec<String> {
-    let Some(root) = dunce::canonicalize(root).ok() else {
-        let mut out = Vec::new();
-        for pom in poms {
-            let pom = normalized_pom(pom);
-            if !pom.is_empty() && pom_name_ok(&pom) && !out.contains(&pom) {
-                out.push(pom);
-            }
-        }
-        return out;
-    };
-    let mut out = Vec::new();
-    let mut seen = HashSet::new();
-    for pom in poms {
-        let pom = pom.trim();
-        if pom.is_empty() {
-            continue;
-        }
-        let key = match dunce::canonicalize(root.join(pom)) {
-            Ok(path) if is_pom_file(&path) => project_rel(&root, &path),
-            Ok(_) => continue,
-            Err(_) => {
-                let fallback = normalized_pom(pom);
-                let joined = root.join(pom);
-                if !pom_name_ok(&fallback) || (joined.exists() && !is_pom_file(&joined)) {
-                    continue;
-                }
-                fallback
-            }
-        };
-        if key.is_empty() || !seen.insert(key.clone()) {
-            continue;
-        }
-        out.push(key);
-    }
-    out
-}
-
-fn pom_name_ok(path: &str) -> bool {
-    let name = path.rsplit('/').next().unwrap_or(path);
-    if cfg!(windows) { name.eq_ignore_ascii_case("pom.xml") } else { name == "pom.xml" }
-}
-
-/// Directories of linked `pom.xml` files that sit outside `root` (the opened project
-/// stays the root). Callers keep the outermost directory only. Modules a POM declares
-/// outside its own directory are not included: a linked file cannot widen the indexed
-/// tree to an arbitrary path.
-pub fn external_pom_dirs(root: &Path, linked: &[String]) -> Vec<PathBuf> {
-    let base = dunce::canonicalize(root).unwrap_or_else(|_| root.to_path_buf());
-    let mut out = Vec::new();
-    for pom in linked_poms(root, linked) {
-        let Some(dir) = pom.parent() else { continue };
-        if dir.starts_with(&base) || out.iter().any(|have| have == dir) {
-            continue;
-        }
-        out.push(dir.to_path_buf());
-    }
-    out
-}
-
 /// Whether `root` holds a Maven build or the settings link one inside it.
 pub fn has_projects(root: &Path, settings: &ide_core::settings::MavenSettings) -> bool {
    is_maven_project(root) || !linked_poms(root, &settings.linked_projects).is_empty()
@@ -1243,9 +1114,7 @@ pub fn has_projects(root: &Path, settings: &ide_core::settings::MavenSettings) -
 /// The model with the chosen `profiles` (`-P` entries; `!id` deactivates: their modules,
 /// dependencies and properties are part of the model, those turned off are not) and the
 /// `linked` POMs (Add Maven Projects): builds that no reactor lists, shown as independent
-/// top-level projects, including a `pom.xml` outside the opened root. A linked POM that
-/// turns out to be a module of the root reactor stays that module. The same canonical file
-/// is loaded once, so a cycle or a second spelling does not duplicate it or edit either POM.
+/// top-level projects. A linked POM that turns out to be a module of the root reactor stays that module.
 pub fn load_with_linked(
    root: &Path,
    local_repo: Option<PathBuf>,
@@ -1254,10 +1123,7 @@ pub fn load_with_linked(
 ) -> MavenModel {
    let mut resolver = Resolver::new(local_repo, profiles);
    let mut model = MavenModel::default();
-    // Canonical POM → its project, for a module listed again by a later aggregator.
-    let mut seen: HashMap<PathBuf, Option<usize>> = HashMap::new();
-    let canonical_root = dunce::canonicalize(root).unwrap_or_else(|_| root.to_path_buf());
-    let linked_ids = linked_identities(&canonical_root, linked);
+    let mut seen: HashSet<PathBuf> = HashSet::new();
    let mut tops = top_level_poms(root);
    for pom in linked_poms(root, linked) {
        if !tops.contains(&pom) {
@@ -1265,31 +1131,17 @@ pub fn load_with_linked(
        }
    }
    // (pom, aggregated); the root reactor and its modules come before linked POMs.
-    // (pom, listed by): a module carries the top-level project its chain started from and
-    // whether the aggregator listing it lies inside the opened root.
-    let mut stack: Vec<(PathBuf, Option<(usize, bool)>)> = tops.into_iter().rev().map(|p| (p, None)).collect();
-    while let Some((path, listed_by)) = stack.pop() {
-        let aggregated = listed_by.is_some();
+    let mut stack: Vec<(PathBuf, bool)> = tops.into_iter().rev().map(|p| (p, false)).collect();
+    while let Some((path, aggregated)) = stack.pop() {
        if model.projects.len() >= MAX_PROJECTS {
            break;
        }
        let canonical = dunce::canonicalize(&path).unwrap_or_else(|_| path.clone());
-        if let Some(known) = seen.get(&canonical) {
-            // Found as a top-level POM first, then listed by an aggregator elsewhere
-            // (`<module>../</module>` of `parent/pom.xml`): it is that aggregator's module.
-            // Not when the chain leads back to where it started (a cycle), and not for an
-            // aggregator outside the opened root: a linked sibling does not take it over.
-            if let (Some(known), Some((origin, true))) = (*known, listed_by)
-                && known != origin
-            {
-                model.projects[known].aggregated = true;
-            }
+        if !seen.insert(canonical) {
            continue;
        }
-        seen.insert(canonical.clone(), None);
        let Some(pom) = resolver.pom(&path) else { continue };
        let dir = path.parent().unwrap_or(root).to_path_buf();
-        let dir_canon = dunce::canonicalize(&dir).unwrap_or_else(|_| dir.clone());
        let ctx = resolver.context(&path, 0);
        let props = resolver.properties_for(&pom, &ctx, &dir);
        let i = |s: &str| interpolate(s, &props);
@@ -1300,7 +1152,7 @@ pub fn load_with_linked(
        }
        let mut modules: Vec<PathBuf> = Vec::new();
        for m in module_names {
-            let mut mp = crate::gradle::normalize(&dir.join(i(&m)));
+            let mut mp = dir.join(i(&m));
            if mp.is_dir() || mp.extension().is_none_or(|e| e != "xml") {
                mp.push("pom.xml");
            }
@@ -1360,43 +1212,31 @@ pub fn load_with_linked(
        // The project can activate the profiles of its own POM and its ancestors'.
        for (id, active) in &ctx.profiles {
            if !model.profiles.iter().any(|x| x.id == *id) {
-                model.profiles.push(MavenProfile { id: id.clone(), active_by_default: *active, ..Default::default() });
+                model.profiles.push(MavenProfile { id: id.clone(), active_by_default: *active });
            }
        }
        let artifact_id = i(&pom.artifact_id);
-        let module_ids: Vec<String> = modules
-            .iter()
-            .map(|m| {
-                let canonical = dunce::canonicalize(m).unwrap_or_else(|_| m.clone());
-                linked_ids.get(&canonical).cloned().unwrap_or_else(|| project_rel(&canonical_root, &canonical))
-            })
-            .collect();
        model.projects.push(MavenProject {
-            project_root: None,
-            pom: linked_ids.get(&canonical).cloned().unwrap_or_else(|| project_rel(&canonical_root, &canonical)),
-            dir: project_rel(&canonical_root, &dir_canon),
+            pom: rel_path(root, &path),
+            dir: rel_path(root, &dir),
            group_id: i(props.get("project.groupId").map(String::as_str).unwrap_or_default()),
            version: i(props.get("project.version").map(String::as_str).unwrap_or_default()),
            display_name: pom.name.as_deref().map(i).filter(|n| !n.is_empty()).unwrap_or_else(|| artifact_id.clone()),
            artifact_id,
            packaging,
            parent: pom.parent.as_ref().map(|p| format!("{}:{}:{}", p.group_id, p.artifact_id, i(&p.version))),
-            modules: module_ids,
+            modules: modules.iter().map(|m| rel_path(root, m)).collect(),
            aggregated,
            plugins,
            dependencies,
            profiles: ctx.profiles.iter().map(|(id, _)| id.clone()).collect(),
            java_version: jv,
-            command: wrapper(&canonical_root, &dir_canon),
+            command: wrapper(root, &dir),
            options: Vec::new(),
            env: BTreeMap::new(),
        });
-        let index = model.projects.len() - 1;
-        seen.insert(canonical, Some(index));
-        let origin = listed_by.map_or(index, |(origin, _)| origin);
-        let inside = dir_canon.starts_with(&canonical_root);
        for m in modules.into_iter().rev() {
-            stack.push((m, Some((origin, inside))));
+            stack.push((m, true));
        }
    }
    model
@@ -1484,27 +1324,17 @@ impl UnlinkedProjects {

 fn normalized_pom(pom: &str) -> String {
    let pom = pom.replace('\\', "/");
-    let unc = pom.starts_with("//");
-    let absolute = pom.starts_with('/');
-    let mut parts: Vec<&str> = Vec::new();
+    let mut parts = Vec::new();
    for part in pom.split('/') {
        match part {
            "" | "." => {}
-            // Keep a drive letter (`C:`) and a leading `..` that has nothing to climb.
-            ".." if parts.last().is_some_and(|p| *p != ".." && !p.ends_with(':')) => {
+            ".." if parts.last().is_some_and(|p| *p != "..") => {
                parts.pop();
            }
            part => parts.push(part),
        }
    }
-    let joined = parts.join("/");
-    if unc {
-        format!("//{joined}")
-    } else if absolute {
-        format!("/{joined}")
-    } else {
-        joined
-    }
+    parts.join("/")
 }

 /// Every POM of the model (for change detection).
@@ -1689,15 +1519,6 @@ pub enum PomGotoKind {
    ManagedDependency,
    /// A `<pluginManagement>` entry providing the plugin's version.
    ManagedPlugin,
-    /// The POM of the artifact itself: a project module's, else the local repository's.
-    ArtifactPom,
-}
-
-/// A Maven project of the workspace, for going to a dependency on it.
-pub struct ModulePom {
-    pub group_id: String,
-    pub artifact_id: String,
-    pub pom: PathBuf,
 }

 /// Byte offset of `pos` (0-based line / UTF-16 column), clamped to `text`.
@@ -1748,7 +1569,7 @@ fn property_ref_at(text: &str, at: usize) -> Option<(&str, usize, usize)> {
 }

 /// The elements containing `at`, from the root down to the innermost one.
-pub(crate) fn element_path(root: &Element, at: usize) -> Vec<&Element> {
+fn element_path(root: &Element, at: usize) -> Vec<&Element> {
    let mut path = vec![root];
    loop {
        let Some(next) = path.last().unwrap().children.iter().find(|c| c.start <= at && at < c.end) else {
@@ -1777,20 +1598,6 @@ fn coordinates(e: &Element, props: &HashMap<String, String>) -> Option<(String,
 /// the local repository when it is not in the project). `None` when there is no
 /// resolvable declaration here.
 pub fn goto_declaration(text: &str, path: &Path, pos: Pos, local_repo: Option<PathBuf>) -> Option<PomGoto> {
-    goto_declaration_in(text, path, pos, local_repo, Vec::new)
-}
-
-/// [`goto_declaration`], where a `<parent>` and a dependency or plugin whose version no
-/// management entry provides (or a management entry itself) go to the artifact's own
-/// POM: the project module among `modules` with its coordinates, else the local
-/// repository's POM of its version.
-pub fn goto_declaration_in(
-    text: &str,
-    path: &Path,
-    pos: Pos,
-    local_repo: Option<PathBuf>,
-    modules: impl FnOnce() -> Vec<ModulePom>,
-) -> Option<PomGoto> {
    let root = xml::parse(text).filter(|e| e.name == "project")?;
    let at = offset_at(text, pos);
    if let Some((name, _, _)) = property_ref_at(text, at)
@@ -1801,56 +1608,15 @@ pub fn goto_declaration_in(
    // A `<dependency>` / `<plugin>` in a declaration position: its version may come
    // from a management entry of this POM or an ancestor's.
    let elements = element_path(&root, at);
-    if elements.get(1).is_some_and(|e| e.name == "parent") {
-        let chain = parent_chain(path, text, local_repo);
-        let (pom, parent_text) = chain.get(1)?;
-        let label = elements[1].text_of("artifactId").unwrap_or_default();
-        return Some(pom_goto(pom.clone(), parent_text, label));
-    }
    let e = elements.iter().rev().find(|e| e.name == "dependency" || e.name == "plugin")?;
-    // A management entry declares the version: it goes to the artifact (a BOM import, say).
-    if !elements.iter().any(|a| a.name == "dependencyManagement" || a.name == "pluginManagement") {
-        let kind = match e.name.as_str() {
-            "dependency" => PomGotoKind::ManagedDependency,
-            _ => PomGotoKind::ManagedPlugin,
-        };
-        if let Some(found) = managed_target(text, path, e, kind, local_repo.clone()) {
-            return Some(found);
-        }
+    if elements.iter().any(|a| a.name == "dependencyManagement" || a.name == "pluginManagement") {
+        return None; // Management entries are declarations; there is nothing to go to.
    }
-    artifact_target(text, path, e, local_repo, modules)
-}
-
-/// The artifact's own POM for a dependency or plugin element `e`.
-fn artifact_target(
-    text: &str,
-    path: &Path,
-    e: &Element,
-    local_repo: Option<PathBuf>,
-    modules: impl FnOnce() -> Vec<ModulePom>,
-) -> Option<PomGoto> {
-    let mut resolver = Resolver::new(local_repo.clone(), &[]);
-    let chain = parent_chain(path, text, local_repo);
-    let props = properties_at(&mut resolver, &chain, 0);
-    let (group, artifact) = coordinates(e, &props)?;
-    let label = format!("{group}:{artifact}");
-    if let Some(module) = modules().into_iter().find(|m| m.group_id == group && m.artifact_id == artifact) {
-        let module_text = xml::read_text(&module.pom)?;
-        return Some(pom_goto(module.pom, &module_text, label));
-    }
-    let version = interpolate(&e.text_of("version")?, &props);
-    let pom = resolver.repo_pom(&group, &artifact, &version)?;
-    let pom_text = xml::read_text(&pom)?;
-    Some(pom_goto(pom, &pom_text, label))
-}
-
-/// The POM at `path` as a target, at its `<artifactId>`.
-fn pom_goto(path: PathBuf, text: &str, label: String) -> PomGoto {
-    let range = xml::parse(text)
-        .filter(|e| e.name == "project")
-        .and_then(|root| root.child("artifactId").map(|a| range_of(text, a)))
-        .unwrap_or_default();
-    PomGoto { path, range, kind: PomGotoKind::ArtifactPom, label }
+    let kind = match e.name.as_str() {
+        "dependency" => PomGotoKind::ManagedDependency,
+        _ => PomGotoKind::ManagedPlugin,
+    };
+    managed_target(text, path, e, kind, local_repo)
 }

 /// The parent POMs of the POM in `text` at `path`, child-first (its `<parent>` refs,
@@ -1865,7 +1631,7 @@ fn parent_chain(path: &Path, text: &str, local_repo: Option<PathBuf>) -> Vec<(Pa
        let Some(parent) = pom.and_then(|p| p.parent) else { return chain };
        let Some(pp) = resolver.parent_path(&dir, &parent) else { return chain };
        let pp = dunce::canonicalize(&pp).unwrap_or(pp);
-        let Some(next) = xml::read_text(&pp) else { return chain };
+        let Ok(next) = std::fs::read_to_string(&pp) else { return chain };
        pom = resolver.pom(&pp);
        dir = pp.parent().unwrap_or(Path::new("")).to_path_buf();
        chain.push((pp, next));
@@ -2070,7 +1836,7 @@ mod tests {
 </settings>"#,
        )
        .unwrap();
-        let p = |id: &str, active| MavenProfile { id: id.into(), active_by_default: active, ..Default::default() };
+        let p = |id: &str, active| MavenProfile { id: id.into(), active_by_default: active };
        assert_eq!(settings_profiles(&file), [p("nexus", true), p("jdk21", true), p("release", false)]);
        assert!(settings_profiles(&tmp.path().join("missing.xml")).is_empty());

@@ -2149,52 +1915,6 @@ mod tests {
        assert_eq!(known.goals, ["compile", "help", "testCompile"], "the common plugins keep their table");
    }

-    #[test]
-    fn launch_inputs_skip_generated_sources_under_the_project_build_directory() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        write(
-            root,
-            "pom.xml",
-            "<project><groupId>demo</groupId><artifactId>parent</artifactId><version>1</version>\
-             <packaging>pom</packaging><modules><module>app</module></modules></project>",
-        );
-        write(
-            root,
-            "app/pom.xml",
-            r#"<project><parent><groupId>demo</groupId><artifactId>parent</artifactId><version>1</version></parent>
-               <artifactId>app</artifactId><build><plugins><plugin>
-                 <groupId>org.codehaus.mojo</groupId><artifactId>build-helper-maven-plugin</artifactId>
-                 <executions><execution><configuration><sources>
-                   <source>${project.build.directory}/generated-sources/java</source>
-                 </sources></configuration></execution></executions>
-               </plugin></plugins></build></project>"#,
-        );
-        let model = load_with_repo(root, None);
-        let projects: Vec<&MavenProject> = model.projects.iter().collect();
-        let inputs = launch_inputs(root, &projects, None).expect("portable launch inputs");
-        assert!(!inputs.contains(&root.join("app/target/generated-sources/java")), "{inputs:?}");
-        assert!(inputs.contains(&root.join("app/src")), "conventional sources stay fingerprinted");
-    }
-
-    #[test]
-    fn launch_inputs_disable_reuse_for_file_activation_on_the_build_directory() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        write(
-            root,
-            "pom.xml",
-            r#"<project><groupId>demo</groupId><artifactId>app</artifactId><version>1</version>
-               <build><directory>${project.basedir}/custom-build</directory></build>
-               <profiles><profile><id>generated</id><activation><file>
-                 <exists>${project.build.directory}/enable-profile</exists>
-               </file></activation></profile></profiles></project>"#,
-        );
-        let model = load_with_repo(root, None);
-        let projects: Vec<&MavenProject> = model.projects.iter().collect();
-        assert!(launch_inputs(root, &projects, None).is_none());
-    }
-
    fn write(dir: &Path, rel: &str, text: &str) {
        let p = dir.join(rel);
        std::fs::create_dir_all(p.parent().unwrap()).unwrap();
@@ -2410,169 +2130,6 @@ mod tests {
        assert_eq!(top(&load_linked(deep.path(), &settings)), [("a/b/c/tool".into(), false)]);
    }

-    /// A sibling Maven project is linked beside the opened root. Its reactor, including a
-    /// module that points back at the opened project, is read once. Neither POM is rewritten,
-    /// and only the linked project's directory is an extra content root — not the common
-    /// parent and not a module that lives outside that directory.
-    #[test]
-    fn external_sibling_keeps_its_directory_and_does_not_edit_poms() {
-        let tmp = tempfile::tempdir().unwrap();
-        let base = dunce::canonicalize(tmp.path()).unwrap();
-        let a = base.join("A");
-        let b = base.join("B");
-        let c = base.join("C");
-        std::fs::create_dir_all(a.join("core")).unwrap();
-        std::fs::create_dir_all(b.join("mod")).unwrap();
-        std::fs::create_dir_all(&c).unwrap();
-        let a_pom = "<project><groupId>demo</groupId><artifactId>a</artifactId><version>1</version><packaging>pom</packaging><modules><module>core</module></modules></project>";
-        let b_pom = "<project><groupId>demo</groupId><artifactId>b</artifactId><version>1</version><packaging>pom</packaging><modules><module>mod</module><module>../A</module><module>../C</module><module>.</module></modules></project>";
-        let c_pom = "<project><groupId>demo</groupId><artifactId>c</artifactId><version>1</version><modules><module>../B</module></modules></project>";
-        std::fs::write(a.join("pom.xml"), a_pom).unwrap();
-        std::fs::write(a.join("core/pom.xml"), "<project><artifactId>core</artifactId></project>").unwrap();
-        std::fs::write(b.join("pom.xml"), b_pom).unwrap();
-        std::fs::write(b.join("mod/pom.xml"), "<project><artifactId>bmod</artifactId></project>").unwrap();
-        std::fs::write(c.join("pom.xml"), c_pom).unwrap();
-        let wrapper = if cfg!(windows) { "mvnw.cmd" } else { "mvnw" };
-        std::fs::write(a.join(wrapper), "#!/bin/sh\n").unwrap();
-        std::fs::write(b.join(wrapper), "#!/bin/sh\n").unwrap();
-        std::fs::write(base.join(wrapper), "#!/bin/sh\n").unwrap();
-
-        let discovered = load_with_linked(&a, None, &[], &[]);
-        assert_eq!(discovered.projects.iter().map(|p| p.artifact_id.as_str()).collect::<Vec<_>>(), ["a", "core"]);
-
-        let stored = vec!["../B/pom.xml".into()];
-        let linked = load_with_linked(&a, None, &[], &stored);
-        let b_project = linked.projects.iter().find(|p| p.artifact_id == "b").unwrap();
-        assert!(!b_project.aggregated);
-        assert_eq!(b_project.pom, "../B/pom.xml");
-        assert_eq!(dunce::canonicalize(a.join(&b_project.dir)).unwrap(), b);
-        assert_eq!(dunce::canonicalize(&b_project.command).unwrap(), dunce::canonicalize(b.join(wrapper)).unwrap());
-        let a_project = linked.projects.iter().find(|p| p.artifact_id == "a").unwrap();
-        assert!(!a_project.aggregated);
-        assert_eq!(a_project.modules, ["core/pom.xml"]);
-        assert_eq!(dunce::canonicalize(&a_project.command).unwrap(), dunce::canonicalize(a.join(wrapper)).unwrap());
-        assert_eq!(linked.projects.iter().filter(|p| p.artifact_id == "a").count(), 1);
-        assert_eq!(linked.projects.iter().filter(|p| p.artifact_id == "b").count(), 1);
-        assert!(linked.projects.iter().any(|p| p.artifact_id == "c" && p.aggregated));
-        assert!(linked.projects.iter().any(|p| p.artifact_id == "bmod" && p.aggregated));
-        let again = load_with_linked(&a, None, &[], &stored);
-        assert_eq!(
-            again.projects.iter().map(|p| &p.pom).collect::<Vec<_>>(),
-            linked.projects.iter().map(|p| &p.pom).collect::<Vec<_>>()
-        );
-
-        let absolute = b.join("pom.xml").to_string_lossy().replace('\\', "/");
-        let via_a = a.join("../B/pom.xml").to_string_lossy().replace('\\', "/");
-        let normalized = normalize_linked_poms(
-            &a,
-            &[
-                "../B/pom.xml".into(),
-                absolute,
-                via_a,
-                a.join("pom.xml").to_string_lossy().into_owned(),
-                b.to_string_lossy().into_owned(),
-                "stub/pom.xml".into(),
-                "notes.xml".into(),
-            ],
-        );
-        assert_eq!(normalized.len(), 3, "{normalized:?}");
-        assert_eq!(normalized[0], dunce::canonicalize(b.join("pom.xml")).unwrap().to_string_lossy().replace('\\', "/"));
-        assert_eq!(normalized[1], "pom.xml");
-        assert_eq!(normalized[2], "stub/pom.xml");
-        assert_eq!(crate::maven_external_roots(&a, &normalized), vec![b.clone()]);
-        assert_eq!(crate::maven_external_roots(&a, &stored), vec![b.clone()]);
-
-        let removed = load_with_linked(&a, None, &[], &[]);
-        assert!(removed.projects.iter().all(|p| p.artifact_id != "b"));
-        assert_eq!(std::fs::read_to_string(a.join("pom.xml")).unwrap(), a_pom);
-        assert_eq!(std::fs::read_to_string(b.join("pom.xml")).unwrap(), b_pom);
-        assert_eq!(std::fs::read_to_string(c.join("pom.xml")).unwrap(), c_pom);
-        assert!(b.join("mod/pom.xml").is_file());
-    }
-
-    /// The launcher recorded on an external project is that project's wrapper, and
-    /// running it uses the external directory as the working directory.
-    #[cfg(unix)]
-    #[test]
-    fn external_project_wrapper_runs_in_its_own_directory() {
-        let tmp = tempfile::tempdir().unwrap();
-        let base = dunce::canonicalize(tmp.path()).unwrap();
-        let a = base.join("A");
-        let b = base.join("B");
-        std::fs::create_dir_all(b.join("src/main/java")).unwrap();
-        std::fs::create_dir_all(&a).unwrap();
-        std::fs::write(a.join("pom.xml"), "<project><artifactId>a</artifactId></project>").unwrap();
-        std::fs::write(
-            b.join("pom.xml"),
-            "<project><artifactId>b</artifactId><build><sourceDirectory>src/main/java</sourceDirectory></build></project>",
-        )
-        .unwrap();
-        std::fs::write(b.join("src/main/java/B.java"), "class B {}").unwrap();
-        let script = b.join("mvnw");
-        std::fs::write(&script, "#!/bin/sh\npwd > \"$1\"\nprintf 'BUILD SUCCESS\\n'\n").unwrap();
-        #[cfg(unix)]
-        {
-            use std::os::unix::fs::PermissionsExt;
-            std::fs::set_permissions(&script, std::fs::Permissions::from_mode(0o755)).unwrap();
-        }
-        let model = load_with_linked(&a, None, &[], &["../B/pom.xml".into()]);
-        let project = model.projects.iter().find(|p| p.artifact_id == "b").unwrap();
-        let cwd = a.join(&project.dir);
-        assert_eq!(dunce::canonicalize(&cwd).unwrap(), b);
-        let marker = tmp.path().join("cwd");
-        let out = crate::process::run(
-            &project.command,
-            &[marker.to_string_lossy().into_owned()],
-            &cwd,
-            &std::collections::BTreeMap::new(),
-            &ide_core::CancellationToken::new(),
-            |_, _| {},
-        )
-        .unwrap();
-        assert!(out.success, "{}", out.text);
-        let recorded = dunce::canonicalize(std::fs::read_to_string(&marker).unwrap().trim()).unwrap();
-        assert_eq!(recorded, b);
-    }
-
-    /// #2877: an aggregator in a subfolder lists the root POM as `../`; linked, it holds every
-    /// module, the root one included, under the same POM paths the projects have.
-    #[test]
-    fn an_aggregator_in_a_subfolder_holds_the_root_pom() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        let child = |id: &str, rel: &str| {
-            format!(
-                "<project><parent><groupId>demo</groupId><artifactId>parent</artifactId><version>1.0</version><relativePath>{rel}</relativePath></parent><artifactId>{id}</artifactId></project>"
-            )
-        };
-        write(root, "pom.xml", &child("app", "parent/pom.xml"));
-        write(
-            root,
-            "parent/pom.xml",
-            "<project><groupId>demo</groupId><artifactId>parent</artifactId><version>1.0</version><packaging>pom</packaging><modules><module>../</module><module>../infra</module></modules></project>",
-        );
-        write(root, "infra/pom.xml", &child("infra", "../parent/pom.xml"));
-
-        let model = load_with_linked(root, None, &[], &["parent/pom.xml".into()]);
-        let tops: Vec<&str> = model.projects.iter().filter(|p| !p.aggregated).map(|p| p.artifact_id.as_str()).collect();
-        assert_eq!(tops, ["parent"]);
-        let parent = model.projects.iter().find(|p| p.artifact_id == "parent").unwrap();
-        assert_eq!(parent.modules, ["pom.xml", "infra/pom.xml"]);
-        for pom in &parent.modules {
-            assert!(model.projects.iter().any(|p| &p.pom == pom), "{pom}");
-        }
-
-        // A cycle (the root lists the aggregator, which lists the root) keeps the root on top.
-        write(
-            root,
-            "pom.xml",
-            "<project><groupId>demo</groupId><artifactId>app</artifactId><version>1.0</version><packaging>pom</packaging><modules><module>parent</module></modules></project>",
-        );
-        let model = load_with_linked(root, None, &[], &[]);
-        let tops: Vec<&str> = model.projects.iter().filter(|p| !p.aggregated).map(|p| p.artifact_id.as_str()).collect();
-        assert_eq!(tops, ["app"]);
-    }
-
    #[test]
    fn chosen_profiles_bring_their_modules_and_dependencies() {
        let tmp = tempfile::tempdir().unwrap();
@@ -2731,24 +2288,6 @@ mod tests {
        assert!(!is_maven_project(&root.join("c")));
    }

-    #[test]
-    fn non_utf8_pom_with_declared_encoding_is_a_build() {
-        // Issue #2439: a GBK `pom.xml` is not valid UTF-8; it must still load
-        // instead of vanishing as "No maven project".
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        let (bytes, _, _) = encoding_rs::GBK.encode(
-            "<?xml version=\"1.0\" encoding=\"GBK\"?>\n<project><groupId>g</groupId>\
-             <artifactId>应用</artifactId><version>1</version><name>演示</name></project>",
-        );
-        std::fs::write(root.join("pom.xml"), bytes.as_ref()).unwrap();
-        let model = load_with_repo(root, None);
-        assert_eq!(model.projects.len(), 1);
-        assert_eq!(model.projects[0].artifact_id, "应用");
-        assert_eq!(model.projects[0].display_name, "演示");
-        assert!(is_maven_project(root));
-    }
-
    #[test]
    fn aggregate_pom_in_src_is_a_build() {
        // Issue #1001: `src/pom.xml` aggregating modules under `src/` is recognized,
@@ -3206,9 +2745,9 @@ mod tests {
        let text = std::fs::read_to_string(&path).unwrap();
        // The property is declared nowhere along the chain.
        assert_eq!(goto_declaration(&text, &path, at(&text, "${missing.key}"), None), None);
-        // The dependency names its own version and no local repository has its POM.
+        // The dependency names its own version: it is the declaration.
        assert_eq!(goto_declaration(&text, &path, at(&text, "<artifactId>other-lib"), None), None);
-        // A management entry declares the version; its artifact's POM is not at hand either.
+        // A management entry is a declaration itself, not a reference.
        let parent_path = tmp.path().join("pom.xml");
        let parent_text = std::fs::read_to_string(&parent_path).unwrap();
        assert_eq!(
@@ -3220,72 +2759,6 @@ mod tests {
        assert_eq!(goto_declaration("<project></project>", &path, Pos::new(0, 3), None), None);
    }

-    #[test]
-    fn artifacts_go_to_their_own_pom_in_the_project_or_the_local_repository() {
-        let tmp = tempfile::tempdir().unwrap();
-        let repo = tmp.path().join("repo");
-        let bom_dir = repo.join("com/alibaba/cloud/spring-cloud-alibaba-dependencies/2.2.6.RELEASE");
-        std::fs::create_dir_all(&bom_dir).unwrap();
-        let bom = "<project>\n  <groupId>com.alibaba.cloud</groupId>\n  <artifactId>spring-cloud-alibaba-dependencies</artifactId>\n</project>";
-        std::fs::write(bom_dir.join("spring-cloud-alibaba-dependencies-2.2.6.RELEASE.pom"), bom).unwrap();
-        let parent = format!(
-            r#"{PARENT_HEADER}<properties><alibaba.version>2.2.6.RELEASE</alibaba.version></properties>
-<dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>com.alibaba.cloud</groupId>
-      <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-      <version>${{alibaba.version}}</version>
-      <type>pom</type>
-      <scope>import</scope>
-    </dependency>
-  </dependencies>
-</dependencyManagement>
-</project>"#
-        );
-        let child = format!(
-            r#"{CHILD_HEADER}<dependencies>
-  <dependency>
-    <groupId>com.example</groupId>
-    <artifactId>core</artifactId>
-    <version>1.0</version>
-  </dependency>
-</dependencies>
-</project>"#
-        );
-        write_parent_child(tmp.path(), &parent, &child);
-        let core = tmp.path().join("core/pom.xml");
-        std::fs::create_dir_all(core.parent().unwrap()).unwrap();
-        std::fs::write(
-            &core,
-            "<project>\n  <groupId>com.example</groupId>\n  <artifactId>core</artifactId>\n</project>",
-        )
-        .unwrap();
-        let modules =
-            || vec![ModulePom { group_id: "com.example".into(), artifact_id: "core".into(), pom: core.clone() }];
-
-        // A BOM import in <dependencyManagement> opens the BOM from the local repository.
-        let parent_path = tmp.path().join("pom.xml");
-        let parent_text = std::fs::read_to_string(&parent_path).unwrap();
-        let at_bom = at(&parent_text, "spring-cloud-alibaba-dependencies<");
-        let goto = goto_declaration_in(&parent_text, &parent_path, at_bom, Some(repo.clone()), modules).unwrap();
-        assert_eq!(goto.path, bom_dir.join("spring-cloud-alibaba-dependencies-2.2.6.RELEASE.pom"));
-        assert_eq!(goto.kind, PomGotoKind::ArtifactPom);
-        assert_eq!(goto.range.start, pos_at(bom, bom.find("<artifactId>").unwrap()));
-
-        // A dependency on a project module opens the module's POM.
-        let path = tmp.path().join("app/pom.xml");
-        let text = std::fs::read_to_string(&path).unwrap();
-        let goto =
-            goto_declaration_in(&text, &path, at(&text, "core</artifactId>"), Some(repo.clone()), modules).unwrap();
-        assert_eq!((goto.path.as_path(), goto.label.as_str()), (core.as_path(), "com.example:core"));
-
-        // The <parent> section opens the parent POM.
-        let goto = goto_declaration_in(&text, &path, at(&text, "parent</artifactId>"), Some(repo), modules).unwrap();
-        assert_eq!(goto.path, canon(&parent_path));
-        assert_eq!(goto.kind, PomGotoKind::ArtifactPom);
-    }
-
    #[test]
    fn a_property_reference_after_non_ascii_text_is_still_found() {
        let text = format!(
@@ -1,694 +0,0 @@
-//! Completion of Maven coordinates in a POM: inside a `<dependency>`, the
-//! `<groupId>`, `<artifactId>` and `<version>` values are completed from the
-//! local repository layout (`<repo>/<group path>/<artifactId>/<version>/…`).
-//! The Maven Central search endpoint tops the lists up remotely; the host op
-//! fetches those (cached) and merges them behind the local ones, so this side
-//! stays pure text and directory logic and tests build their own repositories.
-
-use super::xml::{self, Element};
-use super::{element_path, interpolate, read_properties};
-use serde::{Deserialize, Serialize};
-use specta::Type;
-use std::cmp::Ordering;
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-
-/// The coordinate element a POM completion fills.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub enum PomCompletionKind {
-    /// The dependency's `<groupId>`.
-    GroupId,
-    /// The dependency's `<artifactId>`.
-    ArtifactId,
-    /// The dependency's `<version>`.
-    Version,
-}
-
-/// One suggestion: the coordinate as inserted, and an optional note shown in
-/// the lookup (the owning group of an artifactId, its newest installed version).
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct PomCompletionOption {
-    /// The text the completion inserts (`org.example.lib`, `example-lib`, `1.2.0`).
-    pub label: String,
-    pub detail: Option<String>,
-}
-
-/// The completion offered at a caret of a POM: the replaced value span (UTF-16
-/// offsets) and the suggestions, local ones first.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct PomCompletion {
-    /// UTF-16 offset where the completed text starts: the value's first character.
-    pub from: u32,
-    /// UTF-16 offset where the replaced value ends: past the caret when the caret
-    /// sits inside an existing value, which is then replaced whole.
-    pub to: u32,
-    /// Which coordinate element the caret is in.
-    pub kind: PomCompletionKind,
-    /// The suggestions, local repository first.
-    pub options: Vec<PomCompletionOption>,
-}
-
-/// Where the caret sits in a `<dependency>` coordinate element: what is being
-/// completed, the typed prefix, and the sibling coordinates the rest need.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct PomCompletionTarget {
-    /// UTF-16 offset of the value's first character (the caret in an empty value).
-    pub from: u32,
-    /// UTF-16 offset past the value's last character (the caret in an empty value).
-    pub to: u32,
-    /// The value typed so far: the text between `from` and the caret, trimmed.
-    pub typed: String,
-    pub kind: PomCompletionKind,
-    /// The interpolated `<groupId>` sibling, when completing the artifactId and
-    /// the group is written out plain (no unresolved `${property}`).
-    pub group: Option<String>,
-    /// The interpolated `<artifactId>` sibling, when completing the version.
-    pub artifact: Option<String>,
-}
-
-/// A coordinate element's text, with the POM's own `${properties}` replaced;
-/// `None` when the element is missing or a property stays unresolved (the
-/// coordinates behind it are not known without the parent chain, which the
-/// completion does not follow).
-fn coordinate(e: Option<&Element>, props: &HashMap<String, String>) -> Option<String> {
-    let text = interpolate(e?.text.trim(), props);
-    (!text.is_empty() && !text.contains("${")).then_some(text)
-}
-
-fn own_properties(root: &Element) -> HashMap<String, String> {
-    read_properties(root.child("properties")).into_iter().collect()
-}
-
-/// UTF-16 offset -> byte offset, clamped to `text`.
-fn utf16_to_byte(text: &str, offset: u32) -> usize {
-    let mut seen = 0u32;
-    for (byte, c) in text.char_indices() {
-        if seen >= offset {
-            return byte;
-        }
-        seen += c.len_utf16() as u32;
-    }
-    text.len()
-}
-
-/// Byte offset -> UTF-16 offset.
-fn utf16_at(text: &str, byte: usize) -> u32 {
-    text[..byte].encode_utf16().count() as u32
-}
-
-/// Byte offset just past the start tag's `>` of the element at `start`.
-fn start_tag_end(text: &str, start: usize) -> Option<usize> {
-    let bytes = text.as_bytes();
-    let mut i = start.checked_add(1)?;
-    let mut quote = None;
-    while i < bytes.len() {
-        match (quote, bytes[i]) {
-            (Some(q), b) if b == q => quote = None,
-            (Some(_), _) => {}
-            (None, b'"' | b'\'') => quote = Some(bytes[i]),
-            (None, b'>') => return Some(i + 1),
-            _ => {}
-        }
-        i += 1;
-    }
-    None
-}
-
-/// What to complete at the caret (`offset`, UTF-16) of the POM `text`: the
-/// `<groupId>` / `<artifactId>` / `<version>` element of a `<dependency>` the
-/// caret sits in the value of. `None` everywhere else — other elements, carets
-/// in an end tag or a `${property}` reference, dependencies without the
-/// `<groupId>` (and, for versions, the `<artifactId>`) their completions need.
-pub fn completion_target(text: &str, offset: u32) -> Option<PomCompletionTarget> {
-    let root = xml::parse(text).filter(|e| e.name == "project")?;
-    let at = utf16_to_byte(text, offset);
-    // A caret at the very end of the input sits in the element still being
-    // typed, whose range reaches to the input's end; step back one character
-    // so `element_path` sees it (the caret's own offset stays `at`).
-    let probe = if at == text.len() && at > 0 {
-        let mut p = at - 1;
-        while p > 0 && !text.is_char_boundary(p) {
-            p -= 1;
-        }
-        p
-    } else {
-        at
-    };
-    let elements = element_path(&root, probe);
-    let e = *elements.last()?;
-    let parent = elements.get(elements.len().checked_sub(2)?)?;
-    let kind = match e.name.as_str() {
-        "groupId" => PomCompletionKind::GroupId,
-        "artifactId" => PomCompletionKind::ArtifactId,
-        "version" => PomCompletionKind::Version,
-        _ => return None,
-    };
-    if parent.name != "dependency" || at > e.inner_end {
-        return None;
-    }
-    let inner_start = start_tag_end(text, e.start)?;
-    let value = &text[inner_start..e.inner_end.max(inner_start)];
-    if value.contains("${") {
-        return None; // Property references are goto-declaration territory, not completion.
-    }
-    let lead = value.len() - value.trim_start().len();
-    let trail = value.len() - value.trim_end().len();
-    let (mut from, mut to) = (inner_start + lead, e.inner_end.max(inner_start) - trail);
-    if from > to {
-        // A value of whitespace only: complete at the caret.
-        from = at.min(to);
-        to = to.max(from);
-    }
-    from = from.min(at);
-    to = to.max(from);
-    let props = own_properties(&root);
-    let group = (kind != PomCompletionKind::GroupId).then(|| coordinate(parent.child("groupId"), &props)).flatten();
-    let artifact =
-        (kind == PomCompletionKind::Version).then(|| coordinate(parent.child("artifactId"), &props)).flatten();
-    let typed = text[from..at].trim().to_owned();
-    Some(PomCompletionTarget { from: utf16_at(text, from), to: utf16_at(text, to), typed, kind, group, artifact })
-}
-
-/// The suggestions the local repository at `repo` offers for `target`: group
-/// ids installed under it, the artifacts of the target's group, or the versions
-/// of the target's artifact. Every scan is bounded (see `SCAN_BUDGET`) and
-/// reads only directory listings of `repo` — nothing outside it, no jar
-/// contents.
-pub fn local_options(repo: &Path, target: &PomCompletionTarget) -> Vec<PomCompletionOption> {
-    let mut budget = SCAN_BUDGET;
-    match target.kind {
-        // `org.spr` completes the `spr` part under `org/`, `org.` the next
-        // segment under `org/`; every typed segment is validated so POM text
-        // cannot walk out of the repository.
-        PomCompletionKind::GroupId => {
-            let segments: Vec<&str> = target.typed.split('.').collect();
-            let (partial, base) = segments.split_last().unwrap_or((&"", &[]));
-            if base.iter().all(|s| segment(s)) {
-                let dir = base.iter().fold(repo.to_path_buf(), |p, s| p.join(s));
-                scan_groups(&dir, &base.join("."), partial, &mut budget)
-            } else {
-                Vec::new()
-            }
-        }
-        PomCompletionKind::ArtifactId => target
-            .group
-            .as_deref()
-            .and_then(|g| repo_dir(repo, &[g]))
-            .map_or_else(Vec::new, |dir| scan_artifacts(&dir, &target.typed, &mut budget)),
-        PomCompletionKind::Version => target
-            .group
-            .as_deref()
-            .zip(target.artifact.as_deref())
-            .and_then(|(g, a)| repo_dir(repo, &[g, a]))
-            .map_or_else(Vec::new, |dir| scan_versions(&dir, &target.typed, &mut budget)),
-    }
-}
-
-/// Directory listings one completion may read: the scans are interactive, so
-/// they stop before they could be felt, and a huge repository simply yields
-/// fewer suggestions (its shallowest first — the walk is breadth-preferring).
-const SCAN_BUDGET: u32 = 2048;
-/// Suggestion caps per kind: group ids and artifact ids fill a lookup page,
-/// versions list an artifact's releases.
-const MAX_GROUP_OPTIONS: usize = 60;
-const MAX_ARTIFACT_OPTIONS: usize = 60;
-const MAX_VERSION_OPTIONS: usize = 100;
-/// The cap the merged list (local plus Maven Central's) is truncated to.
-pub const MAX_OPTIONS: usize = 100;
-
-/// A directory entry whose name passes the repository layout's alphabet
-/// (mirrors `sources::artifact`'s): letters, digits, `._-`. Path separators
-/// and `..` never pass, so a POM's `${…}`-free text cannot traverse out of
-/// the repository.
-fn segment(name: &str) -> bool {
-    !name.is_empty()
-        && name != "."
-        && name != ".."
-        && name.chars().all(|c| c.is_ascii_alphanumeric() || "._-".contains(c))
-}
-
-/// The subdirectories of `dir` with repository-layout names, spending `budget`
-/// on the listing; `None` when the budget ran out before `dir` was listed.
-fn subdirs(dir: &Path, budget: &mut u32) -> Option<Vec<String>> {
-    if *budget == 0 {
-        return None;
-    }
-    *budget -= 1;
-    let Ok(entries) = std::fs::read_dir(dir) else {
-        return Some(Vec::new());
-    };
-    let mut names = Vec::new();
-    for entry in entries.flatten() {
-        // The budget bounds file-type checks too: a plain listing answers.
-        if entry.file_type().map(|t| t.is_dir()).unwrap_or(false)
-            && let Ok(name) = entry.file_name().into_string()
-            && segment(&name)
-        {
-            names.push(name);
-        }
-    }
-    Some(names)
-}
-
-/// Whether `dir` holds files — a version directory does (jar, pom, the
-/// tracking files), a group path segment never does.
-fn holds_files(dir: &Path, budget: &mut u32) -> bool {
-    if *budget == 0 {
-        return false;
-    }
-    *budget -= 1;
-    let Ok(entries) = std::fs::read_dir(dir) else {
-        return false;
-    };
-    entries.flatten().any(|e| e.file_type().map(|t| t.is_file()).unwrap_or(false))
-}
-
-/// Whether the version directory `dir` holds the version: its `.pom` or a `.jar`. A failed
-/// download leaves only `*.lastUpdated` tracking files behind, for a version that may not
-/// even exist (one typed while the POM was being edited).
-fn installed(dir: &Path, budget: &mut u32) -> bool {
-    if *budget == 0 {
-        return false;
-    }
-    *budget -= 1;
-    let Ok(entries) = std::fs::read_dir(dir) else {
-        return false;
-    };
-    entries.flatten().any(|e| {
-        e.file_type().map(|t| t.is_file()).unwrap_or(false)
-            && e.file_name().to_str().is_some_and(|n| n.ends_with(".pom") || n.ends_with(".jar"))
-    })
-}
-
-/// Whether `dir` is an artifact directory: it holds versions of one artifact,
-/// recognizable by a `maven-metadata*.xml` beside them or a child directory
-/// holding files. A group segment's children are directories without files.
-fn artifact_dir(dir: &Path, budget: &mut u32) -> bool {
-    if *budget == 0 {
-        return false;
-    }
-    *budget -= 1;
-    let Ok(entries) = std::fs::read_dir(dir) else {
-        return false;
-    };
-    for entry in entries.flatten() {
-        let Ok(name) = entry.file_name().into_string() else { continue };
-        if name.starts_with("maven-metadata") {
-            return true;
-        }
-    }
-    let Some(children) = subdirs(dir, budget) else { return false };
-    children.iter().any(|c| holds_files(&dir.join(c), budget))
-}
-
-/// Whether `dir` is a group directory (holds artifact directories) and whether
-/// it also holds deeper group segments worth descending into.
-fn group_dir(dir: &Path, budget: &mut u32) -> Option<(bool, bool)> {
-    let children = subdirs(dir, budget)?;
-    let (mut group, mut descend) = (false, false);
-    for child in &children {
-        if artifact_dir(&dir.join(child), budget) {
-            group = true;
-        } else {
-            descend = true;
-        }
-    }
-    Some((group, descend))
-}
-
-/// The group ids installed under `dir` (which the typed prefix `prefix` —
-/// "" for the repository root — already names), completing the partial last
-/// segment `partial`, shallower groups first.
-fn scan_groups(dir: &Path, prefix: &str, partial: &str, budget: &mut u32) -> Vec<PomCompletionOption> {
-    let mut out = Vec::new();
-    scan_groups_into(dir, prefix, partial, &mut out, budget);
-    out.sort_by(|a, b| a.label.cmp(&b.label));
-    out
-}
-
-fn scan_groups_into(dir: &Path, prefix: &str, partial: &str, out: &mut Vec<PomCompletionOption>, budget: &mut u32) {
-    if out.len() >= MAX_GROUP_OPTIONS {
-        return;
-    }
-    let Some(children) = subdirs(dir, budget) else { return };
-    for name in children {
-        if !name.starts_with(partial) {
-            continue;
-        }
-        let path = dir.join(&name);
-        let label = if prefix.is_empty() { name.clone() } else { format!("{prefix}.{name}") };
-        let Some((group, descend)) = group_dir(&path, budget) else { return };
-        if group {
-            out.push(PomCompletionOption { label: label.clone(), detail: None });
-            if out.len() >= MAX_GROUP_OPTIONS {
-                return;
-            }
-        }
-        // Deeper groups (org.example under org.example's own parent) follow the
-        // shallower ones, so a truncated scan of a huge repository still offers
-        // every first-level segment.
-        if descend {
-            scan_groups_into(&path, &label, "", out, budget);
-        }
-    }
-}
-
-/// The artifact ids installed under the group directory `dir`, completing the
-/// typed prefix, each with its newest installed version as the detail.
-fn scan_artifacts(dir: &Path, typed: &str, budget: &mut u32) -> Vec<PomCompletionOption> {
-    let Some(children) = subdirs(dir, budget) else { return Vec::new() };
-    let mut out = Vec::new();
-    for name in children {
-        if !name.starts_with(typed) || !artifact_dir(&dir.join(&name), budget) {
-            continue;
-        }
-        let detail = newest_version(&dir.join(&name), budget);
-        out.push(PomCompletionOption { label: name, detail });
-    }
-    out.sort_by(|a, b| a.label.cmp(&b.label));
-    out.truncate(MAX_ARTIFACT_OPTIONS);
-    out
-}
-
-/// The newest version directory of the artifact at `dir`, by Maven's ordering.
-fn newest_version(dir: &Path, budget: &mut u32) -> Option<String> {
-    let children = subdirs(dir, budget)?;
-    children.into_iter().filter(|name| installed(&dir.join(name), budget)).max_by(|a, b| compare_versions(a, b))
-}
-
-/// The versions installed of the artifact at `dir`, completing the typed
-/// prefix, newest first.
-fn scan_versions(dir: &Path, typed: &str, budget: &mut u32) -> Vec<PomCompletionOption> {
-    let Some(children) = subdirs(dir, budget) else { return Vec::new() };
-    let mut out: Vec<_> = children
-        .into_iter()
-        .filter(|name| name.starts_with(typed) && installed(&dir.join(name), budget))
-        .map(|name| PomCompletionOption { label: name, detail: None })
-        .collect();
-    out.sort_by(|a, b| compare_versions(&b.label, &a.label));
-    out.truncate(MAX_VERSION_OPTIONS);
-    out
-}
-
-/// The repository directory of `coordinates` (a group id, or a group and an artifact
-/// id): the group's dots are directories, an artifact id is one directory whatever dots
-/// it has (`org/eclipse/platform/org.eclipse.core.runtime`). Each segment is validated
-/// against the layout's alphabet so POM text cannot walk outside `repo`.
-fn repo_dir(repo: &Path, coordinates: &[&str]) -> Option<PathBuf> {
-    let (group, artifact) = coordinates.split_first()?;
-    let segments: Vec<&str> = group.split('.').chain(artifact.iter().copied()).collect();
-    segments.iter().all(|s| segment(s)).then(|| segments.iter().fold(repo.to_path_buf(), |p, s| p.join(s)))
-}
-
-/// Maven-ish version order, best-effort (a full `ComparableVersion` is out of
-/// proportion for ordering a lookup): numeric runs compare numerically, letter
-/// runs by their qualifier rank (`alpha < beta < m < rc < snapshot < release <
-/// sp`, unknown ones with releases lexically); missing parts rank as zero.
-fn compare_versions(a: &str, b: &str) -> Ordering {
-    fn tokens(v: &str) -> Vec<String> {
-        v.split(|c: char| !c.is_ascii_alphanumeric()).filter(|t| !t.is_empty()).map(str::to_ascii_lowercase).collect()
-    }
-    fn rank(t: &str) -> Option<u8> {
-        match t {
-            "a" | "alpha" => Some(0),
-            "b" | "beta" => Some(1),
-            "m" | "milestone" => Some(2),
-            "rc" | "cr" => Some(3),
-            "snapshot" => Some(4),
-            "" | "ga" | "final" => Some(5),
-            "sp" => Some(6),
-            _ => None,
-        }
-    }
-    let (a, b) = (tokens(a), tokens(b));
-    for i in 0..a.len().max(b.len()) {
-        let (x, y) = (a.get(i).map(String::as_str), b.get(i).map(String::as_str));
-        let (xn, yn) = (x.and_then(|s| s.parse::<u64>().ok()), y.and_then(|s| s.parse::<u64>().ok()));
-        let order = match (xn, yn) {
-            // Numbers compare numerically; a number outranks a qualifier.
-            (Some(xn), Some(yn)) => xn.cmp(&yn),
-            (Some(_), None) if y.is_some() => return Ordering::Greater,
-            (None, Some(_)) if x.is_some() => return Ordering::Less,
-            _ => {
-                let xr = x.and_then(rank).unwrap_or(5);
-                let yr = y.and_then(rank).unwrap_or(5);
-                if xr != yr { xr.cmp(&yr) } else { x.unwrap_or("").cmp(y.unwrap_or("")) }
-            }
-        };
-        if order != Ordering::Equal {
-            return order;
-        }
-    }
-    Ordering::Equal
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// A small local repository: every file is laid out as Maven installs it,
-    /// so the scans recognize group, artifact and version directories.
-    fn repo(dir: &Path) -> PathBuf {
-        let repo = dir.join("repository");
-        for file in [
-            "org/apache/maven/maven-core/4.0.0-rc-5/maven-core-4.0.0-rc-5.jar",
-            "org/apache/maven/plugins/maven-compiler-plugin/3.8.1/maven-compiler-plugin-3.8.1.jar",
-            "org/example/lib/1.0/lib-1.0.jar",
-            "org/example/lib/1.9.1/lib-1.9.1.jar",
-            "org/example/lib/1.10/lib-1.10.jar",
-            "org/example/lib/2.0-beta-1/lib-2.0-beta-1.jar",
-            "org/example/lib/2.0/lib-2.0.pom",
-            "net/nu/netty/4.1.100/netty-4.1.100.jar",
-            "org/eclipse/platform/org.eclipse.core.runtime/3.31.0/org.eclipse.core.runtime-3.31.0.jar",
-            // Failed downloads (a version typed while editing): tracking files only, not installed.
-            "org/example/lib/2/lib-2.jar.lastUpdated",
-            "org/example/lib/3.0/lib-3.0.pom.lastUpdated",
-        ] {
-            let path = repo.join(file);
-            std::fs::create_dir_all(path.parent().unwrap()).unwrap();
-            std::fs::write(&path, b"").unwrap();
-        }
-        repo
-    }
-
-    fn target(text: &str, needle: &str) -> Option<PomCompletionTarget> {
-        completion_target(text, (text.find(needle).unwrap() + needle.len()) as u32)
-    }
-
-    #[test]
-    fn completes_each_coordinate_element_of_a_dependency() {
-        let text = "<project><dependencies><dependency>\
-<groupId>org.example</groupId><artifactId>lib</artifactId><version>1.0</version>\
-</dependency></dependencies></project>";
-        let t = target(text, "<groupId>org.example").unwrap();
-        assert_eq!(t.kind, PomCompletionKind::GroupId);
-        assert_eq!(t.typed, "org.example");
-        assert_eq!((t.from, t.to), (44, 55));
-        assert!(t.group.is_none() && t.artifact.is_none());
-
-        let t = target(text, "<artifactId>lib").unwrap();
-        assert_eq!(t.kind, PomCompletionKind::ArtifactId);
-        assert_eq!(t.typed, "lib");
-        assert_eq!(t.group.as_deref(), Some("org.example"));
-        assert!(t.artifact.is_none());
-
-        let t = target(text, "<version>1.0").unwrap();
-        assert_eq!(t.kind, PomCompletionKind::Version);
-        assert_eq!(t.typed, "1.0");
-        assert_eq!(t.group.as_deref(), Some("org.example"));
-        assert_eq!(t.artifact.as_deref(), Some("lib"));
-    }
-
-    #[test]
-    fn completes_while_the_element_is_being_typed_and_the_value_is_empty() {
-        let empty = "<project><dependencies><dependency><groupId></groupId></dependency></dependencies></project>";
-        let t = target(empty, "<groupId>").unwrap();
-        assert_eq!(t.kind, PomCompletionKind::GroupId);
-        assert_eq!(t.typed, "");
-        assert_eq!(t.from, t.to);
-
-        let open = "<project><dependencies><dependency><artifactId>li";
-        let t = target(open, "li").unwrap();
-        assert_eq!(t.kind, PomCompletionKind::ArtifactId);
-        assert_eq!(t.typed, "li");
-        // The value under construction ends with the input and is replaced whole.
-        assert_eq!(t.to, open.len() as u32);
-    }
-
-    #[test]
-    fn completes_only_dependency_coordinates() {
-        // The same elements outside a <dependency> get nothing: a <plugin> is
-        // completed by the repository, not coordinates.
-        let plugin =
-            "<project><build><plugins><plugin><groupId>org.apache.maven</groupId></plugin></plugins></build></project>";
-        assert_eq!(target(plugin, "<groupId>org.apache.maven"), None);
-        // A caret in the end tag, or on a `${property}` value, is not a completion.
-        let text =
-            "<project><dependencies><dependency><groupId>org.example</groupId></dependency></dependencies></project>";
-        assert_eq!(target(text, "</groupId>"), None);
-        let property = "<project><dependencies><dependency><groupId>${example.group}</groupId></dependency></dependencies></project>";
-        assert_eq!(target(property, "${example.group}"), None);
-        // A dependency's groupId is required before its artifacts can be listed.
-        let no_group =
-            "<project><dependencies><dependency><artifactId>lib</artifactId></dependency></dependencies></project>";
-        let t = target(no_group, "<artifactId>lib").unwrap();
-        assert!(t.group.is_none());
-    }
-
-    #[test]
-    fn interpolates_the_poms_own_properties_for_siblings() {
-        let text = "<project>\
-<properties><example.group>org.example</example.group><example.version>2.0</example.version></properties>\
-<dependencies><dependency><groupId>${example.group}</groupId><artifactId>lib</artifactId><version>${example.version}</version></dependency></dependencies>\
-</project>";
-        // The groupId the caret is typing stays a completion; the siblings resolve.
-        let t = target(text, "<artifactId>lib").unwrap();
-        assert_eq!(t.group.as_deref(), Some("org.example"));
-        // A `${property}` under the caret itself gets nothing to complete.
-        assert_eq!(target(text, "<version>${example.version}"), None);
-    }
-
-    #[test]
-    fn local_scan_lists_installed_groups_shallowest_first() {
-        let tmp = tempfile::tempdir().unwrap();
-        let repo = repo(tmp.path());
-        let options = |typed: &str| {
-            local_options(
-                &repo,
-                &PomCompletionTarget {
-                    from: 0,
-                    to: 0,
-                    typed: typed.into(),
-                    kind: PomCompletionKind::GroupId,
-                    group: None,
-                    artifact: None,
-                },
-            )
-            .into_iter()
-            .map(|o| o.label)
-            .collect::<Vec<_>>()
-        };
-        // Only directories holding artifacts are group ids: `net` and `org`
-        // alone never receive an install, their deeper levels do.
-        let org = ["org.apache.maven", "org.apache.maven.plugins", "org.eclipse.platform", "org.example"];
-        assert_eq!(options(""), [&["net.nu"][..], &org].concat());
-        assert_eq!(options("org"), org);
-        assert_eq!(options("org."), org);
-        assert_eq!(options("org.spr"), Vec::<String>::new());
-        assert_eq!(options("net."), ["net.nu"]);
-    }
-
-    #[test]
-    fn local_scan_lists_artifacts_of_the_group_with_their_newest_version() {
-        let tmp = tempfile::tempdir().unwrap();
-        let repo = repo(tmp.path());
-        let options = |typed: &str| {
-            local_options(
-                &repo,
-                &PomCompletionTarget {
-                    from: 0,
-                    to: 0,
-                    typed: typed.into(),
-                    kind: PomCompletionKind::ArtifactId,
-                    group: Some("org.example".into()),
-                    artifact: None,
-                },
-            )
-            .into_iter()
-            .map(|o| (o.label, o.detail))
-            .collect::<Vec<_>>()
-        };
-        assert_eq!(options(""), [("lib".to_owned(), Some("2.0".to_owned()))]);
-        assert_eq!(options("net"), Vec::<(String, Option<String>)>::new());
-    }
-
-    #[test]
-    fn local_scan_lists_versions_of_the_artifact_newest_first() {
-        let tmp = tempfile::tempdir().unwrap();
-        let repo = repo(tmp.path());
-        let options = |typed: &str| {
-            local_options(
-                &repo,
-                &PomCompletionTarget {
-                    from: 0,
-                    to: 0,
-                    typed: typed.into(),
-                    kind: PomCompletionKind::Version,
-                    group: Some("org.example".into()),
-                    artifact: Some("lib".into()),
-                },
-            )
-            .into_iter()
-            .map(|o| o.label)
-            .collect::<Vec<_>>()
-        };
-        assert_eq!(options(""), ["2.0", "2.0-beta-1", "1.10", "1.9.1", "1.0"]);
-        assert_eq!(options("1."), ["1.10", "1.9.1", "1.0"]);
-        // An artifact id with dots is one directory.
-        let dotted = local_options(
-            &repo,
-            &PomCompletionTarget {
-                from: 0,
-                to: 0,
-                typed: "".into(),
-                kind: PomCompletionKind::Version,
-                group: Some("org.eclipse.platform".into()),
-                artifact: Some("org.eclipse.core.runtime".into()),
-            },
-        );
-        assert_eq!(dotted.into_iter().map(|o| o.label).collect::<Vec<_>>(), ["3.31.0"]);
-    }
-
-    #[test]
-    fn a_poms_text_cannot_walk_out_of_the_repository() {
-        let tmp = tempfile::tempdir().unwrap();
-        let repo = repo(tmp.path());
-        for group in ["../../etc", "..", "org/../.."] {
-            let options = local_options(
-                &repo,
-                &PomCompletionTarget {
-                    from: 0,
-                    to: 0,
-                    typed: "".into(),
-                    kind: PomCompletionKind::ArtifactId,
-                    group: Some(group.into()),
-                    artifact: None,
-                },
-            );
-            assert!(options.is_empty(), "{group}");
-        }
-    }
-
-    #[test]
-    fn the_scan_stops_at_the_option_cap() {
-        let tmp = tempfile::tempdir().unwrap();
-        let repo = tmp.path().join("repository");
-        for i in 0..MAX_GROUP_OPTIONS + 10 {
-            let group = repo.join(format!("com/example/g{i}"));
-            std::fs::create_dir_all(group.join("art/1.0")).unwrap();
-            std::fs::write(group.join("art/1.0/art-1.0.jar"), b"").unwrap();
-        }
-        let options = local_options(
-            &repo,
-            &PomCompletionTarget {
-                from: 0,
-                to: 0,
-                typed: "".into(),
-                kind: PomCompletionKind::GroupId,
-                group: None,
-                artifact: None,
-            },
-        );
-        assert_eq!(options.len(), MAX_GROUP_OPTIONS);
-    }
-
-    #[test]
-    fn maven_version_order() {
-        let mut versions = ["2.0", "1.0", "2.0-beta-1", "2.0-alpha-2", "1.10", "1.9.1", "4.0.0-rc-5", "4.0.0-rc-13"];
-        versions.sort_by(|a, b| compare_versions(a, b));
-        assert_eq!(versions, ["1.0", "1.9.1", "1.10", "2.0-alpha-2", "2.0-beta-1", "2.0", "4.0.0-rc-5", "4.0.0-rc-13"]);
-    }
-}
@@ -1,124 +0,0 @@
-//! On-demand sources resolution using the project's Maven launcher and repositories.
-
-use super::MavenProject;
-use crate::process;
-use ide_core::{CancellationToken, IdeError, IdeResult};
-use std::path::{Component, Path, PathBuf};
-
-#[derive(Debug, PartialEq, Eq)]
-pub struct Artifact {
-    pub group: String,
-    pub name: String,
-    pub version: String,
-    pub sources: PathBuf,
-}
-
-/// Resolve only jars inside the selected local repository, including custom repositories.
-pub fn artifact(jar: &Path, repository: &Path) -> Option<Artifact> {
-    let relative = jar.strip_prefix(repository).ok()?;
-    let parts: Vec<&str> = relative
-        .components()
-        .map(|c| match c {
-            Component::Normal(s) => s.to_str(),
-            _ => None,
-        })
-        .collect::<Option<_>>()?;
-    if parts.len() < 4 {
-        return None;
-    }
-    let n = parts.len();
-    let (name, version, file) = (parts[n - 3], parts[n - 2], parts[n - 1]);
-    let valid = |s: &str| {
-        !s.is_empty() && s != "." && s != ".." && s.chars().all(|c| c.is_ascii_alphanumeric() || "_.-".contains(c))
-    };
-    if !parts[..n - 1].iter().all(|s| valid(s)) || file != format!("{name}-{version}.jar") {
-        return None;
-    }
-    Some(Artifact {
-        group: parts[..n - 3].join("."),
-        name: name.into(),
-        version: version.into(),
-        sources: jar.with_file_name(format!("{name}-{version}-sources.jar")),
-    })
-}
-
-pub fn download(
-    root: &Path,
-    project: &MavenProject,
-    artifact: &Artifact,
-    repository: &Path,
-    cancel: &CancellationToken,
-) -> IdeResult<Option<PathBuf>> {
-    if cancel.is_cancelled() {
-        return Err(IdeError::cancelled());
-    }
-    if artifact.sources.is_file() {
-        return Ok(Some(artifact.sources.clone()));
-    }
-    let mut args = vec!["-B".into(), "-N".into(), "-Dstyle.color=never".into()];
-    args.extend(project.options.clone());
-    args.extend([
-        format!("-Dmaven.repo.local={}", repository.display()),
-        "org.apache.maven.plugins:maven-dependency-plugin:3.8.1:get".into(),
-        format!("-Dartifact={}:{}:{}:jar:sources", artifact.group, artifact.name, artifact.version),
-        "-Dtransitive=false".into(),
-    ]);
-    let output = process::run(&project.command, &args, &root.join(&project.dir), &project.env, cancel, |_, _| {})?;
-    if cancel.is_cancelled() {
-        return Err(IdeError::cancelled());
-    }
-    if artifact.sources.is_file() {
-        return Ok(Some(artifact.sources.clone()));
-    }
-    let coordinate = format!("{}:{}:jar:sources:{}", artifact.group, artifact.name, artifact.version);
-    if output.success
-        || output.text.lines().any(|line| {
-            line.contains(&coordinate) && (line.contains("Could not find artifact") || line.contains("was not found"))
-        })
-    {
-        return Ok(None);
-    }
-    Err(IdeError::unavailable(
-        output.text.lines().rev().take(20).collect::<Vec<_>>().into_iter().rev().collect::<Vec<_>>().join("\n"),
-    ))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn resolves_sources_coordinates_from_maven_layouts() {
-        for repository in ["/home/me/.m2/repository", "/tmp/project repo", "C:/Users/me/.m2/repository"] {
-            for (group, name, version) in [
-                ("org/apache/commons", "commons-lang3", "3.17.0"),
-                ("com/example", "example-lib", "1.0-SNAPSHOT"),
-                ("single", "lib", "1.0.0-rc.1"),
-            ] {
-                let repository = Path::new(repository);
-                let dir = repository.join(group).join(name).join(version);
-                let found = artifact(&dir.join(format!("{name}-{version}.jar")), repository).unwrap();
-                assert_eq!(found.group, group.replace('/', "."));
-                assert_eq!(found.name, name);
-                assert_eq!(found.version, version);
-                assert_eq!(found.sources, dir.join(format!("{name}-{version}-sources.jar")));
-            }
-        }
-    }
-
-    #[test]
-    fn rejects_non_artifacts_and_paths_outside_the_repository() {
-        let repository = Path::new("/m2/repository");
-        for path in [
-            "/m2/repository-other/g/a/1/a-1.jar",
-            "/m2/repository/g/a/1/a-1-sources.jar",
-            "/m2/repository/g/a/1/other.jar",
-            "/m2/repository/g/a/../a-1.jar",
-            "/m2/repository/g/a/1/a-1.pom",
-            "/m2/repository/g/a-1.jar",
-            "/gradle/caches/modules-2/files-2.1/g/a/1/hash/a-1.jar",
-        ] {
-            assert_eq!(artifact(Path::new(path), repository), None, "{path}");
-        }
-    }
-}
@@ -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
@@ -270,13 +266,6 @@ fn run(

 /// The first error lines of a failed build, for the tool window.
 pub(crate) fn error_summary(text: &str) -> String {
-    // The JVM's "could not find or load main class" (localized) when `gradlew` has no jar.
-    if text.contains("org.gradle.wrapper.GradleWrapperMain") {
-        return "gradle/wrapper/gradle-wrapper.jar is missing (often excluded by a `*.jar` rule in .gitignore). \
-                Restore it, run `gradle wrapper` with an installed Gradle, or choose Distribution: Local installation \
-                in Settings › Build, Execution, Deployment › Gradle."
-            .to_owned();
-    }
    let lines: Vec<&str> = text
        .lines()
        .filter(|l| {
@@ -315,7 +304,7 @@ pub fn sync_maven(
    let mut model = maven::load_with_linked(
        root,
        maven::default_local_repo(),
-        &options.maven_settings.profiles(&options.profiles),
+        &options.profiles,
        &options.maven_settings.linked_projects,
    );
    maven::UnlinkedProjects::from_model(&model, &options.maven_settings).filter(&mut model);
@@ -352,13 +341,7 @@ pub fn sync_maven(
        // `-T1` keeps mvnd serial: its default parallel build interleaves the
        // `dependency:tree` output of concurrent modules, which the sync parses
        // as one stream. mvn is serial anyway, so this only pins the daemon.
-        let mut args: Vec<String> = vec![
-            "-B".into(),
-            "-fae".into(),
-            "-Dstyle.color=never".into(),
-            "-T1".into(),
-            maven::LOCAL_REPO_TRACKING_ARG.into(),
-        ];
+        let mut args: Vec<String> = vec!["-B".into(), "-fae".into(), "-Dstyle.color=never".into(), "-T1".into()];
        args.extend(sync_maven_options(&options.maven_options));
        if options.offline {
            args.push("-o".into());
@@ -473,7 +456,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)
 }
@@ -725,7 +707,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!(
@@ -750,15 +731,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),
@@ -824,18 +796,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();
@@ -852,41 +818,6 @@ mod tests {
        assert!(m.stale, "gradle.properties is watched");
    }

-    #[test]
-    fn applied_script_edits_invalidate_the_cached_gradle_model() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path().join("project");
-        let cache_dir = tmp.path().join("cache");
-        std::fs::create_dir_all(root.join("gradle")).unwrap();
-        std::fs::write(root.join("build.gradle"), "apply from: 'gradle/dependencies.gradle'").unwrap();
-        let applied = root.join("gradle/dependencies.gradle");
-        std::fs::write(&applied, "implementation 'g:a:1'").unwrap();
-        let model = gradle::load(&root).unwrap();
-        let cache = GradleCache {
-            hash: hash_gradle_files(&gradle::build_files(&root, &model)),
-            projects: vec![ReportedProject {
-                path: ":".into(),
-                dir: root.to_string_lossy().into_owned(),
-                ..Default::default()
-            }],
-            resources: true,
-            ..Default::default()
-        };
-        write_cache(&cache_dir, GRADLE_CACHE, &cache).unwrap();
-        let stale = || {
-            let mut model = gradle::load(&root).unwrap();
-            apply_gradle_cache(&root, &cache_dir, &mut model);
-            model.stale
-        };
-        assert!(!stale());
-        std::fs::write(&applied, "// comment\nimplementation   'g:a:1'\n").unwrap();
-        assert!(!stale());
-        std::fs::write(&applied, "implementation 'g:a:2'").unwrap();
-        assert!(stale());
-        std::fs::remove_file(&applied).unwrap();
-        assert!(stale());
-    }
-
    #[test]
    fn sync_reads_verbose_trees_with_a_pinned_plugin_unless_offline() {
        let online = maven_sync_goals(Path::new("e.xml"), false);
@@ -916,8 +847,6 @@ mod tests {
        let text = "[INFO] x\n[ERROR] Failed to execute goal\n[ERROR] \n[ERROR] Re-run Maven using -X\n";
        assert_eq!(error_summary(text), "Failed to execute goal");
        assert_eq!(error_summary("one\nlast line\n\n"), "last line");
-        let missing_jar = "错误: 找不到或无法加载主类 org.gradle.wrapper.GradleWrapperMain\n";
-        assert!(error_summary(missing_jar).starts_with("gradle/wrapper/gradle-wrapper.jar is missing"));
    }

    #[test]
@@ -3,57 +3,6 @@
 //! skipped. Namespace prefixes are dropped (`<x:project>` → `project`).
 //! Elements keep their byte offsets in the source, for edits ([`crate::pom_edit`]).

-use encoding_rs::Encoding;
-use std::path::Path;
-
-/// Reads an XML file, honoring its `encoding="…"` declaration: a GBK POM
-/// (issue #2439) is not valid UTF-8, and `read_to_string` would drop the
-/// whole project as "No maven project" while CLI Maven reads it fine.
-pub fn read_text(path: &Path) -> Option<String> {
-    std::fs::read(path).ok().map(|bytes| decode_bytes(&bytes))
-}
-
-/// Decodes XML bytes: BOM first, then the `encoding` declaration (ASCII in
-/// every single-byte encoding, so the head scans before decoding), then
-/// UTF-8, then a chardetng guess.
-pub fn decode_bytes(bytes: &[u8]) -> String {
-    if let Some((enc, len)) = Encoding::for_bom(bytes) {
-        let (text, _) = enc.decode_without_bom_handling(&bytes[len..]);
-        return text.into_owned();
-    }
-    if let Some(enc) = declared_encoding(bytes) {
-        let (text, _) = enc.decode_without_bom_handling(bytes);
-        return text.into_owned();
-    }
-    if let Ok(text) = std::str::from_utf8(bytes) {
-        return text.to_owned();
-    }
-    let mut detector = chardetng::EncodingDetector::new();
-    detector.feed(bytes, true);
-    let (text, _) = detector.guess(None, true).decode_without_bom_handling(bytes);
-    text.into_owned()
-}
-
-fn declared_encoding(bytes: &[u8]) -> Option<&'static Encoding> {
-    let head = std::str::from_utf8(bytes.get(..bytes.len().min(1024))?).ok()?;
-    let mut rest = head.split("?>").next().unwrap_or(head);
-    while let Some(i) = rest.find("encoding") {
-        rest = &rest[i + "encoding".len()..];
-        let Some(value) = rest.trim_start().strip_prefix('=') else { continue };
-        let value = value.trim_start();
-        let (&quote, after) = value.as_bytes().split_first()?;
-        if quote != b'"' && quote != b'\'' {
-            continue;
-        }
-        let after = std::str::from_utf8(after).ok()?;
-        let end = after.find(quote as char)?;
-        if let Some(enc) = Encoding::for_label(after[..end].trim().as_bytes()) {
-            return Some(enc);
-        }
-    }
-    None
-}
-
 #[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub struct Element {
    pub name: String,
@@ -261,19 +210,4 @@ mod tests {
        assert!(parse("").is_none());
        assert!(parse("just text").is_none());
    }
-
-    #[test]
-    fn decodes_the_declared_encoding() {
-        // Issue #2439: a GBK POM is not valid UTF-8; decoding must honor the declaration.
-        let (bytes, _, _) =
-            encoding_rs::GBK.encode("<?xml version=\"1.0\" encoding=\"GBK\"?>\n<project><name>中文</name></project>");
-        let text = decode_bytes(&bytes);
-        assert_eq!(parse(&text).unwrap().text_of("name").as_deref(), Some("中文"));
-        // An unknown label falls back to UTF-8 rather than mis-decoding.
-        let text = decode_bytes(b"<?xml version=\"1.0\" encoding=\"X-UNKNOWN\"?>\n<project><name>ok</name></project>");
-        assert_eq!(parse(&text).unwrap().text_of("name").as_deref(), Some("ok"));
-        // No declaration: plain UTF-8 passes through untouched.
-        let text = decode_bytes("<project><name>plain</name></project>".as_bytes());
-        assert_eq!(parse(&text).unwrap().text_of("name").as_deref(), Some("plain"));
-    }
 }
@@ -1,20 +0,0 @@
-[package]
-name = "ide-cli"
-description = "The `openidea` command: arguments, the request it sends a running app over a local socket, and installing it on PATH"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-serde.workspace = true
-serde_json.workspace = true
-dirs.workspace = true
-tracing.workspace = true
-
-[target.'cfg(windows)'.dependencies]
-tokio = { workspace = true, features = ["net"] }
-winreg = "0.56"
-windows-sys = { version = "0.61", features = ["Win32_Foundation", "Win32_Storage_FileSystem", "Win32_System_Console", "Win32_UI_WindowsAndMessaging"] }
-
-[dev-dependencies]
-tempfile.workspace = true
@@ -1,234 +0,0 @@
-//! Command-line arguments of `openidea`.
-
-use crate::Target;
-use std::path::Path;
-
-pub const USAGE: &str = "\
-Usage: openidea [options] [[--line <n>] [--column <n>] path[:line[:column]] ...]
-       openidea diff <left> <right>
-
-Opens folders as projects and files in the editor of the running OpenIDEA,
-starting it if needed. Without paths, brings OpenIDEA to the front.
-Lines and columns start at 1; --line and --column apply to the next path.
-
-Options:
-  --line <n>     Put the caret on line <n> of the next file
-  --column <n>   Put the caret in column <n> of that line
-  -h, --help     Show this help
-  -v, --version  Show the version
-";
-
-#[derive(Debug, PartialEq, Eq)]
-pub enum Command {
-    Help,
-    Version,
-    Open(Vec<Target>),
-    Diff(Vec<Target>),
-}
-
-/// Parses `args` (without the program name); relative paths resolve against `cwd`.
-pub fn parse(args: &[String], cwd: &Path) -> Result<Command, String> {
-    parse_with(args, cwd, &|p| p.exists())
-}
-
-fn parse_with(args: &[String], cwd: &Path, exists: &dyn Fn(&Path) -> bool) -> Result<Command, String> {
-    if args.first().is_some_and(|arg| arg == "diff") {
-        return match parse_paths(&args[1..], cwd, exists)? {
-            Command::Open(targets) if targets.len() == 2 => Ok(Command::Diff(targets)),
-            Command::Help => Ok(Command::Help),
-            _ => Err("diff needs two files".into()),
-        };
-    }
-    parse_paths(args, cwd, exists)
-}
-
-fn parse_paths(args: &[String], cwd: &Path, exists: &dyn Fn(&Path) -> bool) -> Result<Command, String> {
-    let mut targets = Vec::new();
-    let mut options = true;
-    let (mut line, mut column) = (None, None);
-    let mut args = args.iter();
-    while let Some(arg) = args.next() {
-        let (flag, inline) = match arg.split_once('=') {
-            Some((flag, value)) if options && flag.starts_with("--") => (flag, Some(value.to_owned())),
-            _ => (arg.as_str(), None),
-        };
-        match flag {
-            "--" if options => options = false,
-            "-h" | "--help" if options => return Ok(Command::Help),
-            "-v" | "--version" if options => return Ok(Command::Version),
-            "--line" | "--column" if options => {
-                let value = inline.or_else(|| args.next().cloned()).ok_or(format!("{flag} needs a number"))?;
-                let n = position(&value).ok_or(format!("{flag}: not a number from 1: {value}"))?;
-                *if flag == "--line" { &mut line } else { &mut column } = Some(n);
-            }
-            a if options && a.starts_with('-') && a != "-" => return Err(format!("unknown option: {a}")),
-            _ => {
-                let mut target = target(arg, cwd, exists)?;
-                if line.is_some() || column.is_some() {
-                    target.line = line.take().or(target.line).or(Some(1));
-                    target.column = column.take();
-                }
-                targets.push(target);
-            }
-        }
-    }
-    if line.is_some() || column.is_some() {
-        return Err("--line and --column need a file after them".into());
-    }
-    Ok(Command::Open(targets))
-}
-
-/// `arg` as a path, else as `path:line[:column]` when `path` exists.
-fn target(arg: &str, cwd: &Path, exists: &dyn Fn(&Path) -> bool) -> Result<Target, String> {
-    let path = cwd.join(arg);
-    if exists(&path) {
-        return Ok(Target { path, line: None, column: None });
-    }
-    for (base, line, column) in split_position(arg) {
-        let path = cwd.join(base);
-        if exists(&path) {
-            return Ok(Target { path, line: Some(line), column });
-        }
-    }
-    Err(format!("{arg}: no such file or directory"))
-}
-
-/// The readings of `arg` as `path:line:column`, then as `path:line`.
-fn split_position(arg: &str) -> Vec<(&str, u32, Option<u32>)> {
-    let Some((rest, last)) = arg.rsplit_once(':') else { return Vec::new() };
-    let Some(last) = position(last) else { return Vec::new() };
-    let mut readings = Vec::new();
-    if let Some((base, line)) = rest.rsplit_once(':')
-        && let Some(line) = position(line)
-        && !base.is_empty()
-    {
-        readings.push((base, line, Some(last)));
-    }
-    if !rest.is_empty() {
-        readings.push((rest, last, None));
-    }
-    readings
-}
-
-fn position(s: &str) -> Option<u32> {
-    if s.is_empty() || !s.bytes().all(|b| b.is_ascii_digit()) {
-        return None;
-    }
-    s.parse().ok().filter(|n| *n > 0)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::path::PathBuf;
-
-    fn args(list: &[&str]) -> Vec<String> {
-        list.iter().map(|s| (*s).to_owned()).collect()
-    }
-
-    fn parse_in(list: &[&str], existing: &[&str]) -> Result<Command, String> {
-        let existing: Vec<PathBuf> = existing.iter().map(PathBuf::from).collect();
-        parse_with(&args(list), Path::new("/work"), &|p| existing.iter().any(|e| e == p))
-    }
-
-    fn at(path: &str, line: Option<u32>, column: Option<u32>) -> Target {
-        Target { path: path.into(), line, column }
-    }
-
-    #[test]
-    fn paths_resolve_against_cwd() {
-        assert_eq!(
-            parse_in(&["src", "/abs/a.rs"], &["/work/src", "/abs/a.rs"]),
-            Ok(Command::Open(vec![at("/work/src", None, None), at("/abs/a.rs", None, None)]))
-        );
-        assert_eq!(parse_in(&[], &[]), Ok(Command::Open(vec![])));
-    }
-
-    #[test]
-    fn positions_split_only_when_the_whole_arg_is_missing() {
-        let files = ["/work/a.rs"];
-        assert_eq!(parse_in(&["a.rs:12"], &files), Ok(Command::Open(vec![at("/work/a.rs", Some(12), None)])));
-        assert_eq!(parse_in(&["a.rs:12:5"], &files), Ok(Command::Open(vec![at("/work/a.rs", Some(12), Some(5))])));
-        assert!(parse_in(&["a.rs:0"], &files).is_err());
-        assert!(parse_in(&["a.rs:x"], &files).is_err());
-        assert!(parse_in(&["missing.rs:3"], &files).is_err());
-    }
-
-    // Windows file names cannot contain `:`, and `b:2` reads as a path on drive B.
-    #[cfg(unix)]
-    #[test]
-    fn an_existing_name_with_a_colon_wins_over_a_position() {
-        let files = ["/work/b:2"];
-        assert_eq!(parse_in(&["b:2"], &files), Ok(Command::Open(vec![at("/work/b:2", None, None)])));
-        assert_eq!(parse_in(&["b:2:7"], &files), Ok(Command::Open(vec![at("/work/b:2", Some(7), None)])));
-    }
-
-    #[test]
-    fn windows_drive_colon_is_not_a_position() {
-        assert_eq!(split_position(r"C:\a.rs:10"), vec![(r"C:\a.rs", 10, None)]);
-        assert_eq!(split_position(r"C:\a.rs:10:2"), vec![(r"C:\a.rs", 10, Some(2)), (r"C:\a.rs:10", 2, None)]);
-        assert!(split_position(r"C:\a.rs").is_empty());
-    }
-
-    #[cfg(windows)]
-    #[test]
-    fn windows_absolute_and_unc_targets_keep_spaces_and_unicode() {
-        let local = PathBuf::from(r"C:\项目\my file.rs");
-        let network = PathBuf::from(r"\\server\share\folder name");
-        let command = parse_with(
-            &args(&[r"C:\项目\my file.rs:12:5", r"\\server\share\folder name"]),
-            Path::new(r"D:\work"),
-            &|path| path == local || path == network,
-        );
-        assert_eq!(
-            command,
-            Ok(Command::Open(vec![
-                Target { path: local, line: Some(12), column: Some(5) },
-                Target { path: network, line: None, column: None },
-            ]))
-        );
-    }
-
-    #[test]
-    fn line_and_column_flags_apply_to_the_next_path() {
-        let files = ["/work/a.rs", "/work/b.rs"];
-        assert_eq!(
-            parse_in(&["--line", "12", "--column=5", "a.rs", "b.rs"], &files),
-            Ok(Command::Open(vec![at("/work/a.rs", Some(12), Some(5)), at("/work/b.rs", None, None)]))
-        );
-        assert_eq!(
-            parse_in(&["--line=3", "a.rs:9:9"], &files),
-            Ok(Command::Open(vec![at("/work/a.rs", Some(3), None)]))
-        );
-        assert!(parse_in(&["--line", "0", "a.rs"], &files).is_err());
-        assert!(parse_in(&["--line"], &files).is_err());
-        assert!(parse_in(&["a.rs", "--line", "2"], &files).is_err());
-    }
-
-    #[test]
-    fn options() {
-        assert_eq!(parse_in(&["-h"], &[]), Ok(Command::Help));
-        assert_eq!(parse_in(&["--version"], &[]), Ok(Command::Version));
-        assert!(parse_in(&["--nope"], &[]).is_err());
-        assert_eq!(parse_in(&["--", "-h"], &["/work/-h"]), Ok(Command::Open(vec![at("/work/-h", None, None)])));
-    }
-
-    #[test]
-    fn existing_diff_command_is_supported() {
-        let files = ["/work/a.rs", "/work/b.rs"];
-        assert_eq!(
-            parse_in(&["diff", "a.rs", "b.rs"], &files),
-            Ok(Command::Diff(vec![at("/work/a.rs", None, None), at("/work/b.rs", None, None),]))
-        );
-        assert!(parse_in(&["diff", "a.rs"], &files).is_err());
-        assert_eq!(
-            parse_in(&["diff", "diff", "b.rs"], &["/work/diff", "/work/b.rs"]),
-            Ok(Command::Diff(vec![at("/work/diff", None, None), at("/work/b.rs", None, None),]))
-        );
-        assert_eq!(parse_in(&["--", "diff"], &["/work/diff"]), Ok(Command::Open(vec![at("/work/diff", None, None)])));
-        assert_eq!(
-            parse_in(&["--column=4", "a.rs", "b.rs"], &files),
-            Ok(Command::Open(vec![at("/work/a.rs", Some(1), Some(4)), at("/work/b.rs", None, None),]))
-        );
-    }
-}
@@ -1,476 +0,0 @@
-//! Installing the `openidea` command: a symlink on `PATH` to the launcher
-//! script in a macOS bundle, or a wrapper in a user's bin directory.
-
-use std::ffi::OsStr;
-use std::io;
-use std::path::{Path, PathBuf};
-
-pub const COMMAND: &str = "openidea";
-const LAUNCHER: &str = "Contents/Resources/bin/openidea";
-const SYSTEM_DIR: &str = "/usr/local/bin";
-
-/// The launcher script of the bundle whose executable is `exe`; `None` outside a bundle.
-pub fn bundled_launcher(exe: &Path) -> Option<PathBuf> {
-    let launcher = exe.parent()?.parent()?.parent()?.join(LAUNCHER);
-    launcher.is_file().then_some(launcher)
-}
-
-/// macOS runs a quarantined app from a random read-only copy until it is moved:
-/// a link there would break on the next launch.
-pub fn translocated(path: &Path) -> bool {
-    path.to_string_lossy().contains("/AppTranslocation/")
-}
-
-/// Where the link goes: `~/.local/bin` when it is on `path_var` (no administrator
-/// rights needed), else `/usr/local/bin`.
-pub fn link_dir(path_var: Option<&OsStr>, home: Option<&Path>) -> PathBuf {
-    let local = home.map(|h| h.join(".local/bin"));
-    match (path_var, local) {
-        (Some(var), Some(local)) if std::env::split_paths(var).any(|p| p == local) => local,
-        _ => PathBuf::from(SYSTEM_DIR),
-    }
-}
-
-/// Directories an earlier install may have used.
-pub fn link_dirs(home: Option<&Path>) -> Vec<PathBuf> {
-    home.map(|h| h.join(".local/bin")).into_iter().chain([PathBuf::from(SYSTEM_DIR)]).collect()
-}
-
-/// The installed links among `dirs` (any OpenIDEA bundle's launcher).
-pub fn installed(dirs: &[PathBuf]) -> Vec<PathBuf> {
-    dirs.iter().map(|d| d.join(COMMAND)).filter(|l| is_launcher_link(l)).collect()
-}
-
-fn is_launcher_link(link: &Path) -> bool {
-    std::fs::read_link(link).is_ok_and(|target| target.ends_with(LAUNCHER))
-}
-
-/// Links `dir/openidea` to `launcher`, asking for administrator rights when `dir`
-/// is not writable. Refuses to replace an `openidea` that is not ours.
-pub fn install(launcher: &Path, dir: &Path) -> io::Result<PathBuf> {
-    let link = dir.join(COMMAND);
-    if link.symlink_metadata().is_ok() && !is_launcher_link(&link) {
-        return Err(io::Error::new(
-            io::ErrorKind::AlreadyExists,
-            format!("{} already exists and is not an OpenIDEA command", link.display()),
-        ));
-    }
-    let direct = std::fs::create_dir_all(dir).and_then(|()| {
-        if link.symlink_metadata().is_ok() {
-            std::fs::remove_file(&link)?;
-        }
-        symlink(launcher, &link)
-    });
-    match direct {
-        Err(e) if e.kind() == io::ErrorKind::PermissionDenied => {
-            privileged(&format!("mkdir -p {} && ln -sfn {} {}", quote(dir), quote(launcher), quote(&link)))?
-        }
-        result => result?,
-    }
-    Ok(link)
-}
-
-/// Removes `links`, asking for administrator rights where needed.
-pub fn uninstall(links: &[PathBuf]) -> io::Result<()> {
-    for link in links {
-        match std::fs::remove_file(link) {
-            Err(e) if e.kind() == io::ErrorKind::PermissionDenied => privileged(&format!("rm -f {}", quote(link)))?,
-            result => result?,
-        }
-    }
-    Ok(())
-}
-
-#[cfg(unix)]
-fn symlink(target: &Path, link: &Path) -> io::Result<()> {
-    std::os::unix::fs::symlink(target, link)
-}
-
-#[cfg(not(unix))]
-fn symlink(_target: &Path, _link: &Path) -> io::Result<()> {
-    Err(io::Error::new(io::ErrorKind::Unsupported, "not supported on this platform"))
-}
-
-/// Runs `command` as root after the system's password prompt. Cancelling it is
-/// [`io::ErrorKind::Interrupted`].
-fn privileged(command: &str) -> io::Result<()> {
-    if !cfg!(target_os = "macos") {
-        return Err(io::Error::new(io::ErrorKind::PermissionDenied, "administrator rights required"));
-    }
-    let script = format!("do shell script \"{}\" with administrator privileges", applescript_escape(command));
-    let output = std::process::Command::new("/usr/bin/osascript").arg("-e").arg(script).output()?;
-    if output.status.success() {
-        return Ok(());
-    }
-    let message = String::from_utf8_lossy(&output.stderr).trim().to_owned();
-    // "User canceled. (-128)"
-    let kind = if message.contains("(-128)") { io::ErrorKind::Interrupted } else { io::ErrorKind::PermissionDenied };
-    Err(io::Error::new(kind, message))
-}
-
-fn quote(path: &Path) -> String {
-    format!("'{}'", path.to_string_lossy().replace('\'', r"'\''"))
-}
-
-fn applescript_escape(s: &str) -> String {
-    s.replace('\\', r"\\").replace('"', "\\\"")
-}
-
-const WRAPPER_MARKER: &str = "OpenIDEA command launcher v1";
-
-/// AppImages remount their executable on every launch. Keep the original image path.
-pub fn stable_executable(exe: &Path, appimage: Option<&Path>) -> io::Result<PathBuf> {
-    let path = appimage.unwrap_or(exe);
-    if !path.is_absolute() || !path.is_file() {
-        return Err(io::Error::new(io::ErrorKind::NotFound, "the OpenIDEA executable must be in a permanent location"));
-    }
-    Ok(path.to_path_buf())
-}
-
-pub fn wrapper_path(dir: &Path, windows: bool) -> PathBuf {
-    dir.join(if windows { "openidea.cmd" } else { COMMAND })
-}
-
-fn wrapper(exe: &Path, windows: bool) -> io::Result<String> {
-    let exe =
-        exe.to_str().ok_or_else(|| io::Error::new(io::ErrorKind::InvalidInput, "the executable path is not UTF-8"))?;
-    if exe.contains(['\r', '\n']) || (windows && exe.contains('"')) {
-        return Err(io::Error::new(io::ErrorKind::InvalidInput, "the executable path contains unsupported characters"));
-    }
-    Ok(if windows {
-        format!(
-            "@echo off\r\nrem {WRAPPER_MARKER}\r\nsetlocal DisableDelayedExpansion\r\nfor /f \"tokens=2 delims=:\" %%c in ('\"%SystemRoot%\\System32\\chcp.com\"') do set \"_openidea_codepage=%%c\"\r\n\"%SystemRoot%\\System32\\chcp.com\" 65001 >nul\r\n\"{}\" --cli %*\r\nset \"_openidea_exit=%errorlevel%\"\r\n\"%SystemRoot%\\System32\\chcp.com\" %_openidea_codepage% >nul\r\nexit /b %_openidea_exit%\r\n",
-            exe.replace('%', "%%")
-        )
-    } else {
-        format!("#!/bin/sh\n# {WRAPPER_MARKER}\nexec {} --cli \"$@\"\n", quote(Path::new(exe)))
-    })
-}
-
-pub fn is_wrapper(path: &Path, windows: bool) -> bool {
-    path.symlink_metadata().is_ok_and(|meta| meta.is_file() && !meta.file_type().is_symlink())
-        && std::fs::read_to_string(path).is_ok_and(|text| {
-            text.lines().nth(1) == Some(&format!("{} {WRAPPER_MARKER}", if windows { "rem" } else { "#" }))
-        })
-}
-
-/// Never follows or overwrites a foreign file, even if it has the same command name.
-pub fn install_wrapper(exe: &Path, dir: &Path, windows: bool) -> io::Result<PathBuf> {
-    use std::io::Write;
-    let text = wrapper(exe, windows)?;
-    let path = wrapper_path(dir, windows);
-    if path.symlink_metadata().is_ok() {
-        if !is_wrapper(&path, windows) {
-            return Err(io::Error::new(
-                io::ErrorKind::AlreadyExists,
-                format!("{} already exists and is not an OpenIDEA command", path.display()),
-            ));
-        }
-        std::fs::remove_file(&path)?;
-    }
-    std::fs::create_dir_all(dir)?;
-    let mut file = std::fs::OpenOptions::new().write(true).create_new(true).open(&path)?;
-    #[cfg(unix)]
-    {
-        use std::os::unix::fs::PermissionsExt;
-        file.set_permissions(std::fs::Permissions::from_mode(0o755))?;
-    }
-    file.write_all(text.as_bytes())?;
-    Ok(path)
-}
-
-pub fn uninstall_wrapper(dir: &Path, windows: bool) -> io::Result<Vec<PathBuf>> {
-    let path = wrapper_path(dir, windows);
-    if !is_wrapper(&path, windows) {
-        return Ok(vec![]);
-    }
-    std::fs::remove_file(&path)?;
-    Ok(vec![path])
-}
-
-/// Preserve every unrelated PATH entry, including expandable environment variables.
-pub fn windows_path(current: &str, dir: &str, add: bool) -> Option<String> {
-    fn equal(a: &str, b: &str) -> bool {
-        a.trim().trim_matches('"').trim_end_matches(['\\', '/']).eq_ignore_ascii_case(b.trim_end_matches(['\\', '/']))
-    }
-    let found = current.split(';').any(|entry| equal(entry, dir));
-    if add {
-        if found {
-            return None;
-        }
-        Some(format!("{dir}{}{current}", if current.is_empty() { "" } else { ";" }))
-    } else if found {
-        Some(current.split(';').filter(|entry| !equal(entry, dir)).collect::<Vec<_>>().join(";"))
-    } else {
-        None
-    }
-}
-
-#[cfg(windows)]
-pub fn update_user_path(dir: &Path, add: bool) -> io::Result<()> {
-    use winreg::{
-        RegKey,
-        enums::{HKEY_CURRENT_USER, REG_EXPAND_SZ},
-        types::{FromRegValue, ToRegValue},
-    };
-    let (environment, _) = RegKey::predef(HKEY_CURRENT_USER).create_subkey("Environment")?;
-    let raw = match environment.get_raw_value("Path") {
-        Ok(raw) => Some(raw),
-        Err(e) if e.kind() == io::ErrorKind::NotFound => None,
-        Err(e) => return Err(e),
-    };
-    let current = raw.as_ref().map(String::from_reg_value).transpose()?.unwrap_or_default();
-    let Some(updated) = windows_path(&current, &dir.to_string_lossy(), add) else { return Ok(()) };
-    let mut value = updated.to_reg_value();
-    value.vtype = raw.as_ref().map_or(REG_EXPAND_SZ, |raw| raw.vtype.clone());
-    environment.set_raw_value("Path", &value)?;
-    let message: Vec<u16> = "Environment\0".encode_utf16().collect();
-    // SAFETY: the terminated string stays alive for this bounded synchronous broadcast.
-    unsafe {
-        windows_sys::Win32::UI::WindowsAndMessaging::SendMessageTimeoutW(
-            windows_sys::Win32::UI::WindowsAndMessaging::HWND_BROADCAST,
-            windows_sys::Win32::UI::WindowsAndMessaging::WM_SETTINGCHANGE,
-            0,
-            message.as_ptr() as isize,
-            windows_sys::Win32::UI::WindowsAndMessaging::SMTO_ABORTIFHUNG,
-            1000,
-            std::ptr::null_mut(),
-        );
-    }
-    Ok(())
-}
-
-pub struct Installation {
-    pub path: PathBuf,
-    /// Some when the user needs to add this directory to their shell's PATH.
-    pub path_directory: Option<PathBuf>,
-}
-
-fn resolves_to(path_var: Option<&OsStr>, command: &Path) -> bool {
-    path_var
-        .and_then(|path| std::env::split_paths(path).map(|dir| dir.join(COMMAND)).find(|candidate| candidate.is_file()))
-        .is_some_and(|candidate| candidate == command)
-}
-
-fn user_bin() -> io::Result<PathBuf> {
-    if cfg!(windows) {
-        dirs::data_local_dir().map(|dir| dir.join("OpenIDEA/bin"))
-    } else {
-        dirs::home_dir().map(|dir| dir.join(".local/bin"))
-    }
-    .ok_or_else(|| io::Error::new(io::ErrorKind::NotFound, "no user directory for the openidea command"))
-}
-
-pub fn install_current() -> io::Result<Installation> {
-    let exe = std::env::current_exe()?;
-    if cfg!(target_os = "macos") {
-        let launcher = bundled_launcher(&exe).ok_or_else(|| {
-            io::Error::new(io::ErrorKind::NotFound, "install the command from the packaged OpenIDEA app")
-        })?;
-        if translocated(&launcher) {
-            return Err(io::Error::new(
-                io::ErrorKind::PermissionDenied,
-                "move OpenIDEA to the Applications folder first",
-            ));
-        }
-        let dir = link_dir(std::env::var_os("PATH").as_deref(), dirs::home_dir().as_deref());
-        return Ok(Installation { path: install(&launcher, &dir)?, path_directory: None });
-    }
-    let image = if cfg!(target_os = "linux") { std::env::var_os("APPIMAGE").map(PathBuf::from) } else { None };
-    let exe = stable_executable(&exe, image.as_deref())?;
-    let dir = user_bin()?;
-    let path = install_wrapper(&exe, &dir, cfg!(windows))?;
-    #[cfg(windows)]
-    update_user_path(&dir, true)?;
-    let on_path = cfg!(windows) || resolves_to(std::env::var_os("PATH").as_deref(), &path);
-    Ok(Installation { path, path_directory: (!on_path).then_some(dir) })
-}
-
-pub fn uninstall_current() -> io::Result<Vec<PathBuf>> {
-    if cfg!(target_os = "macos") {
-        let links = installed(&link_dirs(dirs::home_dir().as_deref()));
-        uninstall(&links)?;
-        return Ok(links);
-    }
-    let dir = user_bin()?;
-    let path = wrapper_path(&dir, cfg!(windows));
-    if is_wrapper(&path, cfg!(windows)) {
-        #[cfg(windows)]
-        update_user_path(&dir, false)?;
-        return uninstall_wrapper(&dir, cfg!(windows));
-    }
-    Ok(vec![])
-}
-
-#[cfg(test)]
-mod wrapper_tests {
-    use super::*;
-
-    #[test]
-    fn wrappers_install_update_and_remove_only_their_own_files() {
-        for windows in [false, true] {
-            let dir = tempfile::tempdir().unwrap();
-            let exe = dir.path().join("App folder/程序 & it's 100%.exe");
-            let path = install_wrapper(&exe, dir.path(), windows).unwrap();
-            assert!(is_wrapper(&path, windows));
-            assert_eq!(install_wrapper(&exe, dir.path(), windows).unwrap(), path);
-            assert_eq!(uninstall_wrapper(dir.path(), windows).unwrap(), vec![path.clone()]);
-            assert!(uninstall_wrapper(dir.path(), windows).unwrap().is_empty());
-            std::fs::write(&path, "foreign command").unwrap();
-            assert_eq!(install_wrapper(&exe, dir.path(), windows).unwrap_err().kind(), io::ErrorKind::AlreadyExists);
-            assert!(uninstall_wrapper(dir.path(), windows).unwrap().is_empty());
-            assert_eq!(std::fs::read_to_string(&path).unwrap(), "foreign command");
-        }
-    }
-
-    #[test]
-    fn path_changes_keep_other_entries_and_do_not_duplicate_the_command_dir() {
-        let dir = r"C:\Users\用户\OpenIDEA\bin";
-        let initial = r"%USERPROFILE%\tools;C:\other";
-        let updated = windows_path(initial, dir, true).unwrap();
-        assert_eq!(updated, format!("{dir};{initial}"));
-        assert_eq!(windows_path(&updated, dir, true), None);
-        assert_eq!(windows_path(&updated, dir, false).as_deref(), Some(initial));
-        assert_eq!(
-            windows_path(&format!("\"{dir}\\\";C:\\other"), &dir.to_uppercase(), false).as_deref(),
-            Some(r"C:\other")
-        );
-        assert_eq!(windows_path(initial, dir, false), None);
-    }
-
-    #[test]
-    fn appimage_uses_the_persistent_image_not_the_mounted_binary() {
-        let dir = tempfile::tempdir().unwrap();
-        let image = dir.path().join("OpenIDEA.AppImage");
-        std::fs::write(&image, "image").unwrap();
-        assert_eq!(stable_executable(Path::new("/tmp/.mount_App/usr/bin/openidea"), Some(&image)).unwrap(), image);
-        assert_eq!(stable_executable(&image, None).unwrap(), image);
-        assert!(stable_executable(Path::new("missing"), None).is_err());
-    }
-
-    #[test]
-    fn detects_a_system_binary_shadowing_the_linux_wrapper() {
-        let dir = tempfile::tempdir().unwrap();
-        let system = dir.path().join("system");
-        let user = dir.path().join("user");
-        for bin in [&system, &user] {
-            std::fs::create_dir_all(bin).unwrap();
-            std::fs::write(bin.join(COMMAND), "command").unwrap();
-        }
-        let path = std::env::join_paths([&system, &user]).unwrap();
-        assert!(!resolves_to(Some(&path), &user.join(COMMAND)));
-        let path = std::env::join_paths([&user, &system]).unwrap();
-        assert!(resolves_to(Some(&path), &user.join(COMMAND)));
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn posix_wrapper_preserves_arguments_and_exit_status() {
-        use std::os::unix::fs::PermissionsExt;
-        let dir = tempfile::tempdir().unwrap();
-        let exe = dir.path().join("app & it's $dollar `quoted` \"double\"");
-        std::fs::write(&exe, "#!/bin/sh\nprintf '%s\\n' \"$@\"\nexit 7\n").unwrap();
-        std::fs::set_permissions(&exe, std::fs::Permissions::from_mode(0o755)).unwrap();
-        let path = install_wrapper(&exe, &dir.path().join("bin"), false).unwrap();
-        let output = std::process::Command::new(path).args(["a b", "中文", "x'$`&"]).output().unwrap();
-        assert_eq!(output.status.code(), Some(7));
-        assert_eq!(String::from_utf8(output.stdout).unwrap(), "--cli\na b\n中文\nx'$`&\n");
-    }
-
-    #[cfg(windows)]
-    #[test]
-    fn cmd_wrapper_preserves_arguments_and_exit_status() {
-        use std::os::windows::process::CommandExt;
-        let dir = tempfile::tempdir().unwrap();
-        let exe = dir.path().join("程序 & 100% !special!.exe");
-        let source = dir.path().join("helper.rs");
-        std::fs::write(
-            &source,
-            r#"fn main() { for arg in std::env::args().skip(1) { println!("{arg}"); } std::process::exit(7); }"#,
-        )
-        .unwrap();
-        let compiled = std::process::Command::new("rustc")
-            .args(["--crate-name", "launcher_test"])
-            .arg(&source)
-            .arg("-o")
-            .arg(&exe)
-            .output()
-            .unwrap();
-        assert!(compiled.status.success(), "{}", String::from_utf8_lossy(&compiled.stderr));
-        let path = install_wrapper(&exe, &dir.path().join("bin"), true).unwrap();
-        std::fs::write(dir.path().join("chcp.cmd"), "@echo malicious-chcp\r\nexit /b 99\r\n").unwrap();
-        let output = std::process::Command::new("cmd.exe")
-            .current_dir(dir.path())
-            .args(["/d", "/s", "/c"])
-            .raw_arg(format!("\"\"{}\" \"a b\" \"中文\" \"x&y\"\"", path.display()))
-            .output()
-            .unwrap();
-        assert_eq!(output.status.code(), Some(7));
-        assert_eq!(String::from_utf8(output.stdout).unwrap().replace("\r\n", "\n"), "--cli\na b\n中文\nx&y\n");
-        let check = dir.path().join("check.cmd");
-        std::fs::write(&check, "@echo off\r\nfor /f \"tokens=2 delims=:\" %%c in ('\"%SystemRoot%\\System32\\chcp.com\"') do set \"before=%%c\"\r\ncall \"%~dp0bin\\openidea.cmd\" example\r\nset \"code=%errorlevel%\"\r\nfor /f \"tokens=2 delims=:\" %%c in ('\"%SystemRoot%\\System32\\chcp.com\"') do set \"after=%%c\"\r\nif not \"%before%\"==\"%after%\" exit /b 99\r\nexit /b %code%\r\n").unwrap();
-        let output = std::process::Command::new("cmd.exe")
-            .current_dir(dir.path())
-            .args(["/d", "/s", "/c"])
-            .raw_arg(format!("\"\"{}\"\"", check.display()))
-            .output()
-            .unwrap();
-        assert_eq!(output.status.code(), Some(7));
-        assert!(!String::from_utf8_lossy(&output.stdout).contains("malicious-chcp"));
-    }
-}
-
-#[cfg(all(test, unix))]
-mod tests {
-    use super::*;
-
-    fn bundle(root: &Path) -> (PathBuf, PathBuf) {
-        let app = root.join("OpenIDEA.app");
-        let exe = app.join("Contents/MacOS/openidea");
-        let launcher = app.join(LAUNCHER);
-        std::fs::create_dir_all(exe.parent().unwrap()).unwrap();
-        std::fs::create_dir_all(launcher.parent().unwrap()).unwrap();
-        std::fs::write(&exe, "").unwrap();
-        std::fs::write(&launcher, "").unwrap();
-        (exe, launcher)
-    }
-
-    #[test]
-    fn finds_the_launcher_of_a_bundle_only() {
-        let dir = tempfile::tempdir().unwrap();
-        let (exe, launcher) = bundle(dir.path());
-        assert_eq!(bundled_launcher(&exe), Some(launcher));
-        assert_eq!(bundled_launcher(&dir.path().join("target/debug/openidea")), None);
-        assert!(translocated(Path::new("/private/var/folders/x/AppTranslocation/ABC/d/OpenIDEA.app")));
-    }
-
-    #[test]
-    fn prefers_local_bin_on_path() {
-        let home = Path::new("/Users/u");
-        let path = std::env::join_paths(["/usr/bin", "/Users/u/.local/bin"]).unwrap();
-        assert_eq!(link_dir(Some(&path), Some(home)), home.join(".local/bin"));
-        assert_eq!(link_dir(Some(OsStr::new("/usr/bin")), Some(home)), PathBuf::from(SYSTEM_DIR));
-        assert_eq!(link_dir(None, Some(home)), PathBuf::from(SYSTEM_DIR));
-    }
-
-    #[test]
-    fn install_replaces_its_own_link_but_not_other_files() {
-        let dir = tempfile::tempdir().unwrap();
-        let (_, launcher) = bundle(dir.path());
-        let bin = dir.path().join("bin");
-        let link = install(&launcher, &bin).unwrap();
-        assert_eq!(std::fs::read_link(&link).unwrap(), launcher);
-        assert_eq!(install(&launcher, &bin).unwrap(), link);
-        assert_eq!(installed(std::slice::from_ref(&bin)), vec![link.clone()]);
-        uninstall(&installed(std::slice::from_ref(&bin))).unwrap();
-        assert!(installed(std::slice::from_ref(&bin)).is_empty());
-        std::fs::write(&link, "someone else's").unwrap();
-        assert_eq!(install(&launcher, &bin).unwrap_err().kind(), io::ErrorKind::AlreadyExists);
-    }
-
-    #[test]
-    fn quoting() {
-        assert_eq!(quote(Path::new("/a b/it's")), r"'/a b/it'\''s'");
-        assert_eq!(applescript_escape(r#"ln "a\b""#), r#"ln \"a\\b\""#);
-    }
-}
@@ -1,72 +0,0 @@
-//! The `openidea` command.
-//!
-//! The command is the app's own executable run in CLI mode: it parses its
-//! arguments ([`args`]), sends one [`Request`] to the running app over a local
-//! socket ([`socket`]) and exits. [`install`] links the bundle's launcher
-//! script into a directory on `PATH`.
-
-pub mod args;
-pub mod install;
-pub mod socket;
-
-use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
-
-/// Bumped when [`Request`] changes incompatibly; an app still running an older
-/// version answers with an error instead of misreading it.
-pub const PROTOCOL_VERSION: u32 = 1;
-
-/// A file or folder to open, with an optional 1-based position in a file.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Target {
-    /// Absolute.
-    pub path: PathBuf,
-    pub line: Option<u32>,
-    pub column: Option<u32>,
-}
-
-/// What the command asks the running app to do. No targets: bring the app to the front.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Request {
-    pub version: u32,
-    pub targets: Vec<Target>,
-    #[serde(default)]
-    pub diff: bool,
-}
-
-impl Request {
-    pub fn open(targets: Vec<Target>) -> Self {
-        Self { version: PROTOCOL_VERSION, targets, diff: false }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(tag = "kind", rename_all = "camelCase")]
-pub enum Response {
-    Ok,
-    Error { message: String },
-}
-
-/// A GUI subsystem executable inherits redirected handles, but needs its parent's
-/// console for interactive help and errors. Batch launchers wait for this process.
-#[cfg(windows)]
-pub fn attach_console() {
-    use windows_sys::Win32::Storage::FileSystem::{FILE_TYPE_DISK, FILE_TYPE_PIPE, GetFileType};
-    use windows_sys::Win32::System::Console::{
-        ATTACH_PARENT_PROCESS, AttachConsole, GetStdHandle, STD_ERROR_HANDLE, STD_INPUT_HANDLE, STD_OUTPUT_HANDLE,
-        SetStdHandle,
-    };
-    // SAFETY: attaches only this CLI process, without allocating a new console.
-    unsafe {
-        let redirected = [STD_INPUT_HANDLE, STD_OUTPUT_HANDLE, STD_ERROR_HANDLE].map(|kind| {
-            let handle = GetStdHandle(kind);
-            (kind, handle, matches!(GetFileType(handle), FILE_TYPE_DISK | FILE_TYPE_PIPE))
-        });
-        AttachConsole(ATTACH_PARENT_PROCESS);
-        for (kind, handle, keep) in redirected {
-            if keep {
-                SetStdHandle(kind, handle);
-            }
-        }
-    }
-}
@@ -1,266 +0,0 @@
-//! The local socket the running app listens on: one JSON [`Request`] line in,
-//! one [`Response`] line out. Unix domain sockets or Windows named pipes.
-
-use crate::{Request, Response};
-use std::io;
-use std::path::{Path, PathBuf};
-use std::time::Duration;
-
-const TIMEOUT: Duration = Duration::from_secs(10);
-const MAX_MESSAGE: u64 = 1024 * 1024;
-
-fn answer(line: &str, handle: &dyn Fn(Request) -> Response) -> Response {
-    match serde_json::from_str::<Request>(line) {
-        Ok(request) if request.version == crate::PROTOCOL_VERSION && (!request.diff || request.targets.len() == 2) => {
-            handle(request)
-        }
-        Ok(_) => Response::Error { message: "unsupported or invalid CLI request".into() },
-        Err(e) => Response::Error { message: format!("invalid request: {e}") },
-    }
-}
-
-/// The socket of the app with bundle identifier `identifier`. The name is a hash:
-/// socket paths are limited to about 100 bytes, and development identifiers are long.
-pub fn socket_path(identifier: &str) -> Option<PathBuf> {
-    if cfg!(windows) {
-        let user = dirs::data_local_dir()?;
-        return Some(PathBuf::from(format!(
-            r"\\.\pipe\openidea-{:016x}",
-            fnv1a(&format!("{}:{identifier}", user.display()))
-        )));
-    }
-    let dir = if cfg!(target_os = "macos") { dirs::cache_dir() } else { dirs::runtime_dir().or_else(dirs::cache_dir) };
-    Some(dir?.join(format!("openidea-{:016x}.sock", fnv1a(identifier))))
-}
-
-fn fnv1a(s: &str) -> u64 {
-    s.bytes().fold(0xcbf29ce484222325, |hash, byte| (hash ^ u64::from(byte)).wrapping_mul(0x100000001b3))
-}
-
-#[cfg(unix)]
-mod imp {
-    use super::*;
-    use std::io::{BufRead, BufReader, Read, Write};
-    use std::os::unix::fs::{FileTypeExt, PermissionsExt};
-    use std::os::unix::net::{UnixListener, UnixStream};
-
-    pub fn send(socket: &Path, request: &Request) -> io::Result<Response> {
-        let stream = UnixStream::connect(socket)?;
-        stream.set_read_timeout(Some(TIMEOUT))?;
-        stream.set_write_timeout(Some(TIMEOUT))?;
-        write_line(&stream, request)?;
-        let mut reply = String::new();
-        BufReader::new((&stream).take(MAX_MESSAGE)).read_line(&mut reply)?;
-        Ok(serde_json::from_str(&reply)?)
-    }
-
-    pub fn serve(socket: &Path, handle: impl Fn(Request) -> Response + Send + 'static) -> io::Result<()> {
-        let listener = bind(socket)?;
-        std::thread::Builder::new().name("cli-socket".into()).spawn(move || {
-            for stream in listener.incoming().flatten() {
-                if let Err(e) = serve_one(&stream, &handle) {
-                    tracing::warn!("cli request failed: {e}");
-                }
-            }
-        })?;
-        Ok(())
-    }
-
-    /// Binds `socket`, replacing a stale file no one answers on.
-    fn bind(socket: &Path) -> io::Result<UnixListener> {
-        if let Some(dir) = socket.parent() {
-            std::fs::create_dir_all(dir)?;
-        }
-        let listener = match UnixListener::bind(socket) {
-            Err(e) if e.kind() == io::ErrorKind::AddrInUse => {
-                if !std::fs::symlink_metadata(socket)?.file_type().is_socket() || UnixStream::connect(socket).is_ok() {
-                    return Err(e);
-                }
-                std::fs::remove_file(socket)?;
-                UnixListener::bind(socket)?
-            }
-            bound => bound?,
-        };
-        std::fs::set_permissions(socket, std::fs::Permissions::from_mode(0o600))?;
-        Ok(listener)
-    }
-
-    fn serve_one(stream: &UnixStream, handle: &dyn Fn(Request) -> Response) -> io::Result<()> {
-        stream.set_read_timeout(Some(TIMEOUT))?;
-        stream.set_write_timeout(Some(TIMEOUT))?;
-        let mut line = String::new();
-        BufReader::new(stream.take(MAX_MESSAGE)).read_line(&mut line)?;
-        write_line(stream, &answer(&line, handle))
-    }
-
-    fn write_line(mut stream: &UnixStream, value: &impl serde::Serialize) -> io::Result<()> {
-        let mut line = serde_json::to_string(value)?;
-        line.push('\n');
-        stream.write_all(line.as_bytes())
-    }
-}
-
-#[cfg(windows)]
-mod imp {
-    use super::*;
-    use tokio::io::{AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufReader};
-    use tokio::net::windows::named_pipe::{ClientOptions, ServerOptions};
-
-    fn runtime() -> io::Result<tokio::runtime::Runtime> {
-        tokio::runtime::Builder::new_current_thread().enable_all().build()
-    }
-
-    pub fn send(socket: &Path, request: &Request) -> io::Result<Response> {
-        runtime()?.block_on(async {
-            tokio::time::timeout(TIMEOUT, async {
-                let mut pipe = loop {
-                    match ClientOptions::new().open(socket) {
-                        Ok(pipe) => break pipe,
-                        // All existing instances are busy; wait instead of starting another app.
-                        Err(e) if e.raw_os_error() == Some(231) => tokio::time::sleep(Duration::from_millis(10)).await,
-                        Err(e) => return Err(e),
-                    }
-                };
-                let mut line = serde_json::to_vec(request)?;
-                line.push(b'\n');
-                pipe.write_all(&line).await?;
-                let mut reply = String::new();
-                BufReader::new((&mut pipe).take(MAX_MESSAGE)).read_line(&mut reply).await?;
-                pipe.write_all(b"\n").await?;
-                Ok(serde_json::from_str(&reply)?)
-            })
-            .await
-            .map_err(|_| io::Error::new(io::ErrorKind::TimedOut, "CLI request timed out"))?
-        })
-    }
-
-    pub fn serve(socket: &Path, handle: impl Fn(Request) -> Response + Send + 'static) -> io::Result<()> {
-        let socket = socket.to_owned();
-        let (ready, receiver) = std::sync::mpsc::sync_channel(1);
-        std::thread::Builder::new().name("cli-pipe".into()).spawn(move || {
-            let runtime = match runtime() {
-                Ok(runtime) => runtime,
-                Err(e) => {
-                    let _ = ready.send(Err(e));
-                    return;
-                }
-            };
-            runtime.block_on(async move {
-                let mut pipe = match ServerOptions::new().first_pipe_instance(true).create(&socket) {
-                    Ok(pipe) => pipe,
-                    Err(e) => {
-                        let _ = ready.send(Err(e));
-                        return;
-                    }
-                };
-                let _ = ready.send(Ok(()));
-                loop {
-                    if let Err(e) = pipe.connect().await {
-                        tracing::warn!("CLI pipe connection failed: {e}");
-                        return;
-                    }
-                    // Keep an instance bound while answering, so another process cannot take the name.
-                    let next = match ServerOptions::new().create(&socket) {
-                        Ok(next) => next,
-                        Err(e) => {
-                            tracing::warn!("cannot create CLI pipe: {e}");
-                            return;
-                        }
-                    };
-                    let reply = tokio::time::timeout(TIMEOUT, async {
-                        let mut line = String::new();
-                        BufReader::new((&mut pipe).take(MAX_MESSAGE)).read_line(&mut line).await?;
-                        let mut reply = serde_json::to_vec(&answer(&line, &handle))?;
-                        reply.push(b'\n');
-                        pipe.write_all(&reply).await?;
-                        // Wait until the client has drained the reply before closing its instance.
-                        pipe.read_exact(&mut [0u8; 1]).await.map(|_| ())
-                    })
-                    .await;
-                    if !matches!(reply, Ok(Ok(()))) {
-                        tracing::warn!("CLI pipe request failed: {reply:?}");
-                    }
-                    // Dropping after the write lets the client drain its reply before disconnecting.
-                    drop(pipe);
-                    pipe = next;
-                }
-            });
-        })?;
-        receiver.recv().map_err(|_| io::Error::other("CLI pipe thread stopped"))?
-    }
-}
-
-/// Sends `request` to the app listening on `socket` and waits for its answer.
-pub use imp::send;
-/// Answers requests on `socket` with `handle`, on a thread of its own.
-pub use imp::serve;
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn socket_names_separate_identifiers_and_stay_short() {
-        let release = socket_path("ai.l0ng.openidea").unwrap();
-        let dev = socket_path("ai.l0ng.openidea.dev.w158e9c5954b7bf64").unwrap();
-        assert_ne!(release, dev);
-        assert!(dev.as_os_str().len() < 100 || cfg!(unix));
-    }
-
-    #[test]
-    fn answers_only_its_protocol_version() {
-        let ok = |_: Request| Response::Ok;
-        assert_eq!(answer(&serde_json::to_string(&Request::open(vec![])).unwrap(), &ok), Response::Ok);
-        let old = r#"{"version":0,"targets":[]}"#;
-        assert!(matches!(answer(old, &ok), Response::Error { .. }));
-        assert!(matches!(answer("garbage", &ok), Response::Error { .. }));
-    }
-
-    #[cfg(windows)]
-    #[test]
-    fn named_pipe_round_trip() {
-        let socket = socket_path(&format!("test-{}", std::process::id())).unwrap();
-        let (tx, rx) = std::sync::mpsc::channel();
-        serve(&socket, move |request| {
-            tx.send(request).unwrap();
-            Response::Ok
-        })
-        .unwrap();
-        for _ in 0..2 {
-            let target = crate::Target { path: r"C:\项目\my file.rs".into(), line: Some(3), column: Some(2) };
-            assert_eq!(send(&socket, &Request::open(vec![target.clone()])).unwrap(), Response::Ok);
-            assert_eq!(rx.recv_timeout(TIMEOUT).unwrap().targets, vec![target]);
-        }
-        assert!(serve(&socket, |_| Response::Ok).is_err());
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn request_round_trip_and_stale_socket() {
-        let dir = tempfile::tempdir().unwrap();
-        let socket = dir.path().join("cli.sock");
-        // A file left by an app that exited without removing it.
-        drop(std::os::unix::net::UnixListener::bind(&socket).unwrap());
-        let (tx, rx) = std::sync::mpsc::channel();
-        serve(&socket, move |request| {
-            tx.send(request).unwrap();
-            Response::Ok
-        })
-        .unwrap();
-        let target = crate::Target { path: "/p/a.rs".into(), line: Some(3), column: None };
-        assert_eq!(send(&socket, &Request::open(vec![target.clone()])).unwrap(), Response::Ok);
-        assert_eq!(rx.recv().unwrap().targets, vec![target]);
-        // A live server keeps its socket.
-        assert_eq!(serve(&socket, |_| Response::Ok).unwrap_err().kind(), io::ErrorKind::AddrInUse);
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn refuses_to_remove_an_unrelated_file() {
-        let dir = tempfile::tempdir().unwrap();
-        let socket = dir.path().join("cli.sock");
-        std::fs::write(&socket, "keep").unwrap();
-        assert!(serve(&socket, |_| Response::Ok).is_err());
-        assert_eq!(std::fs::read_to_string(&socket).unwrap(), "keep");
-    }
-}
@@ -1,6 +1,6 @@
 [package]
 name = "ide-clipboard"
-description = "The OS clipboard's file list (Explorer <-> project view) and pasted images: Windows CF_HDROP / PNG / CF_DIB or macOS NSPasteboard, no window or message loop"
+description = "The OS clipboard's file list (Explorer <-> project view): Windows CF_HDROP or macOS NSPasteboard file URLs, no window or message loop"
 version.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -9,14 +9,5 @@ license.workspace = true

 [target.'cfg(target_os = "macos")'.dependencies]
 objc2 = { version = "0.6", default-features = false, features = ["std"] }
-objc2-foundation = { version = "0.3", default-features = false, features = ["std", "NSArray", "NSData", "NSDictionary", "NSEnumerator", "NSObject", "NSString", "NSURL", "NSValue"] }
-objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSBitmapImageRep", "NSImageRep", "NSPasteboard"] }
-
-[target.'cfg(windows)'.dependencies]
-png = "0.18"
-
-[target.'cfg(target_os = "linux")'.dependencies]
-gtk = "0.18"
-
-[dev-dependencies]
-png = "0.18"
+objc2-foundation = { version = "0.3", default-features = false, features = ["std", "NSArray", "NSDictionary", "NSEnumerator", "NSObject", "NSString", "NSURL", "NSValue"] }
+objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSPasteboard"] }
@@ -18,39 +18,9 @@
 //!
 //! Other platforms (`text/uri-list` on X11) are not wired up: [`files`] is
 //! empty and [`set_files`] fails there.
-//!
-//! [`png`] reads an image (a screenshot) for the project view's Paste, which
-//! saves it as a file: `public.png` or `public.tiff` on macOS, the registered
-//! `PNG` format or `CF_DIB` on Windows. Linux reads it through GTK in the app.

 use std::path::PathBuf;

-/// Replaces every clipboard flavor with plain text. `owner` is the calling window
-/// handle on Windows, ignored elsewhere. Call on the main thread on macOS and Linux.
-pub fn set_text(text: &str, owner: usize) -> std::io::Result<()> {
-    imp::set_text(text, owner)
-}
-
-/// The clipboard's plain text, None when it holds none. macOS only (main thread);
-/// Linux reads it asynchronously through GTK in the app, Windows through the WebView.
-#[cfg(target_os = "macos")]
-pub fn text() -> Option<String> {
-    imp::text()
-}
-
-/// The clipboard's image as PNG bytes, None when it holds none. Call on the main
-/// thread on macOS.
-#[cfg(any(windows, target_os = "macos"))]
-pub fn png() -> Option<Vec<u8>> {
-    imp::png()
-}
-
-/// Whether the clipboard holds an image, without reading it. Call on the main
-/// thread on macOS and Linux.
-pub fn has_image() -> bool {
-    imp::has_image()
-}
-
 /// Size of `DROPFILES`: `pFiles`, `pt` (two `LONG`s), `fNC`, `fWide`.
 const HEADER: usize = 20;

@@ -151,62 +121,9 @@ pub fn decode(bytes: &[u8]) -> Vec<PathBuf> {
    out
 }

-/// `BI_RGB` and `BI_BITFIELDS`: uncompressed pixels, the forms screenshots take.
-#[cfg(any(windows, test))]
-const BI_RGB: u32 = 0;
-#[cfg(any(windows, test))]
-const BI_BITFIELDS: u32 = 3;
-
-/// A packed DIB (`BITMAPINFOHEADER` or a later header, then the pixels) as PNG.
-/// Only 24- and 32-bit uncompressed bitmaps, which is what screenshots and
-/// copied images are; None for anything else. A 32-bit bitmap whose alpha is
-/// all zero (most writers leave it unset) is opaque.
-#[cfg(any(windows, test))]
-fn dib_to_png(dib: &[u8]) -> Option<Vec<u8>> {
-    let u32_at = |at: usize| dib.get(at..at + 4).map(|b| u32::from_le_bytes([b[0], b[1], b[2], b[3]]));
-    let header = u32_at(0)? as usize;
-    let width = u32_at(4)? as i32;
-    let height = u32_at(8)? as i32;
-    let bits = u16::from_le_bytes([*dib.get(14)?, *dib.get(15)?]);
-    let compression = u32_at(16)?;
-    if header < 40 || width <= 0 || height == 0 || !matches!(bits, 24 | 32) {
-        return None;
-    }
-    if compression != BI_RGB && !(compression == BI_BITFIELDS && bits == 32) {
-        return None;
-    }
-    // A `BITMAPINFOHEADER` keeps the three bitfield masks after it; later
-    // headers hold them inside. Masks other than BGRA's are not supported.
-    let masks = if compression == BI_BITFIELDS && header == 40 { 12 } else { 0 };
-    let colors = u32_at(32)? as usize;
-    let (width, rows) = (width as usize, height.unsigned_abs() as usize);
-    let stride = (width * bits as usize).div_ceil(32) * 4;
-    let start = header + masks + colors * 4;
-    let pixels = dib.get(start..start.checked_add(stride.checked_mul(rows)?)?)?;
-    let step = bits as usize / 8;
-    let mut rgba = Vec::with_capacity(width * rows * 4);
-    for row in 0..rows {
-        // A positive height stores the bottom row first.
-        let source = if height > 0 { rows - 1 - row } else { row };
-        let line = &pixels[source * stride..source * stride + width * step];
-        for px in line.chunks_exact(step) {
-            rgba.extend_from_slice(&[px[2], px[1], px[0], if step == 4 { px[3] } else { 255 }]);
-        }
-    }
-    if step == 4 && rgba.as_chunks::<4>().0.iter().all(|px| px[3] == 0) {
-        rgba.as_chunks_mut::<4>().0.iter_mut().for_each(|px| px[3] = 255);
-    }
-    let mut out = Vec::new();
-    let mut encoder = png::Encoder::new(&mut out, width as u32, rows as u32);
-    encoder.set_color(png::ColorType::Rgba);
-    encoder.set_depth(png::BitDepth::Eight);
-    encoder.write_header().ok()?.write_image_data(&rgba).ok()?;
-    Some(out)
-}
-
 #[cfg(windows)]
 mod imp {
-    use super::{HEADER, decode, dib_to_png, encode, names_text};
+    use super::{HEADER, decode, encode, names_text};
    use std::ffi::c_void;
    use std::path::PathBuf;
    use std::ptr;
@@ -234,59 +151,6 @@ mod imp {
        fn GetClipboardData(format: u32) -> Handle;
        fn SetClipboardData(format: u32, memory: Handle) -> Handle;
        fn IsClipboardFormatAvailable(format: u32) -> i32;
-        fn RegisterClipboardFormatW(name: *const u16) -> u32;
-    }
-
-    /// `CF_DIB`: Windows synthesizes it from `CF_BITMAP` and `CF_DIBV5`, so every
-    /// bitmap on the clipboard reads as one.
-    const CF_DIB: u32 = 8;
-
-    /// The `PNG` format browsers and the Snipping Tool add beside the bitmap; it
-    /// keeps transparency, so it is read first.
-    fn png_format() -> u32 {
-        let name: Vec<u16> = "PNG\0".encode_utf16().collect();
-        unsafe { RegisterClipboardFormatW(name.as_ptr()) }
-    }
-
-    pub fn has_image() -> bool {
-        let png = png_format();
-        (png != 0 && unsafe { IsClipboardFormatAvailable(png) } != 0)
-            || unsafe { IsClipboardFormatAvailable(CF_DIB) } != 0
-    }
-
-    /// A copy of the clipboard's `format` block. Call with the clipboard open.
-    fn read_block(format: u32) -> Option<Vec<u8>> {
-        // SAFETY: the clipboard keeps the block alive while it is open, and
-        // `GlobalSize` bounds the bytes read from it.
-        unsafe {
-            let memory = GetClipboardData(format);
-            if memory.is_null() {
-                return None;
-            }
-            let data = GlobalLock(memory);
-            if data.is_null() {
-                return None;
-            }
-            let bytes = std::slice::from_raw_parts(data as *const u8, GlobalSize(memory)).to_vec();
-            GlobalUnlock(memory);
-            Some(bytes)
-        }
-    }
-
-    pub fn png() -> Option<Vec<u8>> {
-        if !open() {
-            return None;
-        }
-        let png = png_format();
-        let image = if png != 0 && unsafe { IsClipboardFormatAvailable(png) } != 0 {
-            read_block(png)
-        } else if unsafe { IsClipboardFormatAvailable(CF_DIB) } != 0 {
-            read_block(CF_DIB).and_then(|dib| dib_to_png(&dib))
-        } else {
-            None
-        };
-        unsafe { CloseClipboard() };
-        image
    }

    #[link(name = "kernel32")]
@@ -301,12 +165,8 @@ mod imp {
    /// Opens the clipboard as its owner: the list is written in full, so no
    /// owning window is needed.
    fn open() -> bool {
-        open_for(ptr::null_mut())
-    }
-
-    fn open_for(owner: Handle) -> bool {
        for _ in 0..OPEN_ATTEMPTS {
-            if unsafe { OpenClipboard(owner) } != 0 {
+            if unsafe { OpenClipboard(ptr::null_mut()) } != 0 {
                return true;
            }
            std::thread::sleep(OPEN_RETRY);
@@ -370,29 +230,6 @@ mod imp {
        }
    }

-    pub fn set_text(text: &str, owner: usize) -> std::io::Result<()> {
-        let (memory, _) = global_text(text);
-        if memory.is_null() {
-            return Err(std::io::Error::last_os_error());
-        }
-        // SAFETY: ownership transfers only on success; otherwise we free the allocation.
-        unsafe {
-            if !open_for(owner as Handle) {
-                GlobalFree(memory);
-                return Err(std::io::Error::last_os_error());
-            }
-            let taken = EmptyClipboard() != 0 && !SetClipboardData(CF_UNICODETEXT, memory).is_null();
-            let error = std::io::Error::last_os_error();
-            CloseClipboard();
-            if taken {
-                Ok(())
-            } else {
-                GlobalFree(memory);
-                Err(error)
-            }
-        }
-    }
-
    pub fn set_files(paths: &[PathBuf]) -> bool {
        let bytes = encode(paths);
        if bytes.len() <= HEADER {
@@ -450,8 +287,8 @@ mod imp {
    use objc2::runtime::{AnyClass, AnyObject, ProtocolObject};
    use objc2::{ClassType, MainThreadMarker};
    use objc2_app_kit::{
-        NSBitmapImageFileType, NSBitmapImageRep, NSPasteboard, NSPasteboardReadingOptionKey, NSPasteboardTypePNG,
-        NSPasteboardTypeString, NSPasteboardTypeTIFF, NSPasteboardURLReadingFileURLsOnlyKey, NSPasteboardWriting,
+        NSPasteboard, NSPasteboardReadingOptionKey, NSPasteboardTypeString, NSPasteboardURLReadingFileURLsOnlyKey,
+        NSPasteboardWriting,
    };
    use objc2_foundation::{NSArray, NSDictionary, NSNumber, NSString, NSURL};
    use std::path::PathBuf;
@@ -503,54 +340,6 @@ mod imp {
        })
    }

-    pub fn has_image() -> bool {
-        debug_assert!(MainThreadMarker::new().is_some(), "NSPasteboard access requires the main thread");
-        autoreleasepool(|_| {
-            // SAFETY: the types are AppKit constants, valid for the process' lifetime.
-            let types = NSArray::from_slice(&[unsafe { NSPasteboardTypePNG }, unsafe { NSPasteboardTypeTIFF }]);
-            NSPasteboard::generalPasteboard().availableTypeFromArray(&types).is_some()
-        })
-    }
-
-    /// PNG as copied, else TIFF (what macOS screenshots and most apps write) converted.
-    pub fn png() -> Option<Vec<u8>> {
-        debug_assert!(MainThreadMarker::new().is_some(), "NSPasteboard access requires the main thread");
-        autoreleasepool(|_| {
-            let board = NSPasteboard::generalPasteboard();
-            // SAFETY: the types are AppKit constants, valid for the process' lifetime.
-            if let Some(png) = board.dataForType(unsafe { NSPasteboardTypePNG }) {
-                return Some(png.to_vec());
-            }
-            let tiff = board.dataForType(unsafe { NSPasteboardTypeTIFF })?;
-            let image = NSBitmapImageRep::imageRepWithData(&tiff)?;
-            // SAFETY: an empty property dictionary is valid for every file type.
-            let png =
-                unsafe { image.representationUsingType_properties(NSBitmapImageFileType::PNG, &NSDictionary::new()) }?;
-            Some(png.to_vec())
-        })
-    }
-
-    pub fn text() -> Option<String> {
-        debug_assert!(MainThreadMarker::new().is_some(), "NSPasteboard access requires the main thread");
-        autoreleasepool(|_| {
-            // SAFETY: the type is an AppKit constant, valid for the process' lifetime.
-            NSPasteboard::generalPasteboard().stringForType(unsafe { NSPasteboardTypeString }).map(|s| s.to_string())
-        })
-    }
-
-    pub fn set_text(text: &str, _owner: usize) -> std::io::Result<()> {
-        debug_assert!(MainThreadMarker::new().is_some(), "NSPasteboard access requires the main thread");
-        autoreleasepool(|_| {
-            let board = NSPasteboard::generalPasteboard();
-            board.clearContents();
-            if board.setString_forType(&NSString::from_str(text), unsafe { NSPasteboardTypeString }) {
-                Ok(())
-            } else {
-                Err(std::io::Error::other("Cannot write clipboard text"))
-            }
-        })
-    }
-
    pub fn set_files(paths: &[PathBuf]) -> bool {
        debug_assert!(MainThreadMarker::new().is_some(), "NSPasteboard access requires the main thread");
        autoreleasepool(|_| {
@@ -581,34 +370,10 @@ mod imp {
 mod imp {
    use std::path::PathBuf;

-    pub fn set_text(text: &str, _owner: usize) -> std::io::Result<()> {
-        #[cfg(target_os = "linux")]
-        {
-            gtk::Clipboard::get(&gtk::gdk::SELECTION_CLIPBOARD).set_text(text);
-            Ok(())
-        }
-        #[cfg(not(target_os = "linux"))]
-        {
-            let _ = text;
-            Err(std::io::Error::other("Clipboard text is unavailable on this platform"))
-        }
-    }
-
    pub fn has_files() -> bool {
        false
    }

-    pub fn has_image() -> bool {
-        #[cfg(target_os = "linux")]
-        {
-            gtk::Clipboard::get(&gtk::gdk::SELECTION_CLIPBOARD).wait_is_image_available()
-        }
-        #[cfg(not(target_os = "linux"))]
-        {
-            false
-        }
-    }
-
    pub fn files() -> std::io::Result<Vec<PathBuf>> {
        Ok(Vec::new())
    }
@@ -682,62 +447,4 @@ mod tests {
        bytes.extend_from_slice(b"C:\\a\\b.txt\0C:\\c\0\0");
        assert_eq!(decode(&bytes), paths(&["C:\\a\\b.txt", "C:\\c"]));
    }
-
-    /// A `BITMAPINFOHEADER` DIB of `width` × `height` (positive: bottom-up).
-    fn dib(width: i32, height: i32, bits: u16, compression: u32, rows: &[&[u8]]) -> Vec<u8> {
-        let mut out = Vec::new();
-        out.extend_from_slice(&40u32.to_le_bytes());
-        out.extend_from_slice(&width.to_le_bytes());
-        out.extend_from_slice(&height.to_le_bytes());
-        out.extend_from_slice(&1u16.to_le_bytes());
-        out.extend_from_slice(&bits.to_le_bytes());
-        out.extend_from_slice(&compression.to_le_bytes());
-        out.extend_from_slice(&[0u8; 20]);
-        if compression == super::BI_BITFIELDS {
-            for mask in [0x00ff_0000u32, 0x0000_ff00, 0x0000_00ff] {
-                out.extend_from_slice(&mask.to_le_bytes());
-            }
-        }
-        for row in rows {
-            out.extend_from_slice(row);
-        }
-        out
-    }
-
-    fn decode_png(png: &[u8]) -> (u32, u32, Vec<u8>) {
-        let mut reader = png::Decoder::new(std::io::Cursor::new(png)).read_info().unwrap();
-        let mut buf = vec![0; reader.output_buffer_size().unwrap()];
-        let info = reader.next_frame(&mut buf).unwrap();
-        buf.truncate(info.buffer_size());
-        (info.width, info.height, buf)
-    }
-
-    #[test]
-    fn a_bottom_up_24_bit_bitmap_becomes_an_upright_opaque_png() {
-        // Rows are padded to 4 bytes; the first stored row is the bottom one.
-        let bottom: &[u8] = &[255, 0, 0, 0, 255, 0, 0, 0];
-        let top: &[u8] = &[0, 0, 255, 255, 255, 255, 0, 0];
-        let png = super::dib_to_png(&dib(2, 2, 24, super::BI_RGB, &[bottom, top])).unwrap();
-        let (w, h, rgba) = decode_png(&png);
-        assert_eq!((w, h), (2, 2));
-        assert_eq!(rgba, [255, 0, 0, 255, 255, 255, 255, 255, 0, 0, 255, 255, 0, 255, 0, 255]);
-    }
-
-    #[test]
-    fn a_32_bit_bitmap_keeps_its_alpha_unless_none_was_written() {
-        let row: &[u8] = &[10, 20, 30, 0, 40, 50, 60, 0];
-        let (_, _, rgba) = decode_png(&super::dib_to_png(&dib(2, -1, 32, super::BI_BITFIELDS, &[row])).unwrap());
-        assert_eq!(rgba, [30, 20, 10, 255, 60, 50, 40, 255]);
-        let row: &[u8] = &[10, 20, 30, 128, 40, 50, 60, 0];
-        let (_, _, rgba) = decode_png(&super::dib_to_png(&dib(2, -1, 32, super::BI_RGB, &[row])).unwrap());
-        assert_eq!(rgba, [30, 20, 10, 128, 60, 50, 40, 0]);
-    }
-
-    #[test]
-    fn unsupported_or_truncated_bitmaps_are_not_images() {
-        let row: &[u8] = &[1, 2, 3, 4];
-        assert!(super::dib_to_png(&dib(4, 1, 8, super::BI_RGB, &[row])).is_none());
-        assert!(super::dib_to_png(&dib(2, 2, 24, super::BI_RGB, &[row])).is_none());
-        assert!(super::dib_to_png(&[0; 10]).is_none());
-    }
 }
@@ -22,4 +22,4 @@ tempfile.workspace = true
 libc = "0.2"

 [target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.61", features = ["Wdk_System_SystemServices", "Win32_Foundation", "Win32_Globalization", "Win32_Security", "Win32_System_Diagnostics_ToolHelp", "Win32_System_IO", "Win32_System_JobObjects", "Win32_System_Registry", "Win32_System_SystemInformation", "Win32_System_Threading"] }
+windows-sys = { version = "0.61", features = ["Win32_Globalization", "Win32_Security", "Win32_System_Registry", "Win32_Foundation", "Win32_System_Diagnostics_ToolHelp", "Win32_System_Threading"] }
@@ -67,23 +67,15 @@ pub struct EditorAppearanceSettings {
    /// Smooth caret movement curve: `snappy` | `gliding`.
    pub caret_movement_style: String,
    pub line_numbers: bool,
-    /// Gutter numbering: `absolute` | `relative` | `hybrid` (absolute on the caret line, distances elsewhere).
-    pub line_number_mode: String,
    pub method_separators: bool,
    /// Sub-options of `editor.showWhitespace`.
    pub whitespace_leading: bool,
    pub whitespace_inner: bool,
    pub whitespace_trailing: bool,
    pub indent_guides: bool,
-    /// Colour indent guides by depth (`--syn-rainbow-*`), while `indent_guides` is on.
-    pub rainbow_indent_guides: bool,
    /// 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,
 }
@@ -98,16 +90,13 @@ impl Default for EditorAppearanceSettings {
            smooth_caret_movement: false,
            caret_movement_style: "snappy".into(),
            line_numbers: true,
-            line_number_mode: "absolute".into(),
            method_separators: false,
            whitespace_leading: true,
            whitespace_inner: true,
            whitespace_trailing: true,
            indent_guides: true,
-            rainbow_indent_guides: false,
            hard_wrap_guides: true,
            intention_bulb: true,
-            render_doc_comments: false,
            distraction_free_width: 80,
        }
    }
@@ -177,16 +166,6 @@ impl Default for CompletionSettings {
 pub struct AutoImportSettings {
    pub add_unambiguous: bool,
    pub optimize_on_the_fly: bool,
-    pub imports_on_paste: ImportsOnPaste,
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub enum ImportsOnPaste {
-    #[default]
-    Ask,
-    Always,
-    Never,
 }

 /// Editor › General › Code Folding.
@@ -270,11 +249,8 @@ pub struct SmartKeysSettings {
    pub pair_quotes: bool,
    pub surround_selection: bool,
    pub tab_out_of_pair: bool,
-    /// Simultaneous `<tag></tag>` editing: renaming a tag renames its matching tag.
-    pub simultaneous_tag_editing: bool,
    /// Reformat on paste: `none` | `indentBlock` | `indentEachLine`.
    pub reformat_on_paste: String,
-    pub escape_on_paste: bool,
    pub smart_indent: bool,
    /// Enter › Insert documentation comment stub: Enter after `/**` closes the comment.
    pub insert_doc_stub: bool,
@@ -291,9 +267,7 @@ impl Default for SmartKeysSettings {
            pair_quotes: true,
            surround_selection: true,
            tab_out_of_pair: true,
-            simultaneous_tag_editing: true,
            reformat_on_paste: "indentEachLine".into(),
-            escape_on_paste: true,
            smart_indent: true,
            insert_doc_stub: true,
            backspace_unindent: "autoindent".into(),
@@ -344,23 +318,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 {
@@ -372,9 +329,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,
        }
    }
 }
@@ -510,24 +464,3 @@ impl Default for EncodingSettings {
        }
    }
 }
-
-#[cfg(test)]
-mod auto_import_tests {
-    use super::{AutoImportSettings, ImportsOnPaste};
-
-    #[test]
-    fn imports_on_paste_defaults_to_ask_for_existing_settings() {
-        let settings: AutoImportSettings = serde_json::from_str(r#"{"addUnambiguous":true}"#).unwrap();
-        assert!(settings.add_unambiguous);
-        assert_eq!(settings.imports_on_paste, ImportsOnPaste::Ask);
-    }
-
-    #[test]
-    fn imports_on_paste_modes_round_trip() {
-        for mode in ["ask", "always", "never"] {
-            let json = serde_json::json!({ "importsOnPaste": mode });
-            let settings: AutoImportSettings = serde_json::from_value(json).unwrap();
-            assert_eq!(serde_json::to_value(settings).unwrap()["importsOnPaste"], mode);
-        }
-    }
-}
@@ -8,36 +8,13 @@
 use crate::{DebugSessionId, Diagnostic, DocId, RunId, ServerId, TaskId, TerminalId, TextChange};
 use serde::{Deserialize, Serialize};
 use specta::Type;
-use std::collections::BTreeMap;
 use std::sync::Arc;

-/// What a built-in MCP tool asks the project window for. `AgentRun` runs `command` (a shell
-/// line) in the Run tool window's agent tab `name`, on pipes, answered once the process
-/// started or failed to.
-#[derive(Clone, Debug, Serialize, Deserialize, Type)]
-#[serde(tag = "type", rename_all = "camelCase", rename_all_fields = "camelCase")]
-pub enum McpUiRequest {
-    Confirm { client: String, tool: String, subject: String, project: String, detail: Option<String> },
-    OpenFile { path: crate::IpcPath, line: Option<u32>, column: Option<u32> },
-    AgentRun { name: String, command: String, cwd: crate::IpcPath, env: BTreeMap<String, String> },
-}
-
 #[derive(Clone, Debug, Serialize, Deserialize, Type)]
 #[serde(tag = "type", rename_all = "camelCase", rename_all_fields = "camelCase")]
 pub enum IdeEvent {
-    /// Project data source settings changed; reload the Database tree.
-    DbSourcesChanged,
-    McpRequest {
-        id: u32,
-        request: McpUiRequest,
-    },
-    McpRequestClosed {
-        id: u32,
-    },
    /// Project window membership or selection changed.
    WindowGroupsChanged,
-    /// A window entered or left full screen, itself or as a member of a full-screen window group.
-    WindowFullscreenChanged,
    ProjectTrustChanged {
        root: crate::IpcPath,
        trusted: bool,
@@ -47,10 +24,6 @@ pub enum IdeEvent {
        created: Vec<crate::IpcPath>,
        modified: Vec<crate::IpcPath>,
        removed: Vec<crate::IpcPath>,
-        /// Subtrees whose ignore rules changed, after the matchers were rebuilt.
-        #[serde(default)]
-        #[specta(optional)]
-        ignore_rules: Vec<crate::IpcPath>,
    },
    /// Excluded or ignored folders whose contents changed; they stay out of `FsChanged`.
    ExcludedDirsChanged {
@@ -77,9 +50,6 @@ pub enum IdeEvent {
    WorkspaceEditApplied {
        id: u32,
        paths: Vec<crate::IpcPath>,
-        /// Made by an agent through the MCP server's tools: undoable like a refactoring, but
-        /// not announced as one.
-        by_agent: bool,
    },
    /// An open document's language changed (Settings › File Types, Override File
    /// Type), or its UI mode (a framework's root marker appeared or went).
@@ -118,10 +88,6 @@ pub enum IdeEvent {
    LanguageServer {
        server: ServerId,
        name: String,
-        /// What the user sees as the server when another program serves in its place.
-        #[serde(default)]
-        #[specta(optional)]
-        label: Option<String>,
        status: ServerStatus,
        message: Option<String>,
    },
@@ -164,12 +130,6 @@ pub enum IdeEvent {
    SettingsChanged {
        key: String,
    },
-    UpdateStatusChanged {
-        status: crate::updates::UpdateStatus,
-    },
-    UpdateAvailable {
-        update: crate::updates::UpdateInfo,
-    },
    /// The project's source / test / resource / excluded roots changed (build files
    /// changed or folders were marked); the UI re-reads them with `project_roots`.
    ProjectRootsChanged {
@@ -285,82 +245,6 @@ pub enum DebugEvent {
        change_type: String,
        message: String,
    },
-    /// 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,
-    },
-    /// A step in the life of one request of a debugged page.
-    JsNetwork {
-        event: JsNetworkEvent,
-    },
-    /// The adapter does not report the requests of this page: there will be no `JsNetwork`.
-    JsNetworkUnavailable,
-}
-
-/// Which step of a request a [`JsNetworkEvent`] reports.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub enum JsNetworkKind {
-    Request,
-    Response,
-    Finished,
-    Failed,
-}
-
-/// The script frame that made a request, where the browser ran it (0-based line and column).
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct JsInitiator {
-    pub function: String,
-    pub url: String,
-    pub line: u32,
-    pub column: u32,
-}
-
-/// What a debugged page's browser reports about a request, reduced to what the Network view
-/// shows. Events of one request share `request_id`; each kind fills its own fields.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct JsNetworkEvent {
-    pub kind: JsNetworkKind,
-    pub request_id: String,
-    /// The browser's monotonic clock, comparable between the events of a page.
-    pub timestamp_ms: u64,
-    /// Request and response.
-    pub url: Option<String>,
-    pub method: Option<String>,
-    /// `Fetch`, `XHR`, `Script`, `Document`, …
-    pub resource_type: Option<String>,
-    pub status: Option<u16>,
-    pub mime_type: Option<String>,
-    /// The request's headers, or the response's.
-    pub headers: BTreeMap<String, String>,
-    /// Bytes received over the network, once finished.
-    pub encoded_length: Option<u64>,
-    pub error_text: Option<String>,
-    pub initiator: Option<JsInitiator>,
-}
-
-/// The backend that reads a debugged JVM's objects (instances, fields, referrers).
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(tag = "kind", rename_all = "camelCase", rename_all_fields = "camelCase")]
-pub enum JvmBackendState {
-    Ready,
-    /// Turned off for the rest of the session: the debug adapter lacks what it needs.
-    Unsupported {
-        detail: String,
-    },
-    /// The Kotlin JDWP link only forwards now; inspecting stops.
-    Degraded {
-        detail: String,
-    },
-    Closed,
 }

 /// Where backend crates publish [`IdeEvent`]s. Cheap to clone via `Arc`.
@@ -382,27 +266,3 @@ pub struct NullSink;
 impl EventSink for NullSink {
    fn emit(&self, _: IdeEvent) {}
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-
-    #[test]
-    fn jvm_backend_events_json_shape() {
-        let degraded = DebugEvent::JvmBackend { state: JvmBackendState::Degraded { detail: "x".into() } };
-        assert_eq!(
-            serde_json::to_value(&degraded).unwrap(),
-            json!({"kind": "jvmBackend", "state": {"kind": "degraded", "detail": "x"}})
-        );
-        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"]})
-        );
-    }
-}
@@ -1,124 +0,0 @@
-//! Go workspace module paths shared by project builds and run detection.
-use std::path::PathBuf;
-
-/// Module directories from a go.work file. Quoted paths and comments follow Go's file syntax.
-pub fn work_modules(text: &str) -> Vec<PathBuf> {
-    let mut tokens = Vec::new();
-    let mut chars = text.chars().peekable();
-    while let Some(ch) = chars.next() {
-        match ch {
-            '\n' | '(' | ')' => tokens.push(ch.to_string()),
-            ch if ch.is_whitespace() => {}
-            '/' if chars.peek() == Some(&'/') => {
-                for c in chars.by_ref() {
-                    if c == '\n' {
-                        tokens.push("\n".into());
-                        break;
-                    }
-                }
-            }
-            '"' | '`' => {
-                let Some(token) = quoted_work_path(&mut chars, ch) else { return Vec::new() };
-                tokens.push(token);
-            }
-            _ => {
-                let mut token = ch.to_string();
-                while chars.peek().is_some_and(|c| !c.is_whitespace() && *c != '(' && *c != ')') {
-                    token.push(chars.next().unwrap());
-                }
-                tokens.push(token);
-            }
-        }
-    }
-    let mut out = Vec::new();
-    let mut start = true;
-    let mut tokens = tokens.into_iter();
-    while let Some(token) = tokens.next() {
-        if token == "\n" {
-            start = true;
-            continue;
-        }
-        if start
-            && token == "use"
-            && let Some(path) = tokens.next()
-        {
-            if path == "(" {
-                let mut paths = Vec::new();
-                let mut closed = false;
-                for path in tokens.by_ref() {
-                    if path == ")" {
-                        closed = true;
-                        break;
-                    }
-                    if path != "\n" && !path.is_empty() {
-                        paths.push(PathBuf::from(path));
-                    }
-                }
-                if closed {
-                    out.extend(paths);
-                }
-            } else if path != "\n" && !path.is_empty() {
-                out.push(PathBuf::from(path));
-            }
-        }
-        start = false;
-    }
-    let mut seen = std::collections::HashSet::new();
-    out.retain(|path| seen.insert(path.clone()));
-    out
-}
-
-fn quoted_work_path(chars: &mut std::iter::Peekable<std::str::Chars<'_>>, quote: char) -> Option<String> {
-    let mut bytes = Vec::new();
-    while let Some(ch) = chars.next() {
-        if ch == quote {
-            return String::from_utf8(bytes).ok();
-        }
-        if ch == '\\' && quote == '"' {
-            let escaped = chars.next()?;
-            let byte = match escaped {
-                'a' => 7,
-                'b' => 8,
-                'f' => 12,
-                'n' => 10,
-                'r' => 13,
-                't' => 9,
-                'v' => 11,
-                '\\' => b'\\',
-                '"' => b'"',
-                'x' => {
-                    let digits: String = chars.by_ref().take(2).collect();
-                    if digits.len() != 2 {
-                        return None;
-                    }
-                    u8::from_str_radix(&digits, 16).ok()?
-                }
-                'u' | 'U' => {
-                    let width = if escaped == 'u' { 4 } else { 8 };
-                    let digits: String = chars.by_ref().take(width).collect();
-                    if digits.len() != width {
-                        return None;
-                    }
-                    let ch = char::from_u32(u32::from_str_radix(&digits, 16).ok()?)?;
-                    bytes.extend_from_slice(ch.to_string().as_bytes());
-                    continue;
-                }
-                '0'..='7' => {
-                    let digits = format!("{escaped}{}", chars.by_ref().take(2).collect::<String>());
-                    if digits.len() != 3 {
-                        return None;
-                    }
-                    u8::from_str_radix(&digits, 8).ok()?
-                }
-                _ => return None,
-            };
-            bytes.push(byte);
-        } else {
-            if ch == '\n' && quote == '"' {
-                return None;
-            }
-            bytes.extend_from_slice(ch.to_string().as_bytes());
-        }
-    }
-    None
-}
@@ -1,403 +0,0 @@
-//! Bounded, ordered process input. Only the worker touches the OS writer.
-
-use std::collections::VecDeque;
-use std::io::{self, Write};
-use std::sync::{Arc, Condvar, Mutex};
-use std::thread::JoinHandle;
-#[cfg(any(not(unix), test))]
-use std::time::Duration;
-
-const MAX_BYTES: usize = 4 * 1024 * 1024;
-const MAX_WRITES: usize = 1024;
-#[cfg(any(not(unix), test))]
-const RETRY: Duration = Duration::from_millis(4);
-
-#[derive(Default)]
-struct State {
-    queue: VecDeque<Vec<u8>>,
-    bytes: usize,
-    finished: bool,
-    aborted: bool,
-    error: Option<String>,
-}
-
-/// One worker per pipe/PTY. The byte budget includes the in-flight write.
-/// Rejected writes enqueue nothing. Dropping this handle discards pending input
-/// without joining the worker; `finish` instead drains accepted input before EOF.
-pub struct InputWriter {
-    shared: Arc<(Mutex<State>, Condvar)>,
-    worker: Option<JoinHandle<()>>,
-}
-
-impl InputWriter {
-    /// On Unix, pass the readiness hook returned by `nonblocking` for this writer.
-    pub fn new(
-        name: String,
-        mut writer: Box<dyn Write + Send>,
-        #[cfg(unix)] mut wait_writable: impl FnMut() -> io::Result<()> + Send + 'static,
-        on_error: impl FnOnce(io::Error) + Send + 'static,
-    ) -> io::Result<Self> {
-        let shared = Arc::new((Mutex::new(State::default()), Condvar::new()));
-        let worker_shared = shared.clone();
-        let worker = std::thread::Builder::new().name(name).spawn(move || {
-            let (lock, wake) = &*worker_shared;
-            let result = (|| {
-                loop {
-                    let data = {
-                        let mut state = lock.lock().unwrap();
-                        while state.queue.is_empty() && !state.finished && !state.aborted {
-                            state = wake.wait(state).unwrap();
-                        }
-                        if state.aborted {
-                            return Ok(());
-                        }
-                        let Some(data) = state.queue.pop_front() else { return Ok(()) };
-                        data
-                    };
-                    let mut offset = 0;
-                    loop {
-                        if lock.lock().unwrap().aborted {
-                            return Ok(());
-                        }
-                        let flushing = offset == data.len();
-                        let result = if !flushing {
-                            writer.write(&data[offset..]).and_then(|n| {
-                                if n == 0 {
-                                    Err(io::ErrorKind::WriteZero.into())
-                                } else {
-                                    offset += n;
-                                    Ok(())
-                                }
-                            })
-                        } else {
-                            writer.flush()
-                        };
-                        match result {
-                            Ok(()) if flushing => break,
-                            Ok(()) => {}
-                            Err(e) if e.kind() == io::ErrorKind::Interrupted => continue,
-                            Err(e) if e.kind() == io::ErrorKind::WouldBlock => {
-                                #[cfg(unix)]
-                                match wait_writable() {
-                                    Err(e) if e.kind() == io::ErrorKind::Interrupted => {}
-                                    result => result?,
-                                }
-                                #[cfg(not(unix))]
-                                {
-                                    let state = lock.lock().unwrap();
-                                    if state.aborted {
-                                        return Ok(());
-                                    }
-                                    drop(wake.wait_timeout(state, RETRY).unwrap());
-                                }
-                            }
-                            Err(e) => return Err(e),
-                        }
-                    }
-                    let len = data.len();
-                    drop(data);
-                    let mut state = lock.lock().unwrap();
-                    state.bytes = state.bytes.saturating_sub(len);
-                }
-            })();
-            if let Err(e) = result {
-                let mut state = lock.lock().unwrap();
-                if state.aborted {
-                    return;
-                }
-                state.error = Some(e.to_string());
-                state.queue.clear();
-                state.bytes = 0;
-                drop(state);
-                on_error(e);
-            }
-        })?;
-        Ok(Self { shared, worker: Some(worker) })
-    }
-
-    pub fn write(&self, data: &[u8]) -> io::Result<()> {
-        let (lock, wake) = &*self.shared;
-        let mut state = lock.lock().unwrap();
-        if let Some(error) = &state.error {
-            return Err(io::Error::new(io::ErrorKind::BrokenPipe, error.clone()));
-        }
-        if state.finished || state.aborted {
-            return Err(io::Error::new(io::ErrorKind::BrokenPipe, "stdin is closed"));
-        }
-        if data.is_empty() {
-            return Ok(());
-        }
-        if data.len() > MAX_BYTES.saturating_sub(state.bytes) || state.queue.len() >= MAX_WRITES {
-            return Err(io::Error::new(
-                io::ErrorKind::WouldBlock,
-                "Input queue is full (4 MiB or 1024 writes); input was not sent.",
-            ));
-        }
-        state.bytes += data.len();
-        state.queue.push_back(data.to_vec());
-        wake.notify_one();
-        Ok(())
-    }
-
-    /// Send EOF after the accepted writes, without waiting for the child to read.
-    pub fn finish(&self) {
-        let (lock, wake) = &*self.shared;
-        lock.lock().unwrap().finished = true;
-        wake.notify_one();
-    }
-
-    pub fn close(&self) {
-        let (lock, wake) = &*self.shared;
-        let mut state = lock.lock().unwrap();
-        state.aborted = true;
-        state.queue.clear();
-        wake.notify_one();
-    }
-}
-
-impl Drop for InputWriter {
-    fn drop(&mut self) {
-        self.close();
-        let Some(worker) = self.worker.take() else { return };
-        #[cfg(windows)]
-        {
-            use std::os::windows::io::AsRawHandle;
-            // A cancellation can race with entry into WriteFile, so retry off
-            // the caller's thread until the worker observes the closed queue.
-            let _ = std::thread::Builder::new().name("openidea-input-cancel".into()).spawn(move || {
-                while !worker.is_finished() {
-                    unsafe {
-                        windows_sys::Win32::System::IO::CancelSynchronousIo(worker.as_raw_handle());
-                    }
-                    std::thread::sleep(RETRY);
-                }
-                let _ = worker.join();
-            });
-        }
-        #[cfg(not(windows))]
-        drop(worker);
-    }
-}
-
-/// Make a writer nonblocking and return its readiness hook. PTY clones share file
-/// status flags, so readers must also handle WouldBlock.
-#[cfg(unix)]
-pub fn nonblocking(fd: std::os::fd::RawFd) -> io::Result<impl FnMut() -> io::Result<()> + Send> {
-    let wait = readiness(fd, libc::POLLOUT)?;
-    let flags = unsafe { libc::fcntl(fd, libc::F_GETFL) };
-    if flags == -1 || unsafe { libc::fcntl(fd, libc::F_SETFL, flags | libc::O_NONBLOCK) } == -1 {
-        return Err(io::Error::last_os_error());
-    }
-    Ok(wait)
-}
-
-/// Wait for output from a nonblocking PTY without delaying the child's next read.
-#[cfg(unix)]
-pub fn readable(fd: std::os::fd::RawFd) -> io::Result<impl FnMut() -> io::Result<()> + Send> {
-    readiness(fd, libc::POLLIN)
-}
-
-#[cfg(unix)]
-fn readiness(fd: std::os::fd::RawFd, events: libc::c_short) -> io::Result<impl FnMut() -> io::Result<()> + Send> {
-    use std::os::fd::{AsRawFd, FromRawFd, OwnedFd};
-
-    // Own a duplicate so the hook remains valid if the caller closes its fd.
-    let duplicate = unsafe { libc::fcntl(fd, libc::F_DUPFD_CLOEXEC, 0) };
-    if duplicate == -1 {
-        return Err(io::Error::last_os_error());
-    }
-    // SAFETY: fcntl returned a new, owned descriptor.
-    let fd = unsafe { OwnedFd::from_raw_fd(duplicate) };
-    Ok(move || {
-        let mut pollfd = libc::pollfd { fd: fd.as_raw_fd(), events, revents: 0 };
-        // Readiness wakes immediately; the timeout only bounds abort latency.
-        if unsafe { libc::poll(&mut pollfd, 1, 50) } == -1 {
-            return Err(io::Error::last_os_error());
-        }
-        if pollfd.revents & libc::POLLNVAL != 0 {
-            return Err(io::Error::from_raw_os_error(libc::EBADF));
-        }
-        Ok(())
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::sync::atomic::{AtomicBool, Ordering};
-    use std::sync::mpsc;
-    #[cfg(unix)]
-    use std::time::Instant;
-
-    struct SlowWriter {
-        ready: Arc<AtomicBool>,
-        output: Arc<Mutex<Vec<u8>>>,
-        dropped: mpsc::Sender<()>,
-    }
-
-    impl Write for SlowWriter {
-        fn write(&mut self, bytes: &[u8]) -> io::Result<usize> {
-            if !self.ready.load(Ordering::Acquire) {
-                return Err(io::ErrorKind::WouldBlock.into());
-            }
-            let n = bytes.len().min(7);
-            self.output.lock().unwrap().extend_from_slice(&bytes[..n]);
-            Ok(n)
-        }
-
-        fn flush(&mut self) -> io::Result<()> {
-            Ok(())
-        }
-    }
-
-    impl Drop for SlowWriter {
-        fn drop(&mut self) {
-            let _ = self.dropped.send(());
-        }
-    }
-
-    #[test]
-    fn bounds_include_inflight_bytes_and_reject_whole_writes() {
-        let ready = Arc::new(AtomicBool::new(false));
-        let output = Arc::new(Mutex::new(Vec::new()));
-        let (tx, rx) = mpsc::channel();
-        let writer = InputWriter::new(
-            "test-input".into(),
-            Box::new(SlowWriter { ready: ready.clone(), output: output.clone(), dropped: tx }),
-            #[cfg(unix)]
-            || {
-                std::thread::sleep(RETRY);
-                Ok(())
-            },
-            |e| panic!("{e}"),
-        )
-        .unwrap();
-        let bytes = vec![b'x'; MAX_BYTES];
-        writer.write(&bytes).unwrap();
-        std::thread::sleep(RETRY * 2);
-        assert_eq!(writer.write(b"rejected").unwrap_err().kind(), io::ErrorKind::WouldBlock);
-        writer.close();
-        rx.recv_timeout(Duration::from_secs(1)).expect("worker stops while peer still refuses input");
-        assert!(output.lock().unwrap().is_empty());
-        assert!(writer.write(b"closed").is_err());
-        assert!(writer.shared.0.lock().unwrap().queue.is_empty());
-    }
-
-    #[test]
-    fn partial_writes_preserve_order_and_finish_drains_before_eof() {
-        let ready = Arc::new(AtomicBool::new(false));
-        let output = Arc::new(Mutex::new(Vec::new()));
-        let (tx, rx) = mpsc::channel();
-        let writer = InputWriter::new(
-            "test-input".into(),
-            Box::new(SlowWriter { ready: ready.clone(), output: output.clone(), dropped: tx }),
-            #[cfg(unix)]
-            || {
-                std::thread::sleep(RETRY);
-                Ok(())
-            },
-            |e| panic!("{e}"),
-        )
-        .unwrap();
-        let paste = "abé".repeat(1024);
-        writer.write(paste.as_bytes()).unwrap();
-        writer.write(b"tail").unwrap();
-        writer.finish();
-        assert!(writer.write(b"after EOF").is_err());
-        ready.store(true, Ordering::Release);
-        rx.recv_timeout(Duration::from_secs(1)).unwrap();
-        assert_eq!(*output.lock().unwrap(), format!("{paste}tail").as_bytes());
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn readiness_errors_are_reported_and_reject_following_writes() {
-        let (dropped, _rx) = mpsc::channel();
-        let (errors, error) = mpsc::channel();
-        let writer = InputWriter::new(
-            "test-error-input".into(),
-            Box::new(SlowWriter { ready: Arc::new(AtomicBool::new(false)), output: Arc::default(), dropped }),
-            || Err(io::Error::from_raw_os_error(libc::EBADF)),
-            move |e| errors.send(e.raw_os_error()).unwrap(),
-        )
-        .unwrap();
-        writer.write(b"input").unwrap();
-        assert_eq!(error.recv_timeout(Duration::from_secs(1)).unwrap(), Some(libc::EBADF));
-        assert_eq!(writer.write(b"later").unwrap_err().kind(), io::ErrorKind::BrokenPipe);
-        let state = writer.shared.0.lock().unwrap();
-        assert!(state.queue.is_empty());
-        assert_eq!(state.bytes, 0);
-    }
-
-    #[test]
-    fn tiny_writes_are_also_bounded() {
-        let shared = Arc::new((Mutex::new(State::default()), Condvar::new()));
-        let writer = InputWriter { shared, worker: None };
-        for _ in 0..MAX_WRITES {
-            writer.write(b"x").unwrap();
-        }
-        assert_eq!(writer.write(b"x").unwrap_err().kind(), io::ErrorKind::WouldBlock);
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn writable_input_resumes_without_timer_delays() {
-        use std::io::Read;
-        use std::os::fd::AsRawFd;
-        use std::os::unix::net::UnixStream;
-
-        let (pipe, mut peer) = UnixStream::pair().unwrap();
-        let capacity: libc::c_int = 1024;
-        // Keep the OS buffer small enough that a timer per buffer takes seconds.
-        assert_eq!(
-            unsafe {
-                libc::setsockopt(
-                    pipe.as_raw_fd(),
-                    libc::SOL_SOCKET,
-                    libc::SO_SNDBUF,
-                    (&capacity as *const libc::c_int).cast(),
-                    std::mem::size_of_val(&capacity) as libc::socklen_t,
-                )
-            },
-            0
-        );
-        peer.set_read_timeout(Some(Duration::from_secs(3))).unwrap();
-        let wait_writable = nonblocking(pipe.as_raw_fd()).unwrap();
-        let writer =
-            InputWriter::new("test-ready-input".into(), Box::new(pipe), wait_writable, |e| panic!("{e}")).unwrap();
-        let bytes = vec![b'x'; MAX_BYTES];
-        writer.write(&bytes).unwrap();
-        writer.finish();
-        // Start with a full buffer, then make the fd writable from another thread.
-        std::thread::sleep(Duration::from_millis(50));
-        let (tx, rx) = mpsc::channel();
-        let started = Instant::now();
-        let reader = std::thread::spawn(move || {
-            let mut output = Vec::new();
-            peer.read_to_end(&mut output).unwrap();
-            tx.send(output).unwrap();
-        });
-        let output = rx.recv_timeout(Duration::from_secs(1)).expect("input resumes as soon as the fd is writable");
-        assert_eq!(output, bytes);
-        reader.join().unwrap();
-        eprintln!("4 MiB input drained in {:?}", started.elapsed());
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn close_interrupts_a_full_os_pipe_while_the_peer_stays_open() {
-        use std::os::fd::AsRawFd;
-        use std::os::unix::net::UnixStream;
-        let (pipe, _peer) = UnixStream::pair().unwrap();
-        let wait_writable = nonblocking(pipe.as_raw_fd()).unwrap();
-        let mut writer =
-            InputWriter::new("test-pipe-input".into(), Box::new(pipe), wait_writable, |e| panic!("{e}")).unwrap();
-        writer.write(&vec![b'x'; MAX_BYTES]).unwrap();
-        std::thread::sleep(Duration::from_millis(50));
-        assert!(!writer.worker.as_ref().unwrap().is_finished());
-        let started = Instant::now();
-        writer.close();
-        writer.worker.take().unwrap().join().unwrap();
-        assert!(started.elapsed() < Duration::from_millis(250));
-    }
-}
@@ -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");
    }
 }
@@ -1,10 +1,8 @@
 //! JSON with comments (`devcontainer.json`, `deno.jsonc`, `tsconfig.json`): turned
 //! into plain JSON for `serde_json`.

-/// Strips `//` and `/* */` comments, trailing commas and a leading byte order mark (Visual
-/// Studio writes one into `launchSettings.json`) so JSONC parses as JSON.
+/// Strips `//` and `/* */` comments and trailing commas so JSONC parses as JSON.
 pub fn strip(src: &str) -> String {
-    let src = src.strip_prefix('\u{feff}').unwrap_or(src);
    let mut out = String::with_capacity(src.len());
    let mut chars = src.chars().peekable();
    let mut in_str = false;
@@ -89,10 +87,4 @@ mod tests {
        assert_eq!(v["url"], "https://x.dev//y /* no */");
        assert_eq!(v["q"], "say \"hi\",");
    }
-
-    #[test]
-    fn drops_a_byte_order_mark() {
-        let v: serde_json::Value = serde_json::from_str(&strip("\u{feff}{ \"a\": 1 }")).unwrap();
-        assert_eq!(v["a"], 1);
-    }
 }
@@ -7,27 +7,22 @@
 pub mod editor_settings;
 pub mod error;
 pub mod event;
-pub mod go;
 pub mod ids;
 pub mod ignored;
-pub mod input;
 pub mod inspection_settings;
 pub mod ipc_path;
 pub mod java_runtime;
 pub mod jsonc;
 pub mod output_encoding;
-pub mod platform;
 pub mod process;
 pub mod project_dir;
 pub mod project_roots;
 pub mod proxy_settings;
-pub mod real_path;
 pub mod remote_settings;
 pub mod settings;
 pub mod task;
 pub mod text;
 pub mod tool_path;
-pub mod updates;
 pub mod version_managers;
 pub mod workflow_settings;
 pub mod wsl;
@@ -21,32 +21,6 @@

 use std::collections::BTreeMap;

-/// Removes ANSI escape sequences (colour, cursor movement).
-pub fn strip_ansi(s: &str) -> String {
-    if !s.contains('\u{1b}') {
-        return s.to_owned();
-    }
-    let mut out = String::with_capacity(s.len());
-    let mut chars = s.chars().peekable();
-    while let Some(c) = chars.next() {
-        if c != '\u{1b}' {
-            out.push(c);
-            continue;
-        }
-        if chars.peek() == Some(&'[') {
-            chars.next();
-            for c in chars.by_ref() {
-                if c.is_ascii_alphabetic() || c == '~' {
-                    break;
-                }
-            }
-        } else {
-            chars.next();
-        }
-    }
-    out
-}
-
 /// Decodes complete lines or collected output from IDE-managed tools, preferring UTF-8.
 /// Windows launcher/native diagnostics fall back to the system ANSI code page.
 /// Callers must buffer incomplete lines so multibyte characters are never split.
@@ -76,8 +50,7 @@ fn decode_tool_output_with_code_page(bytes: &[u8], code_page: u32) -> String {
    text
 }

-/// The `encoding_rs` encoding of a Windows code page, when it has one.
-pub fn encoding_for_code_page(cp: u32) -> Option<&'static encoding_rs::Encoding> {
+fn encoding_for_code_page(cp: u32) -> Option<&'static encoding_rs::Encoding> {
    Some(match cp {
        65001 => encoding_rs::UTF_8,
        936 => encoding_rs::GBK,
@@ -102,56 +75,6 @@ pub fn encoding_for_code_page(cp: u32) -> Option<&'static encoding_rs::Encoding>
    })
 }

-/// The code page Windows console programs write to a pipe in: the OEM code page (GBK on a
-/// Chinese system, Shift_JIS on a Japanese one, EUC-KR on a Korean one, 437 / 850 / 866…
-/// elsewhere). `None` when it is UTF-8 (Windows' "Use Unicode UTF-8" option) or off Windows.
-pub fn console_code_page() -> Option<u32> {
-    #[cfg(windows)]
-    {
-        // SAFETY: GetOEMCP is an argument-less query with no preconditions.
-        let cp = unsafe { windows_sys::Win32::Globalization::GetOEMCP() };
-        (cp != 65001).then_some(cp)
-    }
-    #[cfg(not(windows))]
-    {
-        None
-    }
-}
-
-/// Whether every character of code page `cp` is one byte, so text in it can be decoded
-/// piece by piece.
-#[cfg(windows)]
-pub fn is_single_byte_code_page(cp: u32) -> bool {
-    use windows_sys::Win32::Globalization::{CPINFO, GetCPInfo};
-    // SAFETY: CPINFO is plain data, which GetCPInfo fills in.
-    unsafe {
-        let mut info: CPINFO = std::mem::zeroed();
-        GetCPInfo(cp, &mut info) != 0 && info.MaxCharSize == 1
-    }
-}
-
-/// `bytes` in code page `cp`, decoded by Windows (for the code pages `encoding_rs` lacks,
-/// like the OEM pages 437, 850 or 852).
-#[cfg(windows)]
-pub fn decode_code_page(bytes: &[u8], cp: u32) -> String {
-    use windows_sys::Win32::Globalization::MultiByteToWideChar;
-    let Ok(len) = i32::try_from(bytes.len()) else {
-        return String::from_utf8_lossy(bytes).into_owned();
-    };
-    if len == 0 {
-        return String::new();
-    }
-    // SAFETY: `bytes` holds `len` bytes; no output buffer asks for the length needed.
-    let needed = unsafe { MultiByteToWideChar(cp, 0, bytes.as_ptr(), len, std::ptr::null_mut(), 0) };
-    if needed <= 0 {
-        return String::from_utf8_lossy(bytes).into_owned();
-    }
-    let mut wide = vec![0u16; needed as usize];
-    // SAFETY: `wide` holds `needed` units.
-    let written = unsafe { MultiByteToWideChar(cp, 0, bytes.as_ptr(), len, wide.as_mut_ptr(), needed) };
-    String::from_utf16_lossy(&wide[..written.max(0) as usize])
-}
-
 const STD_PROPERTIES: &[&str] = &["stdout.encoding", "stderr.encoding", "sun.stdout.encoding", "sun.stderr.encoding"];
 const FILE_ENCODING: &str = "file.encoding";
 const TOOL_OPTIONS: &str = "JAVA_TOOL_OPTIONS";
@@ -1,29 +0,0 @@
-/// The Windows OS build used by ConPTY; unavailable on other platforms or on query failure.
-#[cfg(windows)]
-pub fn windows_build_number() -> Option<u32> {
-    use windows_sys::Wdk::System::SystemServices::RtlGetVersion;
-    use windows_sys::Win32::System::SystemInformation::OSVERSIONINFOW;
-
-    let mut info =
-        OSVERSIONINFOW { dwOSVersionInfoSize: std::mem::size_of::<OSVERSIONINFOW>() as u32, ..Default::default() };
-    // SAFETY: `info` is initialized and declares the size of the writable structure.
-    let status = unsafe { RtlGetVersion(&mut info) };
-    (status >= 0 && info.dwBuildNumber > 0).then_some(info.dwBuildNumber)
-}
-
-#[cfg(not(windows))]
-pub fn windows_build_number() -> Option<u32> {
-    None
-}
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn windows_build_is_platform_specific() {
-        let build = super::windows_build_number();
-        #[cfg(windows)]
-        assert!(build.is_some_and(|build| build > 0));
-        #[cfg(not(windows))]
-        assert_eq!(build, None);
-    }
-}
@@ -72,99 +72,6 @@ pub fn kill_tree_of(pid: u32) {
    let _ = pid;
 }

-/// Whether a process with this id exists. PID reuse makes this conservative: a reused id keeps
-/// whatever was tied to the old process alive, a live process is never reported dead.
-pub fn process_alive(pid: u32) -> bool {
-    // `kill(0, 0)` would signal the caller's own process group.
-    if pid == 0 {
-        return false;
-    }
-    #[cfg(unix)]
-    {
-        // Above `i32::MAX` the id would wrap to a negative value, which `kill` reads as a group.
-        let Ok(pid) = libc::pid_t::try_from(pid) else { return false };
-        // SAFETY: signal 0 delivers nothing; it only checks that the process exists and is reachable.
-        unsafe { libc::kill(pid, 0) == 0 || std::io::Error::last_os_error().raw_os_error() == Some(libc::EPERM) }
-    }
-    #[cfg(windows)]
-    {
-        use std::os::windows::io::{AsRawHandle, FromRawHandle, OwnedHandle};
-        use windows_sys::Win32::Foundation::{ERROR_ACCESS_DENIED, GetLastError, STILL_ACTIVE};
-        use windows_sys::Win32::System::Threading::{
-            GetExitCodeProcess, OpenProcess, PROCESS_QUERY_LIMITED_INFORMATION,
-        };
-
-        // SAFETY: plain call; a non-null result is a process handle owned by this function.
-        let handle = unsafe { OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, 0, pid) };
-        if handle.is_null() {
-            // A process we may not open still exists.
-            // SAFETY: reads the thread's last error, set by the call above.
-            return unsafe { GetLastError() } == ERROR_ACCESS_DENIED;
-        }
-        // SAFETY: `handle` is valid and nobody else owns it.
-        let handle = unsafe { OwnedHandle::from_raw_handle(handle) };
-        let mut code = 0u32;
-        // SAFETY: a live process handle opened with query access; one out-parameter.
-        let ok = unsafe { GetExitCodeProcess(handle.as_raw_handle(), &mut code) };
-        // A handle that cannot be queried is not evidence that the process is gone.
-        ok == 0 || code == STILL_ACTIVE as u32
-    }
-    #[cfg(not(any(unix, windows)))]
-    {
-        true
-    }
-}
-
-/// The program and everything it started: an adapter may report the launcher shell, whose
-/// child is the debugged program, so stopping only the reported pid leaves the program alive.
-#[cfg(unix)]
-pub fn process_tree(pid: i32) -> Vec<i32> {
-    use std::collections::HashMap;
-    let Ok(out) = std::process::Command::new("ps").args(["-A", "-o", "pid=,ppid="]).output() else {
-        return vec![pid];
-    };
-    let mut children: HashMap<i32, Vec<i32>> = HashMap::new();
-    for line in String::from_utf8_lossy(&out.stdout).lines() {
-        let mut it = line.split_whitespace();
-        let (Some(p), Some(parent)) = (it.next(), it.next()) else { continue };
-        let (Ok(p), Ok(parent)) = (p.parse::<i32>(), parent.parse::<i32>()) else { continue };
-        children.entry(parent).or_default().push(p);
-    }
-    let mut tree = vec![pid];
-    let mut at = 0;
-    while at < tree.len() {
-        if let Some(kids) = children.get(&tree[at]) {
-            tree.extend(kids.iter().copied());
-        }
-        at += 1;
-    }
-    tree
-}
-
-/// Every process `pid` started, directly or not, parents before their children.
-pub fn descendants(pid: u32) -> Vec<u32> {
-    #[cfg(unix)]
-    {
-        let Ok(root) = i32::try_from(pid) else { return Vec::new() };
-        process_tree(root).into_iter().skip(1).filter_map(|p| u32::try_from(p).ok()).collect()
-    }
-    #[cfg(windows)]
-    {
-        use std::os::windows::io::AsRawHandle;
-        windows_tree::descendants(pid)
-            .iter()
-            // SAFETY: a live process handle opened with query access.
-            .map(|h| unsafe { windows_sys::Win32::System::Threading::GetProcessId(h.as_raw_handle()) })
-            .filter(|&p| p != 0)
-            .collect()
-    }
-    #[cfg(not(any(unix, windows)))]
-    {
-        let _ = pid;
-        Vec::new()
-    }
-}
-
 /// [`kill_tree`] that first asks the group to exit: `SIGTERM`, then `grace`, then `SIGKILL`.
 /// Git removes its `index.lock` on `SIGTERM`, where `SIGKILL` leaves it behind and the next
 /// git command fails. Windows has no such signal to send from outside the child's console,
@@ -197,23 +104,12 @@ fn signal_group(child: &Child, signal: libc::c_int) {
 #[cfg(windows)]
 const TREE_EXIT_WAIT: Duration = Duration::from_secs(5);

-#[cfg(windows)]
-pub use windows_job::Job;
-#[cfg(windows)]
-pub use windows_tree::ProcessTree;
-
 /// `taskkill /T /F` from `pid`, then waits (up to [`TREE_EXIT_WAIT`]) until what the child
 /// started is gone: termination is asynchronous, and until a process is gone the files it
 /// holds open can't be opened or deleted. The child itself is left to its owner to reap.
 #[cfg(windows)]
 fn taskkill_tree_of(pid: u32) {
    let started = windows_tree::descendants(pid);
-    // When the child started nothing, killing it alone is the whole job:
-    // `taskkill` would be a process spawn (measured at ~0.7 s here) for the
-    // same outcome, and the callers kill the child themselves.
-    if started.is_empty() {
-        return;
-    }
    let mut taskkill = Command::new("taskkill");
    prepare(&mut taskkill)
        .args(["/T", "/F", "/PID", &pid.to_string()])
@@ -234,48 +130,13 @@ mod windows_tree {
        CreateToolhelp32Snapshot, PROCESSENTRY32W, Process32FirstW, Process32NextW, TH32CS_SNAPPROCESS,
    };
    use windows_sys::Win32::System::Threading::{
-        GetProcessTimes, OpenProcess, PROCESS_QUERY_LIMITED_INFORMATION, PROCESS_SYNCHRONIZE, PROCESS_TERMINATE,
-        TerminateProcess, WaitForSingleObject,
+        GetProcessTimes, OpenProcess, PROCESS_QUERY_LIMITED_INFORMATION, PROCESS_SYNCHRONIZE, WaitForSingleObject,
    };

-    /// Owned handles to a program and its current descendants, retained even if its launcher exits.
-    pub struct ProcessTree {
-        processes: Vec<OwnedHandle>,
-    }
-
-    impl ProcessTree {
-        pub fn capture(pid: u32) -> Self {
-            let Some(root) = open_with(pid, PROCESS_TERMINATE) else { return Self { processes: Vec::new() } };
-            let children = descendants_with(pid, PROCESS_TERMINATE);
-            Self { processes: std::iter::once(root).chain(children).collect() }
-        }
-
-        pub fn is_running(&self) -> bool {
-            self.processes.iter().any(|process| {
-                // SAFETY: an owned process handle opened with SYNCHRONIZE access.
-                unsafe {
-                    WaitForSingleObject(process.as_raw_handle(), 0) == windows_sys::Win32::Foundation::WAIT_TIMEOUT
-                }
-            })
-        }
-
-        /// Requests termination children first; poll `is_running` until termination completes.
-        pub fn terminate(&self) {
-            for process in self.processes.iter().rev() {
-                // SAFETY: an owned process handle opened with TERMINATE access, never a reused pid.
-                unsafe { TerminateProcess(process.as_raw_handle(), 1) };
-            }
-        }
-    }
-
    /// Every process `root` started, directly or not, opened so it can be waited for. A
    /// parent's id is reused once it is gone, so a process counts only if it started after
    /// its parent.
    pub(super) fn descendants(root: u32) -> Vec<OwnedHandle> {
-        descendants_with(root, 0)
-    }
-
-    fn descendants_with(root: u32, access: u32) -> Vec<OwnedHandle> {
        let Some(root_started) = open(root).as_ref().and_then(started) else { return Vec::new() };
        let processes = processes();
        let mut seen = HashSet::from([root]);
@@ -286,7 +147,7 @@ mod windows_tree {
                if ppid != parent || !seen.insert(pid) {
                    continue;
                }
-                let Some(handle) = open_with(pid, access) else { continue };
+                let Some(handle) = open(pid) else { continue };
                if let Some(at) = started(&handle).filter(|&at| at >= parent_started) {
                    parents.push((pid, at));
                    found.push(handle);
@@ -326,12 +187,8 @@ mod windows_tree {
    }

    fn open(pid: u32) -> Option<OwnedHandle> {
-        open_with(pid, 0)
-    }
-
-    fn open_with(pid: u32, access: u32) -> Option<OwnedHandle> {
        // SAFETY: plain call; a non-null result is a process handle owned by the caller.
-        let handle = unsafe { OpenProcess(PROCESS_SYNCHRONIZE | PROCESS_QUERY_LIMITED_INFORMATION | access, 0, pid) };
+        let handle = unsafe { OpenProcess(PROCESS_SYNCHRONIZE | PROCESS_QUERY_LIMITED_INFORMATION, 0, pid) };
        // SAFETY: as above.
        (!handle.is_null()).then(|| unsafe { OwnedHandle::from_raw_handle(handle) })
    }
@@ -346,167 +203,6 @@ mod windows_tree {
    }
 }

-/// A kernel job object over one launched process tree. Everything a launch starts joins
-/// the job by inheritance, so [`Job::terminate`] ends the whole tree — also processes
-/// started after the launch's snapshot was taken, orphans of a launcher that already
-/// exited (where a `taskkill /T /F` from the tracked pid no longer finds them), and
-/// processes born in the window a process-enumeration kill would miss. Spawns assign
-/// their root right after it starts; when the assignment fails (an enclosing job that
-/// disallows nesting, an already-exited pid), callers fall back to `taskkill /T /F`.
-#[cfg(windows)]
-mod windows_job {
-    use std::mem::size_of;
-    use std::os::windows::io::{AsRawHandle, FromRawHandle, OwnedHandle, RawHandle};
-    use windows_sys::Win32::Foundation::{ERROR_MORE_DATA, INVALID_HANDLE_VALUE};
-    use windows_sys::Win32::System::JobObjects::{
-        AssignProcessToJobObject, CreateJobObjectW, JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE,
-        JOBOBJECT_BASIC_LIMIT_INFORMATION, JOBOBJECT_BASIC_PROCESS_ID_LIST, JOBOBJECT_EXTENDED_LIMIT_INFORMATION,
-        JobObjectBasicProcessIdList, JobObjectExtendedLimitInformation, QueryInformationJobObject,
-        SetInformationJobObject, TerminateJobObject,
-    };
-    use windows_sys::Win32::System::Threading::{IO_COUNTERS, OpenProcess, PROCESS_SET_QUOTA, PROCESS_TERMINATE};
-
-    /// A job object holding one launch's processes. The handle is kept open for the
-    /// launch's lifetime: `KILL_ON_JOB_CLOSE` ends anything still in the job when the
-    /// launch record (a run entry, a debug session) is finally dropped.
-    pub struct Job(OwnedHandle);
-
-    impl Job {
-        /// Takes the just-started `child` into a new job, so everything it starts is in
-        /// there too. `None` when the job could not be made or the process rejected the
-        /// assignment (callers fall back to `taskkill /T /F` from the child's pid).
-        pub fn for_child(child: &std::process::Child) -> Option<Job> {
-            // SAFETY: the child's own handle is a live process handle.
-            Self::from_handle(child.as_raw_handle())
-        }
-
-        /// [`Job::for_child`] for a process known by its id (a PTY child, a follow-up run,
-        /// a `tokio` child). `None` when the id no longer names an openable process — a
-        /// caller that holds the child cannot have had it reaped, so this is a dead or
-        /// already-gone launch.
-        pub fn for_pid(pid: u32) -> Option<Job> {
-            // SAFETY: plain call; a non-null result is a process handle owned by the caller.
-            // Assignment needs `SET_QUOTA | TERMINATE` on the process.
-            let handle = unsafe { OpenProcess(PROCESS_SET_QUOTA | PROCESS_TERMINATE, 0, pid) };
-            if handle.is_null() {
-                return None;
-            }
-            // SAFETY: the handle was just opened and is owned here.
-            let handle = unsafe { OwnedHandle::from_raw_handle(handle) };
-            Self::from_handle(handle.as_raw_handle())
-        }
-
-        fn from_handle(handle: RawHandle) -> Option<Job> {
-            // SAFETY: plain calls; a non-null result is a job handle owned by the caller.
-            let job = unsafe { CreateJobObjectW(std::ptr::null(), std::ptr::null()) };
-            if job.is_null() || job == INVALID_HANDLE_VALUE {
-                return None;
-            }
-            // SAFETY: the job handle is owned here and `limits` is sized as the API requires.
-            let job = unsafe { OwnedHandle::from_raw_handle(job) };
-            let mut limits = JOBOBJECT_EXTENDED_LIMIT_INFORMATION {
-                BasicLimitInformation: JOBOBJECT_BASIC_LIMIT_INFORMATION {
-                    PerProcessUserTimeLimit: 0,
-                    PerJobUserTimeLimit: 0,
-                    LimitFlags: JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE,
-                    MinimumWorkingSetSize: 0,
-                    MaximumWorkingSetSize: 0,
-                    ActiveProcessLimit: 0,
-                    Affinity: 0,
-                    PriorityClass: 0,
-                    SchedulingClass: 0,
-                },
-                IoInfo: IO_COUNTERS {
-                    ReadOperationCount: 0,
-                    WriteOperationCount: 0,
-                    OtherOperationCount: 0,
-                    ReadTransferCount: 0,
-                    WriteTransferCount: 0,
-                    OtherTransferCount: 0,
-                },
-                ProcessMemoryLimit: 0,
-                JobMemoryLimit: 0,
-                PeakProcessMemoryUsed: 0,
-                PeakJobMemoryUsed: 0,
-            };
-            // SAFETY: the job handle is owned here and `limits` is sized as the API requires.
-            let ok = unsafe {
-                SetInformationJobObject(
-                    job.as_raw_handle(),
-                    JobObjectExtendedLimitInformation,
-                    &mut limits as *mut _ as *const _,
-                    size_of::<JOBOBJECT_EXTENDED_LIMIT_INFORMATION>() as u32,
-                )
-            };
-            if ok == 0 {
-                return None;
-            }
-            // SAFETY: the process handle belongs to the just-spawned child and outlives
-            // this call; the job handle is owned here.
-            let ok = unsafe { AssignProcessToJobObject(job.as_raw_handle(), handle) };
-            if ok == 0 {
-                return None;
-            }
-            Some(Job(job))
-        }
-
-        /// Adds another just-started root of the same launch to the job (a Go build's
-        /// follow-up run, a JVM a debug session starts itself). `false` when it did not
-        /// take; the process then relies on its own kill.
-        pub fn assign_pid(&self, pid: u32) -> bool {
-            // SAFETY: plain call; the handle is opened only to assign it, and the job
-            // handle is owned and valid.
-            let handle = unsafe { OpenProcess(PROCESS_SET_QUOTA | PROCESS_TERMINATE, 0, pid) };
-            if handle.is_null() {
-                return false;
-            }
-            // SAFETY: both handles are valid for the duration of the call.
-            let ok = unsafe { AssignProcessToJobObject(self.0.as_raw_handle(), handle) };
-            // SAFETY: the process handle was opened above and is owned here.
-            unsafe { drop(OwnedHandle::from_raw_handle(handle)) };
-            ok != 0
-        }
-
-        /// Terminates every process in the job. `false` when the call failed (the job
-        /// handle is invalid): callers then fall back to `taskkill /T /F`. Termination is
-        /// asynchronous; poll [`Job::is_running`] (bounded by [`TREE_EXIT_WAIT`]) until
-        /// the tree is gone.
-        pub fn terminate(&self) -> bool {
-            // SAFETY: a job handle owned here.
-            unsafe { TerminateJobObject(self.0.as_raw_handle(), 1) != 0 }
-        }
-
-        /// Whether any process of the launch is still in the job. When the job's state
-        /// cannot be read, reports gone: waits on this must not wedge, and a kill via
-        /// [`Job::terminate`] does not depend on the answer.
-        pub fn is_running(&self) -> bool {
-            // A list of one is the common case; `ERROR_MORE_DATA` says the real list is
-            // longer, which means there are processes.
-            let mut list = JOBOBJECT_BASIC_PROCESS_ID_LIST {
-                NumberOfAssignedProcesses: 0,
-                NumberOfProcessIdsInList: 0,
-                ProcessIdList: [0],
-            };
-            let mut returned = 0u32;
-            // SAFETY: the job handle is owned here and `list` is sized as the API requires.
-            let ok = unsafe {
-                QueryInformationJobObject(
-                    self.0.as_raw_handle(),
-                    JobObjectBasicProcessIdList,
-                    &mut list as *mut _ as *mut _,
-                    size_of::<JOBOBJECT_BASIC_PROCESS_ID_LIST>() as u32,
-                    &mut returned,
-                )
-            };
-            if ok != 0 {
-                list.NumberOfProcessIdsInList > 0
-            } else {
-                std::io::Error::last_os_error().raw_os_error() == Some(ERROR_MORE_DATA as i32)
-            }
-        }
-    }
-}
-
 /// Gives `cmd` the host's environment back when the IDE runs from an AppImage. `AppRun` and
 /// its hooks point `LD_LIBRARY_PATH`, `PATH`, `XDG_DATA_DIRS`, `GIO_MODULE_DIR`, `GTK_PATH`,
 /// `GST_PLUGIN_*`, ... into the mounted image for the IDE itself; a host program that
@@ -603,11 +299,9 @@ fn appimage_fixes() -> Vec<(OsString, Option<OsString>)> {
 const APPIMAGE_LAUNCH_VARS: [&str; 4] = ["APPDIR", "APPIMAGE", "ARGV0", "OWD"];

 /// What to change in `vars` (an environment) so a child sees the host's environment rather
-/// than the AppImage's: every `:`-separated entry inside `$APPDIR` — or inside *any*
-/// AppImage mount, since an in-app update restart inherits the previous mount's entries
-/// alongside the new one — is dropped (a saved `<NAME>_ORIG` wins when present),
-/// variables left empty are removed, and so are the runtime's own launch variables.
-/// Nothing changes when `APPDIR` is not set.
+/// than the AppImage's: every `:`-separated entry inside `$APPDIR` is dropped (a saved
+/// `<NAME>_ORIG` wins when present), variables left empty are removed, and so are the
+/// runtime's own launch variables. Nothing changes when `APPDIR` is not set.
 fn appimage_env_fixes(vars: &[(OsString, OsString)]) -> Vec<(OsString, Option<OsString>)> {
    let get = |name: &str| vars.iter().find(|(k, _)| k == name).map(|(_, v)| v);
    let Some(appdir) =
@@ -615,12 +309,7 @@ fn appimage_env_fixes(vars: &[(OsString, OsString)]) -> Vec<(OsString, Option<Os
    else {
        return Vec::new();
    };
-    let inside = |entry: &str| {
-        let own = entry.strip_prefix(appdir).is_some_and(|rest| rest.is_empty() || rest.starts_with('/'));
-        // AppImages extract to `/tmp/.mount_<name>`; an entry under another mount is
-        // another image's (e.g. the pre-update one a restart inherited), never the host's.
-        own || entry.starts_with("/tmp/.mount_")
-    };
+    let inside = |entry: &str| entry.strip_prefix(appdir).is_some_and(|rest| rest.is_empty() || rest.starts_with('/'));
    let mut fixes = Vec::new();
    for (key, value) in vars {
        let (Some(name), Some(value)) = (key.to_str(), value.to_str()) else { continue };
@@ -823,30 +512,6 @@ fn append_path_entries(path: &OsStr, extra: &OsStr) -> OsString {
 mod tests {
    use super::*;

-    #[test]
-    fn process_alive_tells_live_from_dead_pids() {
-        assert!(process_alive(std::process::id()));
-        assert!(!process_alive(0));
-        let mut cmd = if cfg!(windows) {
-            let mut cmd = Command::new("cmd");
-            cmd.args(["/C", "exit 0"]);
-            cmd
-        } else {
-            Command::new("true")
-        };
-        let mut child = cmd.spawn().unwrap();
-        let pid = child.id();
-        child.wait().unwrap();
-        drop(child);
-        assert!(!process_alive(pid));
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn process_alive_rejects_ids_that_are_not_a_single_process() {
-        assert!(!process_alive(u32::MAX));
-    }
-
    #[cfg(unix)]
    #[test]
    fn kill_tree_of_reaches_what_the_child_started() {
@@ -1050,7 +715,7 @@ mod tests {
            ("PATH", "/tmp/.mount_OpenIDabc/usr/bin/:/tmp/.mount_OpenIDabc/usr/sbin/:/usr/local/bin:/usr/bin"),
            ("XDG_DATA_DIRS", "/tmp/.mount_OpenIDabc/usr/share:/usr/share:/usr/local/share:/usr/share"),
            ("HOME", "/home/me"),
-            ("JAVA_HOME", "/opt/jdk"),
+            ("JAVA_HOME", "/tmp/.mount_OpenIDabcdef/jdk"),
        ]);
        assert_eq!(
            got,
@@ -1063,27 +728,6 @@ mod tests {
        );
    }

-    #[test]
-    fn entries_of_a_previous_updates_mount_are_dropped() {
-        // An in-app update restart inherits the old mount's entries: a child's curl
-        // must not load the old image's libraries (they can still be mounted).
-        let got = fixes(&[
-            ("APPDIR", "/tmp/.mount_OpenIDjIlFFA"),
-            ("LD_LIBRARY_PATH", "/tmp/.mount_OpenIDjIlFFA/usr/lib/:/tmp/.mount_OpenIDdaNGfM/usr/lib/:/usr/local/lib"),
-            ("PATH", "/tmp/.mount_OpenIDjIlFFA/usr/bin/:/tmp/.mount_OpenIDdaNGfM/usr/bin/:/usr/bin"),
-            ("GIO_MODULE_DIR", "/tmp/.mount_OpenIDdaNGfM/usr/lib/gio/modules"),
-        ]);
-        assert_eq!(
-            got,
-            [
-                fix("APPDIR", None),
-                fix("LD_LIBRARY_PATH", Some("/usr/local/lib")),
-                fix("PATH", Some("/usr/bin")),
-                fix("GIO_MODULE_DIR", None),
-            ]
-        );
-    }
-
    #[test]
    fn variables_left_empty_are_removed() {
        // AppRun prepends to an unset variable, leaving a trailing `:`; hooks set single paths.
@@ -1167,25 +811,6 @@ mod tests {
        }
        assert_eq!(find_executable("nope", &search), None);
    }
-
-    #[cfg(unix)]
-    #[test]
-    fn process_tree_lists_the_child_of_a_shell() {
-        let mut cmd = Command::new("sh");
-        own_group(&mut cmd).args(["-c", "sleep 5 & wait"]);
-        let mut child = cmd.spawn().unwrap();
-        let sh_pid = child.id() as i32;
-        // The shell forks `sleep` after it starts, so the tree grows a moment later.
-        let deadline = std::time::Instant::now() + Duration::from_secs(2);
-        let mut tree = process_tree(sh_pid);
-        while tree.len() < 2 && std::time::Instant::now() < deadline {
-            std::thread::sleep(Duration::from_millis(20));
-            tree = process_tree(sh_pid);
-        }
-        kill_tree(&mut child);
-        assert_eq!(tree[0], sh_pid, "the pid itself comes first");
-        assert!(tree.len() >= 2 && tree[1..].iter().all(|p| *p != sh_pid), "the shell's child follows: {tree:?}");
-    }
 }

 #[cfg(all(test, unix))]
@@ -1255,66 +880,3 @@ mod kill_tests {
        assert!(started.elapsed() < Duration::from_secs(5));
    }
 }
-
-#[cfg(all(test, windows))]
-mod job_tests {
-    use super::*;
-    use std::os::windows::process::CommandExt;
-    use std::process::Stdio;
-    use std::time::Instant;
-
-    /// `cmd` that keeps a `ping` grandchild for a minute, like a launcher that started an
-    /// application: the job must reach both.
-    fn launch_tree() -> (std::process::Child, Job, ProcessTree) {
-        let mut cmd = Command::new("cmd");
-        cmd.args(["/D", "/S", "/C", "ping -n 60 127.0.0.1 >NUL"]).stdin(Stdio::null()).creation_flags(CREATE_NO_WINDOW);
-        let child = cmd.spawn().unwrap();
-        let job = Job::for_child(&child).expect("the job takes the launch");
-        let tree = ProcessTree::capture(child.id());
-        assert!(tree.is_running(), "cmd started a grandchild the job inherits");
-        (child, job, tree)
-    }
-
-    /// Termination is asynchronous: the job reports its processes gone while their
-    /// handles still wait, so wait on the handles (the reused-pid-proof oracle).
-    fn assert_gone(tree: &ProcessTree) {
-        let until = Instant::now() + Duration::from_secs(10);
-        while tree.is_running() {
-            assert!(Instant::now() < until, "the tree survived the job");
-            std::thread::sleep(Duration::from_millis(20));
-        }
-    }
-
-    #[test]
-    fn job_terminates_the_tree_the_root_started() {
-        let (mut child, job, tree) = launch_tree();
-        assert!(job.is_running());
-        assert!(job.terminate(), "TerminateJobObject succeeds");
-        // The captured tree's handles survive the root's death, so the wait below is the
-        // grandchild's, not a reused pid's.
-        assert_gone(&tree);
-        assert!(!job.is_running());
-        let _ = child.wait();
-    }
-
-    #[test]
-    fn a_later_spawned_root_joins_the_job() {
-        let (mut first, job, _) = launch_tree();
-        let mut cmd = Command::new("cmd");
-        cmd.args(["/D", "/S", "/C", "ping -n 60 127.0.0.1 >NUL"]).stdin(Stdio::null()).creation_flags(CREATE_NO_WINDOW);
-        let mut second = cmd.spawn().unwrap();
-        let second_tree = ProcessTree::capture(second.id());
-        assert!(job.assign_pid(second.id()), "the follow-up run joins the job");
-        assert!(job.terminate());
-        assert_gone(&second_tree);
-        let _ = first.wait();
-        let _ = second.wait();
-    }
-
-    #[test]
-    fn a_dead_pid_makes_no_job() {
-        // An id of a process this test cannot open (or that does not exist) gives no job,
-        // which is the callers' cue for the `taskkill /T /F` fallback.
-        assert!(Job::for_pid(u32::MAX).is_none());
-    }
-}
@@ -1,6 +1,5 @@
 //! Shared filesystem rules for discovering builds and resolving their owners.

-use std::collections::HashSet;
 use std::path::{Component, Path, PathBuf};

 pub const SEARCH_DEPTH: usize = 3;
@@ -36,23 +35,10 @@ pub fn discover_matching(
    max_depth: usize,
    stop_at_match: bool,
    marked: impl Fn(&Path) -> bool,
-) -> Vec<PathBuf> {
-    discover_matching_cancellable(root, max_depth, stop_at_match, &crate::CancellationToken::new(), marked)
-}
-
-pub fn discover_matching_cancellable(
-    root: &Path,
-    max_depth: usize,
-    stop_at_match: bool,
-    cancel: &crate::CancellationToken,
-    marked: impl Fn(&Path) -> bool,
 ) -> Vec<PathBuf> {
    let mut found = Vec::new();
    let mut pending = vec![(root.to_path_buf(), 0)];
    while let Some((dir, depth)) = pending.pop() {
-        if cancel.is_cancelled() {
-            break;
-        }
        if marked(&dir) {
            found.push(dir.clone());
            if stop_at_match {
@@ -80,70 +66,6 @@ pub fn discover_matching_cancellable(
    found
 }

-/// Expands workspace member patterns one level deep: `dir`, `dir/*`, `dir/**`.
-pub fn expand_members(root: &Path, patterns: &[String], marker: &str) -> Vec<PathBuf> {
-    let mut dirs = Vec::new();
-    for pattern in patterns {
-        let pattern = pattern.trim().trim_start_matches("./").trim_end_matches('/');
-        if pattern.is_empty() || pattern.starts_with('!') {
-            continue;
-        }
-        let base = pattern.strip_suffix("/**").or_else(|| pattern.strip_suffix("/*"));
-        match base {
-            Some(base) if !base.contains('*') => {
-                dirs.extend(children(&root.join(base)).into_iter().filter(|d| d.join(marker).is_file()))
-            }
-            None if !pattern.contains('*') => {
-                let dir = root.join(pattern);
-                if dir.join(marker).is_file() {
-                    dirs.push(dir);
-                }
-            }
-            _ => {}
-        }
-    }
-    let mut seen = HashSet::new();
-    dirs.retain(|d| seen.insert(d.clone()));
-    dirs
-}
-
-pub fn node_workspace_members(root: &Path) -> Vec<PathBuf> {
-    let package = std::fs::read(root.join("package.json"))
-        .ok()
-        .and_then(|bytes| serde_json::from_slice::<serde_json::Value>(&bytes).ok())
-        .unwrap_or_default();
-    expand_members(root, &node_workspace_patterns(root, &package), "package.json")
-}
-
-fn node_workspace_patterns(root: &Path, pkg: &serde_json::Value) -> Vec<String> {
-    let mut patterns: Vec<String> = Vec::new();
-    let ws = pkg.get("workspaces");
-    let list = ws
-        .and_then(serde_json::Value::as_array)
-        .or_else(|| ws.and_then(|w| w.get("packages")).and_then(serde_json::Value::as_array));
-    if let Some(list) = list {
-        patterns.extend(list.iter().filter_map(serde_json::Value::as_str).map(str::to_owned));
-    }
-    if let Ok(yaml) = std::fs::read_to_string(root.join("pnpm-workspace.yaml")) {
-        let mut in_packages = false;
-        for line in yaml.lines() {
-            let trimmed = line.trim();
-            if trimmed.is_empty() || trimmed.starts_with('#') {
-                continue;
-            }
-            if !line.starts_with([' ', '\t', '-']) {
-                in_packages = trimmed.starts_with("packages:");
-                continue;
-            }
-            if in_packages && let Some(item) = trimmed.strip_prefix('-') {
-                let item = item.split(" #").next().unwrap_or_default().trim().trim_matches(['"', '\'']);
-                patterns.push(item.to_owned());
-            }
-        }
-    }
-    patterns
-}
-
 /// The closest package manager declaration or lockfile, shared by build and run.
 pub fn package_manager(root: &Path) -> &'static str {
    for dir in root.ancestors() {
@@ -1,53 +0,0 @@
-//! Where a path really lands, and whether it reaches git's own metadata, for writes that must
-//! stay inside a project and out of its `.git`.
-
-use std::path::{Path, PathBuf};
-
-/// `joined` after `..`/symlink resolution as far as the file system allows:
-/// the canonical path when it exists, else the canonicalized deepest existing
-/// ancestor with the still-missing tail resolved textually — so the location
-/// of a missing path is still judged where it would really land.
-pub fn resolve_real(joined: &Path) -> PathBuf {
-    let mut tail = Vec::new();
-    let mut candidate = joined.to_path_buf();
-    let mut real = loop {
-        match dunce::canonicalize(&candidate) {
-            Ok(real) => break real,
-            Err(_) => {
-                let Some(last) = candidate.components().next_back() else {
-                    return joined.to_path_buf();
-                };
-                tail.push(last.as_os_str().to_owned());
-                if !candidate.pop() {
-                    return joined.to_path_buf();
-                }
-            }
-        }
-    };
-    for part in tail.iter().rev() {
-        if part == ".." {
-            real.pop();
-        } else if part != "." {
-            real.push(part);
-        }
-    }
-    real
-}
-
-/// Whether a path (relative to the project root) goes through git's own `.git` folder or file.
-/// git runs what it finds in `.git` (hooks, `gpg.program`, filters), so a content write must
-/// never reach it. Names are normalized for trailing dots and spaces and NTFS stream suffixes;
-/// the caller also checks the short-name-resolved path via [`resolve_real`].
-pub fn names_git_dir(rel: &Path) -> bool {
-    rel.components().any(|part| {
-        let name = part.as_os_str().to_string_lossy();
-        let name = name.split(':').next().unwrap_or_default().trim_end_matches(['.', ' ']);
-        name.eq_ignore_ascii_case(".git")
-    })
-}
-
-/// A resolved write destination under `root` that reaches git's own `.git` metadata, judged by
-/// the name given and by the name the file system resolves it to.
-pub fn reaches_git_dir(root: &Path, real: &Path) -> bool {
-    real.strip_prefix(root).is_ok_and(names_git_dir) || resolve_real(real).strip_prefix(root).is_ok_and(names_git_dir)
-}
@@ -77,8 +77,6 @@ pub enum AutoUpload {
 #[serde(default, rename_all = "camelCase")]
 pub struct DeploymentSettings {
    pub servers: Vec<DeploymentServer>,
-    /// Server groups: Upload to… on a group uploads to each of its servers.
-    pub groups: Vec<DeploymentGroup>,
    /// Server used by Upload / Download / Sync and automatic upload; empty = none.
    pub default_server: String,
    pub auto_upload: AutoUpload,
@@ -94,7 +92,6 @@ impl Default for DeploymentSettings {
    fn default() -> Self {
        Self {
            servers: Vec::new(),
-            groups: Vec::new(),
            default_server: String::new(),
            auto_upload: AutoUpload::Never,
            delete_remote: false,
@@ -106,47 +103,14 @@ impl Default for DeploymentSettings {
    }
 }

-/// Named set of deployment servers that files are uploaded to together.
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(default, rename_all = "camelCase")]
-pub struct DeploymentGroup {
-    pub id: String,
-    pub name: String,
-    /// [`DeploymentServer::id`]s, in upload order.
-    pub servers: Vec<String>,
-}
-
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
 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")]
@@ -156,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).
@@ -229,30 +191,6 @@ pub struct RunTarget {
    pub image_user: bool,
 }

-/// A plugin-owned argv wrapper for project runs (API 1.4).
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct PluginRunTarget {
-    pub id: String,
-    pub name: String,
-    pub program: String,
-    pub args: Vec<String>,
-    pub workdir_args: Vec<String>,
-    pub container_root: Option<String>,
-    pub commands: Vec<PluginCommandOverride>,
-}
-
-/// Per-command argv prefix and optional replacement working-directory arguments.
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct PluginCommandOverride {
-    pub name: String,
-    pub args: Vec<String>,
-    /// None inherits the target's list; Some([]) suppresses it.
-    #[serde(default)]
-    pub workdir_args: Option<Vec<String>>,
-}
-
 #[cfg(test)]
 mod deployment_tests {
    use super::*;
@@ -263,11 +201,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
@@ -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();
@@ -61,13 +61,16 @@ pub fn find_command(command: &str, search: &OsStr, root: &Path) -> Option<PathBu

 fn is_executable(path: &Path) -> bool {
    let Ok(metadata) = path.metadata() else { return false };
+    if !metadata.is_file() {
+        return false;
+    }
    #[cfg(unix)]
    {
        use std::os::unix::fs::PermissionsExt;
-        metadata.is_file() && metadata.permissions().mode() & 0o111 != 0
+        metadata.permissions().mode() & 0o111 != 0
    }
    #[cfg(not(unix))]
-    metadata.is_file()
+    true
 }

 /// [`search_path`]'s directories, in order and once each. Only absolute ones: a
@@ -1,151 +0,0 @@
-use serde::{Deserialize, Serialize};
-use specta::Type;
-use std::collections::HashSet;
-use std::time::{Duration, Instant};
-
-pub const CHECK_INTERVAL: Duration = Duration::from_secs(4 * 60 * 60);
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub enum UpdateSource {
-    #[default]
-    Github,
-    Cnb,
-}
-
-impl UpdateSource {
-    pub fn resolve(preference: &str, locale: &str, system_locale: &str) -> Self {
-        match preference {
-            "github" => return Self::Github,
-            "cnb" => return Self::Cnb,
-            _ => {}
-        }
-        let locale = locale.trim();
-        let locale = if matches!(locale, "" | "auto" | "system") { system_locale } else { locale };
-        if locale.split(['-', '_']).next().is_some_and(|base| base.eq_ignore_ascii_case("zh")) {
-            Self::Cnb
-        } else {
-            Self::Github
-        }
-    }
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct UpdateInfo {
-    pub version: String,
-    pub current_version: String,
-    pub notes: Option<String>,
-    pub date: Option<String>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct UpdateCheck {
-    pub enabled: bool,
-    pub update: Option<UpdateInfo>,
-}
-
-#[derive(Clone, Debug, Default, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct UpdateStatus {
-    /// Unix milliseconds of the last successful check in this process.
-    pub last_checked: Option<f64>,
-    pub checking: bool,
-}
-
-/// One schedule and announcement history for the desktop process, independent of its windows.
-#[derive(Default)]
-pub struct UpdatePolicy {
-    attempted: Option<Instant>,
-    pub status: UpdateStatus,
-    announced: HashSet<String>,
-}
-
-impl UpdatePolicy {
-    pub fn due_in(&self, now: Instant) -> Duration {
-        self.attempted.map_or(Duration::ZERO, |at| CHECK_INTERVAL.saturating_sub(now.saturating_duration_since(at)))
-    }
-
-    pub fn begin(&mut self, now: Instant) {
-        self.attempted = Some(now);
-        self.status.checking = true;
-    }
-
-    pub fn finish(&mut self, checked_at: Option<f64>) {
-        self.status.checking = false;
-        if let Some(at) = checked_at {
-            self.status.last_checked = Some(at);
-        }
-    }
-
-    pub fn announced(&self, version: &str) -> bool {
-        self.announced.contains(version)
-    }
-
-    /// Manual checks always show their result, but also count as an announcement.
-    pub fn announce(&mut self, version: &str) -> bool {
-        self.announced.insert(version.to_owned())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn automatic_and_manual_checks_resolve_the_same_preferred_source() {
-        for (preference, locale, system, expected) in [
-            ("auto", "zh-CN", "en-US", UpdateSource::Cnb),
-            ("auto", " ZH_CN ", "en-US", UpdateSource::Cnb),
-            ("auto", "system", "zh-CN", UpdateSource::Cnb),
-            ("auto", "auto", "zh-TW", UpdateSource::Cnb),
-            ("auto", "", "zh", UpdateSource::Cnb),
-            ("auto", "en", "zh-CN", UpdateSource::Github),
-            ("github", "zh", "zh-CN", UpdateSource::Github),
-            ("cnb", "en", "en-US", UpdateSource::Cnb),
-        ] {
-            assert_eq!(UpdateSource::resolve(preference, locale, system), expected);
-        }
-    }
-
-    #[test]
-    fn checks_at_startup_and_every_four_hours_even_after_failure() {
-        let mut policy = UpdatePolicy::default();
-        let now = Instant::now();
-        assert_eq!(policy.due_in(now), Duration::ZERO);
-        policy.begin(now);
-        assert!(policy.status.checking);
-        policy.finish(None);
-        assert_eq!(policy.status.last_checked, None);
-        assert_eq!(policy.due_in(now + CHECK_INTERVAL - Duration::from_secs(1)), Duration::from_secs(1));
-        assert_eq!(policy.due_in(now + CHECK_INTERVAL), Duration::ZERO);
-        policy.begin(now + CHECK_INTERVAL);
-        policy.finish(Some(1234.0));
-        assert_eq!(policy.status.last_checked, Some(1234.0));
-        assert!(!policy.status.checking);
-        assert_eq!(policy.due_in(now + CHECK_INTERVAL), CHECK_INTERVAL);
-    }
-
-    #[test]
-    fn manual_checks_reset_the_schedule_without_losing_last_success_on_failure() {
-        let mut policy = UpdatePolicy::default();
-        let now = Instant::now();
-        policy.begin(now);
-        policy.finish(Some(1000.0));
-        policy.begin(now + Duration::from_secs(60));
-        policy.finish(None);
-        assert_eq!(policy.status.last_checked, Some(1000.0));
-        assert_eq!(policy.due_in(now + CHECK_INTERVAL), Duration::from_secs(60));
-    }
-
-    #[test]
-    fn announcements_are_per_version_across_windows_sources_and_manual_checks() {
-        let mut policy = UpdatePolicy::default();
-        assert!(policy.announce("0.1.40"));
-        assert!(!policy.announce("0.1.40"));
-        assert!(policy.announce("0.1.41"));
-        assert!(!policy.announce("0.1.40"));
-        assert!(UpdatePolicy::default().announce("0.1.40"));
-    }
-}
@@ -43,7 +43,6 @@ impl Default for VcsSettings {
 pub struct GitSettings {
    /// Show blame after the current editor line.
    pub inline_blame: bool,
-    pub show_branch_in_project_view: bool,
    /// Path to the git executable; empty = auto-detect.
    pub executable: String,
    /// Default of Update Project: `merge` | `rebase`.
@@ -75,7 +74,6 @@ impl Default for GitSettings {
    fn default() -> Self {
        Self {
            inline_blame: false,
-            show_branch_in_project_view: false,
            executable: String::new(),
            update_method: "merge".into(),
            auto_update_on_push_rejected: false,
@@ -117,13 +115,6 @@ pub struct CommitSettings {
    pub wrap_at_margin: bool,
    /// Plugin before-commit checks turned off (`<plugin id>/<check id>`); the rest run.
    pub disabled_plugin_checks: Vec<String>,
-    /// Double-click / Enter in the changes view: `None` follows the interface (the
-    /// Commit tool window opens the diff, Local Changes the source file).
-    ///
-    /// No `skip_serializing_if`: an unset value must still appear in
-    /// `Settings::default()`, or `SettingsStore::set` rejects the key as unknown.
-    #[specta(optional)]
-    pub double_click_opens_diff: Option<bool>,
 }

 impl Default for CommitSettings {
@@ -144,7 +135,6 @@ impl Default for CommitSettings {
            show_right_margin: true,
            wrap_at_margin: false,
            disabled_plugin_checks: Vec::new(),
-            double_click_opens_diff: None,
        }
    }
 }
@@ -175,24 +165,6 @@ impl Default for VcsConfirmationSettings {
    }
 }

-/// Tools › Diff & Merge › External Diff Tools: a program that shows two files' differences.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
-#[serde(default, rename_all = "camelCase")]
-pub struct ExternalDiffSettings {
-    /// Offer Show Diff in External Tool in diff viewers.
-    pub enabled: bool,
-    /// The program to start.
-    pub path: String,
-    /// Its arguments: `%1` the left file, `%2` the right file, `%3` the diff's title.
-    pub parameters: String,
-}
-
-impl Default for ExternalDiffSettings {
-    fn default() -> Self {
-        Self { enabled: false, path: String::new(), parameters: "%1 %2 %3".into() }
-    }
-}
-
 /// Version Control › Shelf.
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
@@ -210,33 +182,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")]
@@ -248,8 +193,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 {
@@ -266,7 +209,6 @@ impl Default for ConsoleSettings {
                "at node:internal/".into(),
                "<frozen importlib._bootstrap".into(),
            ],
-            log_colors: LogLevelColors::default(),
        }
    }
 }
@@ -278,24 +220,18 @@ pub struct DebuggerSettings {
    pub show_on_breakpoint: bool,
    pub focus_app_on_breakpoint: bool,
    pub hide_on_termination: bool,
-    /// A breakpoint or exception hit brings the Debug tool window's Threads & Variables tab to the front.
-    pub variables_on_breakpoint: bool,
    pub breakpoints_any_file: bool,
    /// While suspended, hovering the start of a line shows a Run to Cursor button.
    pub run_to_cursor_inlay: bool,
    pub inline_values: bool,
    /// Data Views: list variables by name instead of the adapter's order.
    pub sort_values: bool,
-    /// Data Views: evaluate watches while the program runs, where the debugger can (JavaScript).
-    pub live_watches: bool,
    pub value_tooltip: bool,
    /// While suspended, selecting an expression shows its value.
    pub value_tooltip_on_selection: bool,
    pub value_tooltip_delay: u32,
    /// Stepping: do not step into library code (debugpy `justMyCode`, js-debug `skipFiles`).
    pub skip_library_code: bool,
-    /// JavaScript: debugging a dev server (`vite`, `next dev`) also opens its page in a browser session.
-    pub debug_server_page: bool,
    pub python: PythonDebuggerSettings,
 }

@@ -305,17 +241,14 @@ impl Default for DebuggerSettings {
            show_on_breakpoint: true,
            focus_app_on_breakpoint: false,
            hide_on_termination: false,
-            variables_on_breakpoint: true,
            breakpoints_any_file: false,
            run_to_cursor_inlay: true,
            inline_values: true,
            sort_values: false,
-            live_watches: false,
            value_tooltip: true,
            value_tooltip_on_selection: true,
            value_tooltip_delay: 700,
            skip_library_code: true,
-            debug_server_page: false,
            python: PythonDebuggerSettings::default(),
        }
    }
@@ -339,28 +272,17 @@ impl Default for PythonDebuggerSettings {
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct RunSettings {
-    /// Target for configurations without an explicit target. Empty = local.
-    pub default_target: String,
    pub confirm_rerun: bool,
    /// Ask before closing a Run tab whose process is still running.
    pub confirm_terminate: bool,
    pub show_on_start: bool,
-    /// New Run/Debug tabs start pinned: a later run doesn't take their place once finished.
-    pub pin_tabs: bool,
    /// Grace period between interrupt and kill when stopping a process.
    pub termination_timeout_ms: u32,
 }

 impl Default for RunSettings {
    fn default() -> Self {
-        Self {
-            default_target: String::new(),
-            confirm_rerun: true,
-            confirm_terminate: true,
-            show_on_start: true,
-            pin_tabs: false,
-            termination_timeout_ms: 3000,
-        }
+        Self { confirm_rerun: true, confirm_terminate: true, show_on_start: true, termination_timeout_ms: 3000 }
    }
 }

@@ -382,7 +304,6 @@ pub struct TerminalSettings {
    pub override_ide_shortcuts: bool,
    pub shell_integration: bool,
    pub highlight_hyperlinks: bool,
-    pub highlight_selection: bool,
    pub option_as_meta: bool,
    /// Escape moves focus to the editor instead of reaching the shell.
    pub escape_to_editor: bool,
@@ -415,7 +336,6 @@ impl Default for TerminalSettings {
            override_ide_shortcuts: true,
            shell_integration: true,
            highlight_hyperlinks: true,
-            highlight_selection: true,
            option_as_meta: false,
            escape_to_editor: false,
            cursor_shape: "block".into(),
@@ -472,30 +392,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(),
-            ],
-        }
-    }
-}
@@ -7,32 +7,22 @@ license.workspace = true

 [dependencies]
 futures.workspace = true
-tokio-tungstenite.workspace = true
-base64.workspace = true
 tempfile.workspace = true
 ide-core.workspace = true
 ide-language.workspace = true
 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
 tokio = { workspace = true, features = ["net"] }
 parking_lot.workspace = true
 memchr = "2"
-percent-encoding = "2"
 portable-pty.workspace = true
 tracing.workspace = true

 [target.'cfg(unix)'.dependencies]
 libc = "0.2"

-[target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.61", features = ["Wdk_System_Threading", "Win32_Foundation", "Win32_System_Diagnostics_ToolHelp", "Win32_System_Threading"] }
-
 [dev-dependencies]
 tracing-subscriber.workspace = true
-tokio = { workspace = true, features = ["net", "rt-multi-thread", "macros", "test-util"] }
+tokio = { workspace = true, features = ["net", "rt-multi-thread", "macros"] }
@@ -9,7 +9,6 @@
 use ide_core::process::executable_names;
 use ide_core::{IdeError, IdeResult};
 use ide_language::{DebuggerConfig, LanguageRegistry, ProgramPin};
-use serde_json::Value;
 use std::future::Future;
 use std::path::{Path, PathBuf};
 use std::pin::Pin;
@@ -73,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" },
@@ -106,21 +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",
-        ),
-        // 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(
-            "gdb",
-            &["-i", "dap"],
-            "stdio",
-            "Install GDB 14 or newer (apt install gdb, dnf install gdb, brew install gdb)",
-        ),
-        "rdbg" => cfg("rdbg", &["-O", "--port", PORT_PLACEHOLDER, "-c"], "tcp", "gem install debug"),
+        "lldb-dap" => {
+            cfg("lldb-dap", &[], "stdio", "Install LLVM's lldb-dap (brew install llvm; on macOS `xcrun -f lldb-dap`)")
+        }
        // A jdtls bundle: the session is started through jdtls and reached via `debugServer`.
        "java-debug" => cfg(
            "com.microsoft.java.debug.plugin.jar",
@@ -128,12 +108,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,
    })
 }
@@ -152,7 +126,6 @@ pub fn default_type(adapter: &str) -> Option<&'static str> {
        "delve" => "go",
        "netcoredbg" => "coreclr",
        "lldb-dap" => "lldb-dap",
-        "gdb" => "gdb",
        "java-debug" => "java",
        _ => return None,
    })
@@ -192,11 +165,6 @@ pub fn parse_address(addr: &str) -> Option<(String, u16)> {
 }

 /// A port that was free a moment ago on the loopback interface.
-///
-/// Inherently racy: another process can bind the port between the listener being
-/// dropped here and the adapter binding it. Callers that hand the port to a child
-/// retry on a bind conflict (see [`ProcessLauncher`]), or — better — let the child
-/// pick `:0` and report the actual port back (as the Kotlin JDWP debuggee does).
 pub fn free_port() -> std::io::Result<u16> {
    let listener = std::net::TcpListener::bind(("127.0.0.1", 0))?;
    Ok(listener.local_addr()?.port())
@@ -213,50 +181,6 @@ pub fn tools_root() -> Option<PathBuf> {
    TOOLS_ROOT.read().clone()
 }

-/// The browser js-debug launches for `ty`, or `None` when the launch starts no browser.
-fn launched_browser(ty: &str) -> Option<&'static str> {
-    match ty {
-        "pwa-chrome" | "chrome" => Some("chrome"),
-        "pwa-msedge" | "msedge" => Some("msedge"),
-        _ => None,
-    }
-}
-
-/// Gives a browser launch that names no `userDataDir` a profile of `project`'s own in the
-/// IDE's local data (`cache/browser-profiles`), so sign-ins and site data are still there in
-/// the next session. js-debug's own default is one temporary profile for every project.
-pub(crate) fn set_browser_profile(arguments: &mut Value, project: &Path) {
-    if let Some(local_data) = tools_root().and_then(|tools| tools.parent().map(Path::to_owned)) {
-        set_browser_profile_in(arguments, project, &local_data);
-    }
-}
-
-fn set_browser_profile_in(arguments: &mut Value, project: &Path, local_data: &Path) {
-    let Some(obj) = arguments.as_object_mut() else { return };
-    let browser = obj.get("type").and_then(Value::as_str).and_then(launched_browser);
-    let launch = obj.get("request").and_then(Value::as_str) == Some("launch");
-    let (Some(browser), true, false) = (browser, launch, obj.contains_key("userDataDir")) else { return };
-    let dir = local_data.join("cache").join("browser-profiles").join(profile_name(project)).join(browser);
-    obj.insert("userDataDir".into(), dir.to_string_lossy().into_owned().into());
-}
-
-/// `<folder name>-<hash of the path>`: readable, and distinct for projects whose folders share a name.
-fn profile_name(project: &Path) -> String {
-    // FNV-1a: the name has to stay the same across toolchains, which `DefaultHasher` doesn't promise.
-    let hash = project
-        .to_string_lossy()
-        .bytes()
-        .fold(0xcbf2_9ce4_8422_2325_u64, |h, b| (h ^ u64::from(b)).wrapping_mul(0x0000_0100_0000_01b3));
-    let name: String = project
-        .file_name()
-        .map(|n| n.to_string_lossy().into_owned())
-        .unwrap_or_default()
-        .chars()
-        .map(|c| if c.is_ascii_alphanumeric() || c == '-' || c == '_' || c == '.' { c } else { '_' })
-        .collect();
-    format!("{name}-{hash:016x}")
-}
-
 /// Executable directories of managed installs, read at lookup time so tools installed
 /// after startup are found without a restart: `<tool>/bin`, `<tool>/venv/bin`, npm's `.bin`.
 fn managed_dirs(root: &Path) -> Vec<PathBuf> {
@@ -402,89 +326,6 @@ pub async fn prepare_debugpy(spec: &mut AdapterSpec) -> IdeResult<()> {
    )))
 }

-/// GDB's DAP interpreter (`-i dap`) shipped in GDB 14; older ones exit with
-/// "Interpreter `dap' unrecognized".
-const GDB_MIN_MAJOR: u32 = 14;
-
-/// `(major, minor)` of the first version number in the output of `gdb --version`
-/// (`GNU gdb (GDB) 14.2`, `GNU gdb (Ubuntu 12.1-0ubuntu1~22.04.2) 12.1`, `GNU gdb
-/// (GDB) 15.0.50.20240403-0ubuntu1`). `None` when no standalone version number is there.
-pub fn parse_gdb_version(output: &str) -> Option<(u32, u32)> {
-    let line = output.lines().next()?;
-    // Distribution names can contain versions, e.g. `(GDB; SUSE Linux Enterprise 15) 14.2`.
-    let line = line.rsplit_once(')').map_or(line, |(_, version)| version);
-    let b = line.as_bytes();
-    let mut i = 0;
-    while i < b.len() {
-        if !b[i].is_ascii_digit() {
-            i += 1;
-            continue;
-        }
-        let start = i;
-        while i < b.len() && b[i].is_ascii_digit() {
-            i += 1;
-        }
-        let major: u32 = line[start..i].parse().ok()?;
-        let mut minor = 0;
-        if i + 1 < b.len() && b[i] == b'.' && b[i + 1].is_ascii_digit() {
-            i += 1;
-            let ms = i;
-            while i < b.len() && b[i].is_ascii_digit() {
-                i += 1;
-            }
-            minor = line[ms..i].parse().unwrap_or(0);
-        }
-        // A version stands alone: `mingw32-gdb13.exe`'s embedded digits are part of a word.
-        if start > 0 && (b[start - 1].is_ascii_alphabetic() || b[start - 1] == b'_') {
-            continue;
-        }
-        return Some((major, minor));
-    }
-    None
-}
-
-/// Probe the already resolved and verified executable with its launch environment.
-async fn gdb_version(binary: &Path, spec: &AdapterSpec) -> IdeResult<Option<(u32, u32)>> {
-    let mut probe = Command::new(binary);
-    if let Some(path) = adapter_path(&spec.env) {
-        probe.env("PATH", path);
-    }
-    ide_core::process::prepare(probe.as_std_mut());
-    let probe = probe
-        .arg("--version")
-        .current_dir(&spec.cwd)
-        .envs(spec.env.iter().cloned())
-        .stdin(Stdio::null())
-        .stdout(Stdio::piped())
-        .stderr(Stdio::null())
-        .kill_on_drop(true)
-        .output();
-    let Ok(Ok(out)) = tokio::time::timeout(Duration::from_secs(15), probe).await else {
-        return Ok(None);
-    };
-    Ok(parse_gdb_version(&String::from_utf8_lossy(&out.stdout)))
-}
-
-/// Refuse old GDB versions and report whether launch must follow configurationDone.
-/// GDB 15 starts the inferior in launch; 14 and 16+ start it at configurationDone.
-async fn prepare_gdb(spec: &AdapterSpec, binary: &Path) -> IdeResult<bool> {
-    let Some((major, minor)) = gdb_version(binary, spec).await? else {
-        return Ok(false);
-    };
-    if major >= GDB_MIN_MAJOR {
-        return Ok(major == 15);
-    }
-    let mut msg = format!(
-        "debugging with GDB needs GDB {GDB_MIN_MAJOR} or newer (found {major}.{minor}): \
-         this one has no DAP interpreter (`gdb -i dap`)"
-    );
-    if let Some(hint) = &spec.install_hint {
-        msg.push_str(". ");
-        msg.push_str(hint);
-    }
-    Err(IdeError::unavailable(msg))
-}
-
 /// An adapter that is a plugin of another program (java-debug, a jdtls bundle) rather
 /// than a program: it has no process of its own and is reached through `debugServer`.
 pub fn is_plugin_bundle(command: &str) -> bool {
@@ -518,8 +359,6 @@ pub type BoxWriter = Box<dyn AsyncWrite + Unpin + Send>;

 /// A connected adapter: byte streams plus the process (if we spawned one).
 pub struct AdapterIo {
-    /// GDB 15 starts running inside `launch`; configure breakpoints before sending it.
-    pub launch_after_configuration: bool,
    pub reader: BoxReader,
    pub writer: BoxWriter,
    pub child: Option<Child>,
@@ -534,8 +373,8 @@ pub struct AdapterIo {
 pub type ProgramOutput = tokio::sync::mpsc::UnboundedReceiver<(&'static str, String)>;
 type ProgramSink = tokio::sync::mpsc::UnboundedSender<(&'static str, String)>;

-/// These debuggees inherit adapter stdio; no DAP event carries their output.
-const SHARES_STDIO: &[&str] = &["delve", "rdbg"];
+/// Delve's debuggee inherits its stdio; no DAP output event carries what the program prints.
+const SHARES_STDIO: &str = "delve";
 const DELVE_BANNER: &str = "DAP server listening at:";

 pub type LaunchFuture = Pin<Box<dyn Future<Output = IdeResult<AdapterIo>> + Send>>;
@@ -554,9 +393,6 @@ const CONNECT_TIMEOUT: Duration = Duration::from_secs(15);
 const EMBEDDED_START_TIMEOUT: Duration = Duration::from_secs(120);
 /// Probe of a `connect` address before starting the command.
 const PROBE_TIMEOUT: Duration = Duration::from_millis(500);
-/// Attempts at a fresh port for a TCP adapter: the one `free_port` hands out can be
-/// claimed by another process before the adapter binds it, so a new one usually wins.
-const PORT_ATTEMPTS: u32 = 3;

 impl AdapterLauncher for ProcessLauncher {
    fn launch(&self, mut spec: AdapterSpec, reuse_port: Option<u16>) -> LaunchFuture {
@@ -571,7 +407,6 @@ impl AdapterLauncher for ProcessLauncher {
                let stream = connect_with_retries(host, port, None, timeout).await?;
                let (r, w) = stream.into_split();
                return Ok(AdapterIo {
-                    launch_after_configuration: false,
                    reader: Box::new(r),
                    writer: Box::new(w),
                    child: None,
@@ -595,7 +430,6 @@ impl AdapterLauncher for ProcessLauncher {
                let _ = stream.set_nodelay(true);
                let (r, w) = stream.into_split();
                return Ok(AdapterIo {
-                    launch_after_configuration: false,
                    reader: Box::new(r),
                    writer: Box::new(w),
                    child: None,
@@ -624,152 +458,87 @@ impl AdapterLauncher for ProcessLauncher {
                        .ok_or_else(|| missing(&spec))?
                }
            };
-            let launch_after_configuration =
-                if spec.adapter == "gdb" { prepare_gdb(&spec, &binary).await? } else { false };
-            let base_args = substitute_root(&spec.args, &spec.cwd);
-            match spec.transport {
-                Transport::Stdio => {
-                    let mut io = spawn_adapter(&spec, &binary, &base_args, None, CONNECT_TIMEOUT).await?;
-                    io.launch_after_configuration = launch_after_configuration;
-                    Ok(io)
+            let port = match spec.transport {
+                // An embedded adapter started without `${port}` listens on its usual address.
+                Transport::Tcp => match &embedded {
+                    Some((_, port)) if !spec.args.iter().any(|a| a.contains(PORT_PLACEHOLDER)) => Some(*port),
+                    _ => Some(free_port()?),
+                },
+                Transport::Stdio => None,
+            };
+            let args = substitute_root(&spec.args, &spec.cwd);
+            let args = match port {
+                Some(port) => substitute_port(&args, port),
+                None => args,
+            };
+            let mut cmd = Command::new(&binary);
+            if let Some(path) = adapter_path(&spec.env) {
+                cmd.env("PATH", path);
+            }
+            ide_core::process::prepare(cmd.as_std_mut());
+            cmd.args(&args)
+                .envs(spec.env.iter().map(|(k, v)| (k, v)))
+                .current_dir(&spec.cwd)
+                .stdin(if port.is_some() { Stdio::null() } else { Stdio::piped() })
+                .stdout(Stdio::piped())
+                .stderr(Stdio::piped())
+                .kill_on_drop(true);
+            let mut child =
+                cmd.spawn().map_err(|e| IdeError::unavailable(format!("failed to start {}: {e}", binary.display())))?;
+            let (program_sink, program_output) = if spec.adapter == SHARES_STDIO {
+                let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
+                (Some(tx), Some(rx))
+            } else {
+                (None, None)
+            };
+            if let Some(err) = child.stderr.take() {
+                pump_lines(err, spec.adapter.clone(), stderr.clone(), program_sink.clone().map(|tx| (tx, "stderr")));
+            }
+            match port {
+                None => {
+                    let stdin = child.stdin.take().ok_or_else(|| IdeError::internal("adapter stdin unavailable"))?;
+                    let stdout = child.stdout.take().ok_or_else(|| IdeError::internal("adapter stdout unavailable"))?;
+                    Ok(AdapterIo {
+                        reader: Box::new(stdout),
+                        writer: Box::new(stdin),
+                        child: Some(child),
+                        port: None,
+                        stderr,
+                        program_output,
+                    })
                }
-                Transport::Tcp => {
-                    // An embedded adapter started without `${port}` listens on its usual
-                    // address; every other TCP adapter gets a port chosen here so it can be
-                    // retried if another process takes it before the adapter binds.
-                    let fixed = match &embedded {
-                        Some((_, port)) if !spec.args.iter().any(|a| a.contains(PORT_PLACEHOLDER)) => Some(*port),
-                        _ => None,
-                    };
-                    let start_timeout = if embedded.is_some() { EMBEDDED_START_TIMEOUT } else { CONNECT_TIMEOUT };
-                    for attempt in 1..=PORT_ATTEMPTS {
-                        let port = match fixed {
-                            Some(port) => port,
-                            None => free_port()?,
-                        };
-                        let args = substitute_port(&base_args, port);
-                        match spawn_adapter(&spec, &binary, &args, Some(port), start_timeout).await {
-                            Ok(mut io) => {
-                                io.launch_after_configuration = launch_after_configuration;
-                                return Ok(io);
-                            }
-                            Err(e) => {
-                                if fixed.is_none() && attempt < PORT_ATTEMPTS && is_port_race(&e) {
-                                    tracing::warn!(
-                                        target: "ide_dap::adapter",
-                                        "debug adapter failed to start on port {port}: {}; retrying",
-                                        e.message
-                                    );
-                                    continue;
-                                }
-                                return Err(e);
-                            }
-                        }
+                Some(port) => {
+                    if let Some(out) = child.stdout.take() {
+                        pump_lines(out, spec.adapter.clone(), stderr.clone(), program_sink.map(|tx| (tx, "stdout")));
                    }
-                    unreachable!("the retry loop returns on its last attempt")
+                    let timeout = if embedded.is_some() { EMBEDDED_START_TIMEOUT } else { CONNECT_TIMEOUT };
+                    let stream = match connect_with_retries(LOOPBACK, port, Some(&mut child), timeout).await {
+                        Ok(s) => s,
+                        Err(e) => {
+                            let _ = child.start_kill();
+                            let tail = stderr.lock().join("\n");
+                            return Err(if tail.is_empty() {
+                                e
+                            } else {
+                                IdeError::unavailable(format!("{}\n{tail}", e.message))
+                            });
+                        }
+                    };
+                    let (r, w) = stream.into_split();
+                    Ok(AdapterIo {
+                        reader: Box::new(r),
+                        writer: Box::new(w),
+                        child: Some(child),
+                        port: Some(port),
+                        stderr,
+                        program_output,
+                    })
                }
            }
        })
    }
 }

-/// Starts `binary` with `args`, then connects to it when `port` is set (a TCP adapter)
-/// or hands back its stdio when it is not. The child is stopped if it never accepts.
-async fn spawn_adapter(
-    spec: &AdapterSpec,
-    binary: &Path,
-    args: &[String],
-    port: Option<u16>,
-    start_timeout: Duration,
-) -> IdeResult<AdapterIo> {
-    let stderr = Arc::new(parking_lot::Mutex::new(Vec::new()));
-    let mut cmd = Command::new(binary);
-    if let Some(path) = adapter_path(&spec.env) {
-        cmd.env("PATH", path);
-    }
-    ide_core::process::prepare(cmd.as_std_mut());
-    // Every adapter leads its own process group: the program an adapter launches itself
-    // (java-debug's JVM) joins the group, so a forced stop reaches the whole tree with
-    // one `kill(-pgid)`. On Windows the same coverage comes from the session's job object.
-    ide_core::process::own_group(cmd.as_std_mut());
-    cmd.args(args)
-        .envs(spec.env.iter().map(|(k, v)| (k, v)))
-        .current_dir(&spec.cwd)
-        .stdin(if port.is_some() { Stdio::null() } else { Stdio::piped() })
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped())
-        .kill_on_drop(true);
-    let mut child =
-        cmd.spawn().map_err(|e| IdeError::unavailable(format!("failed to start {}: {e}", binary.display())))?;
-    let (program_sink, program_output) = if SHARES_STDIO.contains(&spec.adapter.as_str()) {
-        let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
-        (Some(tx), Some(rx))
-    } else {
-        (None, None)
-    };
-    if let Some(err) = child.stderr.take() {
-        pump_lines(err, spec.adapter.clone(), stderr.clone(), program_sink.clone().map(|tx| (tx, "stderr")));
-    }
-    match port {
-        None => {
-            let stdin = child.stdin.take().ok_or_else(|| IdeError::internal("adapter stdin unavailable"))?;
-            let stdout = child.stdout.take().ok_or_else(|| IdeError::internal("adapter stdout unavailable"))?;
-            Ok(AdapterIo {
-                launch_after_configuration: false,
-                reader: Box::new(stdout),
-                writer: Box::new(stdin),
-                child: Some(child),
-                port: None,
-                stderr,
-                program_output,
-            })
-        }
-        Some(port) => {
-            if let Some(out) = child.stdout.take() {
-                pump_lines(out, spec.adapter.clone(), stderr.clone(), program_sink.map(|tx| (tx, "stdout")));
-            }
-            let stream = match connect_with_retries(LOOPBACK, port, Some(&mut child), start_timeout).await {
-                Ok(s) => s,
-                Err(e) => {
-                    if spec.adapter == "rdbg"
-                        && let Some(pid) = child.id()
-                    {
-                        ide_core::process::kill_tree_of(pid);
-                    }
-                    let _ = child.start_kill();
-                    let tail = stderr.lock().join("\n");
-                    return Err(if tail.is_empty() {
-                        e
-                    } else {
-                        IdeError::unavailable(format!("{}\n{tail}", e.message))
-                    });
-                }
-            };
-            let (r, w) = stream.into_split();
-            Ok(AdapterIo {
-                launch_after_configuration: false,
-                reader: Box::new(r),
-                writer: Box::new(w),
-                child: Some(child),
-                port: Some(port),
-                stderr,
-                program_output,
-            })
-        }
-    }
-}
-
-/// A failed adapter start that another process grabbing the free port can explain
-/// (POSIX and Windows "address already in use" texts, or the adapter exiting because
-/// it could not bind). Anything else is a real start failure and is not retried.
-fn is_port_race(err: &IdeError) -> bool {
-    let message = err.message.to_ascii_lowercase();
-    message.contains("address already in use")
-        || message.contains("addrinuse")
-        || message.contains("only one usage of each socket address")
-        || message.contains("exited before accepting connections")
-}
-
 fn pump_lines<R: AsyncRead + Unpin + Send + 'static>(
    stream: R,
    name: String,
@@ -905,102 +674,15 @@ mod tests {

    #[test]
    fn builtins_cover_common_adapters() {
-        for name in ["codelldb", "debugpy", "js-debug", "delve", "netcoredbg", "java-debug", "gdb"] {
+        for name in ["codelldb", "debugpy", "js-debug", "delve", "netcoredbg", "java-debug"] {
            let cfg = builtin(name).unwrap();
            assert!(cfg.install_hint.is_some());
        }
        let delve = resolve(&builtin("delve").unwrap(), PathBuf::from("/"));
        assert_eq!(delve.transport, Transport::Tcp);
-        // GDB's own DAP interpreter over stdio, with the required version in its hint.
-        let gdb = builtin("gdb").unwrap();
-        assert_eq!(gdb.command, "gdb");
-        assert_eq!(gdb.args, ["-i", "dap"]);
-        assert_eq!(gdb.transport, "stdio");
-        assert!(gdb.install_hint.as_deref().is_some_and(|h| h.contains("14")), "{gdb:?}");
-        assert_eq!(default_type("gdb"), Some("gdb"));
        assert!(builtin("nope").is_none());
    }

-    /// The first version number of `gdb --version`'s first line, however the distro decorates it.
-    #[test]
-    fn parses_gdb_versions() {
-        for (out, want) in [
-            ("GNU gdb (GDB) 14.2\nCopyright (C) 2023 Free Software Foundation", Some((14, 2))),
-            ("GNU gdb (GDB) 15.0.50.20240403-0ubuntu1\n", Some((15, 0))),
-            ("GNU gdb (Ubuntu 12.1-0ubuntu1~22.04.2) 12.1", Some((12, 1))),
-            ("GNU gdb (Debian 13.1-3) 13.1", Some((13, 1))),
-            ("GNU gdb (GDB) Fedora Linux 16.3-1.fc41", Some((16, 3))),
-            ("GNU gdb (GDB; SUSE Linux Enterprise 15) 14.2", Some((14, 2))),
-            ("GNU gdb (GDB; SUSE Linux Enterprise 15) 11.1", Some((11, 1))),
-            ("mingw32-gdb13.exe (GDB) 13.2", Some((13, 2))),
-            ("GNU gdb 14", Some((14, 0))),
-            ("no version here", None),
-            ("", None),
-        ] {
-            assert_eq!(parse_gdb_version(out), want, "{out}");
-        }
-    }
-
-    #[tokio::test]
-    async fn gdb_probe_never_executes_a_changed_pinned_program() {
-        let dir = tempfile::tempdir().unwrap();
-        let fake = dir.path().join(if cfg!(windows) { "gdb.cmd" } else { "gdb" });
-        std::fs::write(&fake, "approved").unwrap();
-        let pin = ProgramPin::approve(&fake).unwrap();
-        #[cfg(windows)]
-        std::fs::write(&fake, "@echo off\r\necho ran>probe-ran\r\necho GNU gdb (GDB) 15.1\r\n").unwrap();
-        #[cfg(unix)]
-        {
-            use std::os::unix::fs::PermissionsExt;
-            std::fs::write(&fake, "#!/bin/sh\ntouch probe-ran\necho 'GNU gdb (GDB) 15.1'\n").unwrap();
-            std::fs::set_permissions(&fake, std::fs::Permissions::from_mode(0o755)).unwrap();
-        }
-        let mut spec = resolve(&builtin("gdb").unwrap(), dir.path().to_owned());
-        spec.command = fake.to_string_lossy().into_owned();
-        spec.pinned = Some(pin);
-        let error = ProcessLauncher.launch(spec, None).await.err().expect("changed program is refused");
-        assert_eq!(error.kind, ide_core::error::ErrorKind::PermissionDenied);
-        assert!(!dir.path().join("probe-ran").exists(), "the version probe executed an unapproved program");
-    }
-
-    #[tokio::test]
-    async fn gdb_probe_uses_the_verified_program_and_launch_environment_once() {
-        use tokio::io::AsyncReadExt;
-        let dir = tempfile::tempdir().unwrap();
-        let fake = dir.path().join(if cfg!(windows) { "gdb.cmd" } else { "gdb" });
-        #[cfg(windows)]
-        std::fs::write(&fake, "@echo off\r\nif \"%~1\"==\"--version\" (\r\n echo probe>>probes\r\n echo GNU gdb ^(GDB^) %GDB_TEST_VERSION%\r\n) else (\r\n echo adapter\r\n)\r\n").unwrap();
-        #[cfg(unix)]
-        {
-            use std::os::unix::fs::PermissionsExt;
-            std::fs::write(&fake, "#!/bin/sh\nif [ \"$1\" = --version ]; then\n echo probe >> probes\n echo \"GNU gdb (GDB) $GDB_TEST_VERSION\"\nelse\n echo adapter\nfi\n").unwrap();
-            std::fs::set_permissions(&fake, std::fs::Permissions::from_mode(0o755)).unwrap();
-        }
-        let pin = ProgramPin::approve(&fake).unwrap();
-        for (version, deferred) in [("12.1", false), ("14.2", false), ("15.1", true), ("16.3", false)] {
-            let mut spec = resolve(&builtin("gdb").unwrap(), dir.path().to_owned());
-            // Only the approved path is executable; the symbolic command must never be probed.
-            spec.command = "definitely-not-a-real-binary-openidea".into();
-            spec.pinned = Some(pin.clone());
-            spec.env.push(("GDB_TEST_VERSION".into(), version.into()));
-            let result = ProcessLauncher.launch(spec, None).await;
-            if version == "12.1" {
-                let error = result.err().expect("GDB 12 has no DAP interpreter");
-                assert_eq!(error.kind, ide_core::error::ErrorKind::Unavailable);
-                assert!(error.message.contains("GDB 14 or newer"), "{}", error.message);
-                assert!(error.message.contains("12.1"), "{}", error.message);
-            } else {
-                let mut io = result.unwrap();
-                assert_eq!(io.launch_after_configuration, deferred, "{version}");
-                let mut output = String::new();
-                io.reader.read_to_string(&mut output).await.unwrap();
-                assert_eq!(output.trim(), "adapter");
-                io.child.as_mut().unwrap().wait().await.unwrap();
-            }
-        }
-        assert_eq!(std::fs::read_to_string(dir.path().join("probes")).unwrap().lines().count(), 4);
-    }
-
    #[test]
    fn free_port_is_nonzero() {
        assert_ne!(free_port().unwrap(), 0);
@@ -1084,43 +766,4 @@ mod tests {
        assert_eq!(err.kind, ide_core::error::ErrorKind::Unavailable);
        assert!(err.message.contains("runs inside the Java language server"), "{}", err.message);
    }
-
-    #[test]
-    fn a_browser_launch_gets_a_profile_of_its_project() {
-        let local = Path::new("/data/local");
-        let profile = |args: serde_json::Value, project: &str| {
-            let mut args = args;
-            set_browser_profile_in(&mut args, Path::new(project), local);
-            args.get("userDataDir").cloned()
-        };
-        let chrome = serde_json::json!({ "type": "pwa-chrome", "request": "launch" });
-        let dir = profile(chrome.clone(), "/work/shop").unwrap();
-        let dir = Path::new(dir.as_str().unwrap());
-        assert!(dir.starts_with("/data/local/cache/browser-profiles"), "{dir:?}");
-        assert!(dir.ends_with("chrome"), "{dir:?}");
-        let name = dir.parent().unwrap().file_name().unwrap().to_string_lossy().into_owned();
-        assert!(name.starts_with("shop-") && name.len() == "shop-".len() + 16, "{name}");
-        // The same project again: the same profile. Another folder of that name, or Edge: another one.
-        assert_eq!(profile(chrome.clone(), "/work/shop").unwrap(), dir.to_string_lossy().as_ref());
-        assert_ne!(profile(chrome.clone(), "/other/shop").unwrap(), dir.to_string_lossy().as_ref());
-        let edge = profile(serde_json::json!({ "type": "pwa-msedge", "request": "launch" }), "/work/shop").unwrap();
-        assert!(Path::new(edge.as_str().unwrap()).ends_with("msedge"), "{edge}");
-        // A chosen profile (or the default one, `false`) is kept; Node and attach requests get none.
-        let own = serde_json::json!({ "type": "pwa-chrome", "request": "launch", "userDataDir": false });
-        assert_eq!(profile(own, "/work/shop"), Some(false.into()));
-        assert_eq!(profile(serde_json::json!({ "type": "pwa-node", "request": "launch" }), "/work/shop"), None);
-        assert_eq!(profile(serde_json::json!({ "type": "pwa-chrome", "request": "attach" }), "/work/shop"), None);
-    }
-
-    #[test]
-    fn port_conflicts_are_recognised_for_retry() {
-        let in_use = IdeError::unavailable(
-            "debug adapter exited before accepting connections (exit status: 1)\nbind: address already in use",
-        );
-        assert!(is_port_race(&in_use));
-        assert!(is_port_race(&IdeError::unavailable(
-            "Only one usage of each socket address (protocol/network address/port) is normally permitted."
-        )));
-        assert!(!is_port_race(&IdeError::unavailable("failed to start codelldb: file not found")));
-    }
 }
@@ -1,7 +1,6 @@
 //! Attach to Process: the current user's processes, grouped by the debugger that can
 //! attach to them (IDEA's `XAttachDebuggerProvider`s): JVMs with a JDWP agent, Node,
-//! Python (debugpy injection), .NET (netcoredbg), Go binaries (Delve) and anything else
-//! natively (LLDB).
+//! Python (debugpy injection), Go binaries (Delve) and anything else natively (LLDB).

 use crate::adapter;
 use ide_core::{IdeError, IdeResult};
@@ -15,7 +14,6 @@ pub enum AttachKind {
    Java,
    Node,
    Python,
-    Dotnet,
    Go,
    Native,
 }
@@ -97,29 +95,13 @@ fn file_name(path: &str) -> &str {
    path.rsplit(['/', '\\']).next().unwrap_or(path)
 }

-/// A .NET app: the `dotnet` host, or an apphost next to its `<name>.runtimeconfig.json`.
-pub fn is_dotnet(exe: &str) -> bool {
-    let path = Path::new(exe);
-    let Some(stem) = path.file_stem().and_then(|s| s.to_str()) else { return false };
-    if stem == "dotnet" {
-        return true;
-    }
-    path.is_absolute() && path.with_file_name(format!("{stem}.runtimeconfig.json")).is_file()
-}
-
 fn is_python(name: &str) -> bool {
    let n = name.strip_suffix(".exe").unwrap_or(name);
    n == "Python" || n.strip_prefix("python").is_some_and(|v| v.chars().all(|c| c.is_ascii_digit() || c == '.'))
 }

-/// Classifies a process; `is_dotnet` and `is_go` are asked only for processes no
-/// interpreter claims.
-pub fn classify(
-    p: &RawProcess,
-    is_dotnet: impl Fn(&str) -> bool,
-    is_go: impl Fn(&str) -> bool,
-    native_adapter: &str,
-) -> Option<AttachableProcess> {
+/// Classifies a process; `is_go` is asked only for processes no interpreter claims.
+pub fn classify(p: &RawProcess, is_go: impl Fn(&str) -> bool, native_adapter: &str) -> Option<AttachableProcess> {
    let name = file_name(&p.exe).to_owned();
    let make = |kind, adapter: &str, addr: Option<(Option<String>, u16)>| {
        let (host, port) = match addr {
@@ -147,9 +129,6 @@ pub fn classify(
    if is_python(&name) {
        return make(AttachKind::Python, "debugpy", debugpy_listen(&p.args));
    }
-    if is_dotnet(&p.exe) {
-        return make(AttachKind::Dotnet, "netcoredbg", None);
-    }
    if is_go(&p.exe) {
        return make(AttachKind::Go, "delve", None);
    }
@@ -164,7 +143,7 @@ const GO_SCAN_LIMIT: u64 = 96 << 20;
 pub fn is_go_binary(exe: &str) -> bool {
    use std::io::Read;
    let skip = ["/System/", "/usr/", "/bin/", "/sbin/", "/Library/Apple/", "/Applications/"];
-    if skip.iter().any(|p| exe.starts_with(p)) || is_windows_system(exe) || !Path::new(exe).is_absolute() {
+    if skip.iter().any(|p| exe.starts_with(p)) || !Path::new(exe).is_absolute() {
        return false;
    }
    let Ok(file) = std::fs::File::open(exe) else { return false };
@@ -186,17 +165,6 @@ pub fn is_go_binary(exe: &str) -> bool {
    }
 }

-/// Windows' own and installed programs (`C:\Windows\…`, `C:\Program Files…`), like the
-/// system locations skipped on Unix.
-fn is_windows_system(exe: &str) -> bool {
-    let lower = exe.to_ascii_lowercase();
-    lower.get(1..).is_some_and(|rest| {
-        rest.starts_with(":\\windows\\")
-            || rest.starts_with(":\\program files\\")
-            || rest.starts_with(":\\program files (x86)\\")
-    })
-}
-
 /// The current user's processes (without this one).
 #[cfg(unix)]
 pub fn list_processes() -> IdeResult<Vec<RawProcess>> {
@@ -213,7 +181,7 @@ pub fn list_processes() -> IdeResult<Vec<RawProcess>> {
        let (pid, rest) = line.split_once(char::is_whitespace)?;
        Some((pid.parse().ok()?, rest.trim().to_owned()))
    };
-    // `comm` is the executable path as started on macOS; on Linux it is truncated, so read /proc.
+    // `comm` is the executable path on macOS; on Linux it is truncated, so read /proc.
    let exes: HashMap<u32, String> =
        if cfg!(target_os = "linux") { HashMap::new() } else { ps("pid=,comm=")?.lines().filter_map(split).collect() };
    let me = std::process::id();
@@ -222,8 +190,9 @@ pub fn list_processes() -> IdeResult<Vec<RawProcess>> {
        .filter_map(split)
        .filter(|(pid, _)| *pid != me)
        .map(|(pid, args)| {
-            let exe = exe_path(pid)
-                .or_else(|| exes.get(&pid).cloned())
+            let exe = exes
+                .get(&pid)
+                .cloned()
                .or_else(|| std::fs::read_link(format!("/proc/{pid}/exe")).ok().map(|p| p.display().to_string()))
                .unwrap_or_else(|| args.split_whitespace().next().unwrap_or_default().to_owned());
            RawProcess { pid, exe, args }
@@ -231,134 +200,9 @@ pub fn list_processes() -> IdeResult<Vec<RawProcess>> {
        .collect())
 }

-/// The processes this user may open (without this one): system and other users'
-/// processes refuse `PROCESS_QUERY_LIMITED_INFORMATION` and are left out.
-#[cfg(windows)]
+#[cfg(not(unix))]
 pub fn list_processes() -> IdeResult<Vec<RawProcess>> {
-    windows_processes::list()
-}
-
-#[cfg(windows)]
-mod windows_processes {
-    use super::RawProcess;
-    use ide_core::{IdeError, IdeResult};
-    use std::os::windows::io::{AsRawHandle, FromRawHandle, OwnedHandle};
-    use windows_sys::Wdk::System::Threading::{NtQueryInformationProcess, ProcessCommandLineInformation};
-    use windows_sys::Win32::Foundation::{INVALID_HANDLE_VALUE, UNICODE_STRING};
-    use windows_sys::Win32::System::Diagnostics::ToolHelp::{
-        CreateToolhelp32Snapshot, PROCESSENTRY32W, Process32FirstW, Process32NextW, TH32CS_SNAPPROCESS,
-    };
-    use windows_sys::Win32::System::Threading::{
-        OpenProcess, PROCESS_NAME_WIN32, PROCESS_QUERY_LIMITED_INFORMATION, QueryFullProcessImageNameW,
-    };
-
-    pub fn list() -> IdeResult<Vec<RawProcess>> {
-        let me = std::process::id();
-        Ok(pids()?
-            .into_iter()
-            .filter(|&pid| pid != 0 && pid != me)
-            .filter_map(|pid| {
-                // SAFETY: plain call; a non-null result is a process handle owned here.
-                let handle = unsafe { OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, 0, pid) };
-                if handle.is_null() {
-                    return None;
-                }
-                // SAFETY: as above.
-                let process = unsafe { OwnedHandle::from_raw_handle(handle) };
-                let exe = image_path(&process)?;
-                let args = command_line(&process).unwrap_or_else(|| exe.clone());
-                Some(RawProcess { pid, exe, args })
-            })
-            .collect())
-    }
-
-    fn pids() -> IdeResult<Vec<u32>> {
-        let mut out = Vec::new();
-        // SAFETY: a snapshot handle owned here and an entry sized as the API requires.
-        unsafe {
-            let snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-            if snapshot.is_null() || snapshot == INVALID_HANDLE_VALUE {
-                return Err(IdeError::unavailable(format!(
-                    "cannot list processes: {}",
-                    std::io::Error::last_os_error()
-                )));
-            }
-            let snapshot = OwnedHandle::from_raw_handle(snapshot);
-            let mut entry = PROCESSENTRY32W { dwSize: size_of::<PROCESSENTRY32W>() as u32, ..Default::default() };
-            let mut more = Process32FirstW(snapshot.as_raw_handle(), &mut entry);
-            while more != 0 {
-                out.push(entry.th32ProcessID);
-                more = Process32NextW(snapshot.as_raw_handle(), &mut entry);
-            }
-        }
-        Ok(out)
-    }
-
-    fn image_path(process: &OwnedHandle) -> Option<String> {
-        let mut buf = vec![0u16; 32 * 1024];
-        let mut len = buf.len() as u32;
-        // SAFETY: a live process handle with query access; `len` is the buffer's capacity.
-        let ok = unsafe {
-            QueryFullProcessImageNameW(process.as_raw_handle(), PROCESS_NAME_WIN32, buf.as_mut_ptr(), &mut len)
-        };
-        (ok != 0).then(|| String::from_utf16_lossy(&buf[..len as usize]))
-    }
-
-    /// The command line (Windows 8.1+), read with the same limited query access.
-    fn command_line(process: &OwnedHandle) -> Option<String> {
-        let mut size = 0u32;
-        // SAFETY: a size query with no buffer; it fails and reports the size it needs.
-        unsafe {
-            NtQueryInformationProcess(
-                process.as_raw_handle(),
-                ProcessCommandLineInformation,
-                std::ptr::null_mut(),
-                0,
-                &mut size,
-            )
-        };
-        if (size as usize) < size_of::<UNICODE_STRING>() {
-            return None;
-        }
-        // u64 elements keep the UNICODE_STRING header aligned.
-        let mut buf = vec![0u64; (size as usize).div_ceil(8)];
-        // SAFETY: a buffer of at least `size` bytes.
-        let status = unsafe {
-            NtQueryInformationProcess(
-                process.as_raw_handle(),
-                ProcessCommandLineInformation,
-                buf.as_mut_ptr().cast(),
-                size,
-                &mut size,
-            )
-        };
-        if status < 0 {
-            return None;
-        }
-        // SAFETY: on success the buffer starts with a UNICODE_STRING whose text lies inside it.
-        let text = unsafe {
-            let s = &*buf.as_ptr().cast::<UNICODE_STRING>();
-            if s.Buffer.is_null() {
-                return None;
-            }
-            std::slice::from_raw_parts(s.Buffer, usize::from(s.Length) / 2)
-        };
-        Some(String::from_utf16_lossy(text))
-    }
-}
-
-/// The full executable path: `comm` keeps a relative path a process was started with.
-#[cfg(target_os = "macos")]
-fn exe_path(pid: u32) -> Option<String> {
-    let mut buf = vec![0u8; libc::PROC_PIDPATHINFO_MAXSIZE as usize];
-    // SAFETY: the buffer holds `PROC_PIDPATHINFO_MAXSIZE` bytes, as the call requires.
-    let n = unsafe { libc::proc_pidpath(i32::try_from(pid).ok()?, buf.as_mut_ptr().cast(), buf.len() as u32) };
-    (n > 0).then(|| String::from_utf8_lossy(&buf[..n as usize]).into_owned())
-}
-
-#[cfg(all(unix, not(target_os = "macos")))]
-fn exe_path(_pid: u32) -> Option<String> {
-    None
+    Err(IdeError::unavailable("Attach to Process is not supported on this platform yet"))
 }

 /// Node's default inspector port, which `SIGUSR1` opens.
@@ -400,29 +244,11 @@ pub fn attachable_processes() -> IdeResult<Vec<AttachableProcess>> {
    let cwd = std::env::temp_dir();
    let native = if adapter::resolve_binary("codelldb", &cwd).is_some() { "codelldb" } else { "lldb-dap" };
    let mut out: Vec<AttachableProcess> =
-        list_processes()?.iter().filter_map(|p| classify(p, is_dotnet, is_go_binary, native)).collect();
+        list_processes()?.iter().filter_map(|p| classify(p, is_go_binary, native)).collect();
    out.sort_by(|a, b| a.kind.cmp(&b.kind).then_with(|| a.name.to_lowercase().cmp(&b.name.to_lowercase())));
    Ok(out)
 }

-/// The Attach to Process candidates among the processes `root` started, parents first.
-/// Blocking, like [`attachable_processes`].
-pub fn attachable_descendants(root: u32) -> IdeResult<Vec<AttachableProcess>> {
-    let order = ide_core::process::descendants(root);
-    if order.is_empty() {
-        return Ok(Vec::new());
-    }
-    let cwd = std::env::temp_dir();
-    let native = if adapter::resolve_binary("codelldb", &cwd).is_some() { "codelldb" } else { "lldb-dap" };
-    let mut out: Vec<AttachableProcess> = list_processes()?
-        .iter()
-        .filter(|p| order.contains(&p.pid))
-        .filter_map(|p| classify(p, is_dotnet, is_go_binary, native))
-        .collect();
-    out.sort_by_key(|p| order.iter().position(|&pid| pid == p.pid));
-    Ok(out)
-}
-
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -432,30 +258,7 @@ mod tests {
    }

    fn kind(exe: &str, args: &str) -> Option<(AttachKind, Option<u16>)> {
-        classify(&raw(exe, args), |e| e.ends_with("/Api"), |e| e.ends_with("/gosrv"), "codelldb")
-            .map(|p| (p.kind, p.port))
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn a_runs_candidates_are_the_processes_it_started() {
-        let mut child = std::process::Command::new("sh").args(["-c", "sleep 30; true"]).spawn().unwrap();
-        let deadline = std::time::Instant::now() + std::time::Duration::from_secs(10);
-        let found = loop {
-            let found = attachable_descendants(child.id()).unwrap();
-            if !found.is_empty() || std::time::Instant::now() > deadline {
-                break found;
-            }
-            std::thread::sleep(std::time::Duration::from_millis(50));
-        };
-        for p in &found {
-            let _ = std::process::Command::new("kill").arg(p.pid.to_string()).status();
-        }
-        child.kill().unwrap();
-        child.wait().unwrap();
-        assert!(found.iter().all(|p| p.pid != child.id()), "{found:?}");
-        assert!(found.iter().any(|p| p.name == "sleep" && p.kind == AttachKind::Native), "{found:?}");
-        assert!(attachable_descendants(u32::MAX - 1).unwrap().is_empty());
+        classify(&raw(exe, args), |e| e.ends_with("/gosrv"), "codelldb").map(|p| (p.kind, p.port))
    }

    #[test]
@@ -489,37 +292,11 @@ mod tests {
            kind("/Library/Frameworks/Python.framework/Versions/3.12/Resources/Python.app/Contents/MacOS/Python", "x"),
            Some((AttachKind::Python, None))
        );
-        assert_eq!(kind("/home/me/Api", "./Api"), Some((AttachKind::Dotnet, None)));
        assert_eq!(kind("/home/me/gosrv", "./gosrv"), Some((AttachKind::Go, None)));
        assert_eq!(kind("/home/me/a.out", "./a.out"), Some((AttachKind::Native, None)));
        assert!(!is_python("pythonista"));
    }

-    #[test]
-    fn detects_dotnet_hosts_and_apphosts() {
-        let dir = std::env::temp_dir().join(format!("openidea-attach-dotnet-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let app = dir.join("Api");
-        std::fs::write(&app, b"").unwrap();
-        std::fs::write(dir.join("Api.runtimeconfig.json"), b"{}").unwrap();
-        let tool = dir.join("tool");
-        std::fs::write(&tool, b"").unwrap();
-        assert!(is_dotnet(app.to_str().unwrap()));
-        assert!(!is_dotnet(tool.to_str().unwrap()));
-        assert!(is_dotnet("/usr/local/share/dotnet/dotnet"));
-        assert!(is_dotnet("dotnet"));
-        assert!(!is_dotnet("Api"));
-        std::fs::remove_dir_all(&dir).unwrap();
-    }
-
-    #[test]
-    fn skips_windows_system_programs() {
-        assert!(is_windows_system(r"C:\Windows\System32\svchost.exe"));
-        assert!(is_windows_system(r"c:\program files (x86)\App\app.exe"));
-        assert!(!is_windows_system(r"D:\src\srv\srv.exe"));
-        assert!(!is_windows_system("/usr/bin/true"));
-    }
-
    #[test]
    fn detects_go_binaries_by_buildinfo() {
        let dir = std::env::temp_dir().join(format!("openidea-attach-{}", std::process::id()));
@@ -246,7 +246,13 @@ impl Connection {

 fn dispatch(inner: &Inner, incoming: &mpsc::UnboundedSender<Incoming>, body: &[u8]) {
    tracing::trace!(target: "ide_dap::wire", "<-- {}", String::from_utf8_lossy(body));
-    let Some(msg) = parse_message(body) else { return };
+    let msg: Value = match serde_json::from_slice(body) {
+        Ok(v) => v,
+        Err(e) => {
+            tracing::warn!("dap: unparsable message: {e}");
+            return;
+        }
+    };
    match msg.get("type").and_then(Value::as_str) {
        Some("response") => {
            let Some(request_seq) = msg.get("request_seq").and_then(Value::as_i64) else {
@@ -279,25 +285,6 @@ fn dispatch(inner: &Inner, incoming: &mpsc::UnboundedSender<Incoming>, body: &[u
    }
 }

-/// A message body as JSON. Some adapters pass the debuggee's output through as it was
-/// written: netcoredbg on Windows embeds console output in the ANSI code page (GBK on a
-/// Chinese system), which isn't valid UTF-8 and made the whole `output` event unparsable,
-/// so every line with non-ASCII text went missing. Such a body is decoded like other tool
-/// output (UTF-8, else the system code page) before parsing.
-fn parse_message(body: &[u8]) -> Option<Value> {
-    let error = match serde_json::from_slice(body) {
-        Ok(v) => return Some(v),
-        Err(e) => e,
-    };
-    if std::str::from_utf8(body).is_err()
-        && let Ok(v) = serde_json::from_str(&ide_core::output_encoding::decode_tool_output(body))
-    {
-        return Some(v);
-    }
-    tracing::warn!("dap: unparsable message: {error}");
-    None
-}
-
 /// `message`, or the formatted `body.error` (`{format, variables}`) when present.
 fn error_message(msg: &Value) -> String {
    if let Some(err) = msg.pointer("/body/error")
@@ -319,22 +306,6 @@ fn error_message(msg: &Value) -> String {
 mod tests {
    use super::*;

-    #[test]
-    fn parses_output_events_with_non_utf8_text() {
-        // "中文" in GBK inside an output event, as netcoredbg sends it on a Chinese Windows.
-        let mut body = br#"{"seq":5,"type":"event","event":"output","body":{"category":"stdout","output":""#.to_vec();
-        body.extend_from_slice(&[0xd6, 0xd0, 0xce, 0xc4]);
-        body.extend_from_slice(br#"\n"}}"#);
-        let msg = parse_message(&body).expect("parsed");
-        assert_eq!(msg["event"], "output");
-        let output = msg["body"]["output"].as_str().unwrap();
-        assert!(output.ends_with('\n'));
-        // Off Windows (UTF-8 code page) the bytes decode lossily; the line still arrives.
-        #[cfg(not(windows))]
-        assert!(output.starts_with(char::REPLACEMENT_CHARACTER));
-        assert!(parse_message(b"{not json").is_none());
-    }
-
    #[test]
    fn formats_structured_errors() {
        let msg =
@@ -342,16 +313,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"));
-    }
 }
@@ -12,35 +12,6 @@ use tokio::net::{TcpListener, TcpStream};
 /// How long the relay waits for java-debug to attach once the JVM is connected.
 const ATTACH_TIMEOUT: Duration = Duration::from_secs(60);

-/// Loopback ports relaying a connected JVM, while their relay runs.
-static RELAY_PORTS: std::sync::Mutex<Vec<u16>> = std::sync::Mutex::new(Vec::new());
-
-fn relay_ports() -> std::sync::MutexGuard<'static, Vec<u16>> {
-    RELAY_PORTS.lock().unwrap_or_else(std::sync::PoisonError::into_inner)
-}
-
-/// Whether `port` is a relay of [`listen_for_jvm`]: a session attaching to it debugs a JVM that
-/// connected to the IDE, so the JVM has no JDWP listener the memory view could find it by.
-pub(crate) fn is_listen_relay(port: u16) -> bool {
-    relay_ports().contains(&port)
-}
-
-/// Registers a relay port for as long as it lives.
-struct RelayPort(u16);
-
-impl RelayPort {
-    fn new(port: u16) -> Self {
-        relay_ports().push(port);
-        Self(port)
-    }
-}
-
-impl Drop for RelayPort {
-    fn drop(&mut self) {
-        relay_ports().retain(|&p| p != self.0);
-    }
-}
-
 /// The address to listen on for `host`: the interface it names, or every interface when
 /// it is not one of this machine's (a DNS name or a NAT address the JVM connects to).
 async fn bind(host: &str, port: u16) -> IdeResult<TcpListener> {
@@ -69,11 +40,11 @@ pub async fn listen_for_jvm(host: &str, port: u16, cancel: CancellationToken) ->
    let _ = jvm.set_nodelay(true);
    let relay = TcpListener::bind(("127.0.0.1", 0)).await?;
    let local = relay.local_addr()?.port();
-    tokio::spawn(relay_one(relay, jvm, RelayPort::new(local)));
+    tokio::spawn(relay_one(relay, jvm));
    Ok(local)
 }

-async fn relay_one(relay: TcpListener, mut jvm: TcpStream, _registered: RelayPort) {
+async fn relay_one(relay: TcpListener, mut jvm: TcpStream) {
    let debugger = match tokio::time::timeout(ATTACH_TIMEOUT, relay.accept()).await {
        Ok(Ok((s, _))) => s,
        _ => return,
@@ -87,64 +58,22 @@ async fn relay_one(relay: TcpListener, mut jvm: TcpStream, _registered: RelayPor
 }

 #[cfg(test)]
-pub(crate) mod tests {
+mod tests {
    use super::*;
    use tokio::io::{AsyncReadExt, AsyncWriteExt};

-    /// A remote JVM (`server=n`) connected to [`listen_for_jvm`], and the relay port. A port
-    /// picked by binding to 0 can be taken by a parallel test before `listen_for_jvm` binds it,
-    /// so a failed listen is retried on a fresh one.
-    pub(crate) async fn connected_jvm() -> (TcpStream, u16) {
-        for _ in 0..20 {
-            let port = TcpListener::bind(("127.0.0.1", 0)).await.unwrap().local_addr().unwrap().port();
-            if let Some(connected) = jvm_on(port).await {
-                return connected;
-            }
-        }
-        panic!("listen_for_jvm never accepted a JVM");
-    }
-
-    /// One attempt of [`connected_jvm`]; `None` when the port turned out to be taken.
-    async fn jvm_on(port: u16) -> Option<(TcpStream, u16)> {
-        let mut waiting = tokio::spawn(listen_for_jvm("127.0.0.1", port, CancellationToken::new()));
-        let mut jvm = None;
-        for _ in 0..100 {
-            // A listen that failed to bind leaves nothing to connect to.
-            if waiting.is_finished() {
-                break;
-            }
-            // macOS does not refuse a connect to a port a socket holds without listening: the
-            // SYN goes unanswered until the connect times out.
-            let connect = TcpStream::connect(("127.0.0.1", port));
-            if let Ok(Ok(s)) = tokio::time::timeout(Duration::from_secs(1), connect).await {
-                jvm = Some(s);
-                break;
-            }
-            tokio::time::sleep(Duration::from_millis(20)).await;
-        }
-        // A connection to another test's listener never reaches `listen_for_jvm`.
-        let relay = tokio::time::timeout(Duration::from_secs(2), &mut waiting).await;
-        if let (Some(jvm), Ok(Ok(Ok(relay)))) = (jvm, relay) {
-            return Some((jvm, relay));
-        }
-        waiting.abort();
-        None
-    }
-
-    #[tokio::test]
-    async fn a_port_another_socket_holds_is_given_up() {
-        // Bound but not listening, as a parallel test's outgoing connection holds its local port.
-        let held = tokio::net::TcpSocket::new_v4().unwrap();
-        held.bind(([127, 0, 0, 1], 0).into()).unwrap();
-        let port = held.local_addr().unwrap().port();
-        let attempt = tokio::time::timeout(Duration::from_secs(5), jvm_on(port)).await;
-        assert!(matches!(attempt, Ok(None)), "an attempt on a taken port gives up instead of waiting forever");
-    }
-
    #[tokio::test]
    async fn relays_the_jdwp_handshake_both_ways() {
+        let port = TcpListener::bind(("127.0.0.1", 0)).await.unwrap().local_addr().unwrap().port();
+        let waiting = tokio::spawn(listen_for_jvm("127.0.0.1", port, CancellationToken::new()));
        // The remote JVM (`server=n`) connects to the IDE.
-        let (mut jvm, local) = connected_jvm().await;
+        let mut jvm = loop {
+            if let Ok(s) = TcpStream::connect(("127.0.0.1", port)).await {
+                break s;
+            }
+            tokio::time::sleep(Duration::from_millis(20)).await;
+        };
+        let local = waiting.await.unwrap().unwrap();
        // java-debug attaches to the relay and starts the handshake.
        let mut debugger = TcpStream::connect(("127.0.0.1", local)).await.unwrap();
        debugger.write_all(b"JDWP-Handshake").await.unwrap();
@@ -156,22 +85,6 @@ pub(crate) mod tests {
        assert_eq!(&buf, b"JDWP-Handshake");
    }

-    #[tokio::test]
-    async fn relay_port_is_known_while_the_relay_runs() {
-        let (jvm, local) = connected_jvm().await;
-        assert!(is_listen_relay(local));
-
-        let debugger = TcpStream::connect(("127.0.0.1", local)).await.unwrap();
-        drop((jvm, debugger));
-        for _ in 0..200 {
-            if !is_listen_relay(local) {
-                return;
-            }
-            tokio::time::sleep(Duration::from_millis(10)).await;
-        }
-        panic!("relay port {local} still registered after the relay ended");
-    }
-
    #[tokio::test]
    async fn waiting_is_cancellable() {
        let cancel = CancellationToken::new();
@@ -1,528 +0,0 @@
-//! Replacing the responses a debugged page receives. js-debug hands out a WebSocket that
-//! speaks the browser's own protocol (`requestCDPProxy`); over it the browser is told to hold
-//! the requests whose URL matches a rule (`Fetch.enable`) and each held request is answered
-//! here, with the rule's response or by letting it through.
-//!
-//! A held request stays held until it is answered, so interception is always switched off
-//! (`Fetch.disable`) before the connection is given up: a page whose requests nobody answers hangs.
-
-use crate::{DebugManager, DebugSessionId, REQUEST_TIMEOUT, js_debug};
-use base64::Engine;
-use futures::{SinkExt, StreamExt};
-use ide_core::{IdeError, IdeResult};
-use serde::{Deserialize, Serialize};
-use serde_json::{Value, json};
-use specta::Type;
-use std::collections::HashMap;
-use tokio::sync::{oneshot, watch};
-use tokio_tungstenite::tungstenite::{Message, http::StatusCode};
-
-/// A response given in place of the server's to every request whose URL contains `url_contains`.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct JsResponseRule {
-    pub url_contains: String,
-    pub status: u16,
-    pub content_type: String,
-    pub body: String,
-}
-
-/// The browser's URL pattern (`*` any text, `?` one character, `\` escapes) for "contains `part`".
-pub(crate) fn url_pattern(part: &str) -> String {
-    let mut pattern = String::with_capacity(part.len() + 2);
-    pattern.push('*');
-    for c in part.chars() {
-        if matches!(c, '*' | '?' | '\\') {
-            pattern.push('\\');
-        }
-        pattern.push(c);
-    }
-    pattern.push('*');
-    pattern
-}
-
-pub(crate) fn rule_for<'a>(rules: &'a [JsResponseRule], url: &str) -> Option<&'a JsResponseRule> {
-    rules.iter().find(|rule| url.contains(&rule.url_contains))
-}
-
-/// What to tell the browser about a request it holds: the first matching rule's response, or
-/// to send the request on. Every held request gets one of the two.
-pub(crate) fn answer(held: &Value, rules: &[JsResponseRule]) -> (&'static str, Value) {
-    let request_id = held.get("requestId").and_then(Value::as_str).unwrap_or_default();
-    let url = held.pointer("/request/url").and_then(Value::as_str).unwrap_or_default();
-    let Some(rule) = rule_for(rules, url) else {
-        return ("Fetch.continueRequest", json!({ "requestId": request_id }));
-    };
-    let header = |name: &str, value: &str| json!({ "name": name, "value": value });
-    // A page on another origin only reads a response that names its origin. The server would
-    // say so; the response given in its place has to.
-    let mut cross_origin = Vec::new();
-    if let Some(origin) = request_header(held, "Origin") {
-        cross_origin.push(header("Access-Control-Allow-Origin", origin));
-        cross_origin.push(header("Access-Control-Allow-Credentials", "true"));
-    }
-    let method = held.pointer("/request/method").and_then(Value::as_str).unwrap_or_default();
-    // The browser's question before such a request: allowed here, the server may not exist.
-    if method == "OPTIONS"
-        && let Some(asked) = request_header(held, "Access-Control-Request-Method")
-    {
-        cross_origin.push(header("Access-Control-Allow-Methods", asked));
-        if let Some(asked) = request_header(held, "Access-Control-Request-Headers") {
-            cross_origin.push(header("Access-Control-Allow-Headers", asked));
-        }
-        let allowed = json!({
-            "requestId": request_id,
-            "responseCode": 204,
-            "responsePhrase": phrase(204),
-            "responseHeaders": cross_origin,
-        });
-        return ("Fetch.fulfillRequest", allowed);
-    }
-    let mut headers = vec![header("Content-Type", &rule.content_type)];
-    headers.extend(cross_origin);
-    let replaced = json!({
-        "requestId": request_id,
-        "responseCode": rule.status,
-        "responsePhrase": phrase(rule.status),
-        "responseHeaders": headers,
-        "body": base64::engine::general_purpose::STANDARD.encode(rule.body.as_bytes()),
-    });
-    ("Fetch.fulfillRequest", replaced)
-}
-
-/// A header of the held request; the browser reports names as the page wrote them.
-fn request_header<'a>(held: &'a Value, name: &str) -> Option<&'a str> {
-    held.pointer("/request/headers")?.as_object()?.iter().find(|(key, _)| key.eq_ignore_ascii_case(name))?.1.as_str()
-}
-
-/// The browser refuses a response without a phrase when it has none of its own for the status.
-fn phrase(status: u16) -> &'static str {
-    StatusCode::from_u16(status).ok().and_then(|status| status.canonical_reason()).unwrap_or("Unknown")
-}
-
-fn interception(rules: &[JsResponseRule]) -> Value {
-    let patterns: Vec<Value> = rules
-        .iter()
-        .map(|rule| json!({ "urlPattern": url_pattern(&rule.url_contains), "requestStage": "Request" }))
-        .collect();
-    json!({ "patterns": patterns })
-}
-
-/// Applies `rules` to the page behind js-debug's CDP proxy at `ws_url` until their sender is
-/// dropped (the session is gone) or the proxy closes the connection. The browser holds
-/// requests only while there are rules. `ready` hears whether the proxy reports held
-/// requests at all; nothing is held before it has agreed to.
-pub(crate) async fn serve(
-    ws_url: String,
-    mut rules: watch::Receiver<Vec<JsResponseRule>>,
-    ready: oneshot::Sender<Result<(), String>>,
-) {
-    let socket = match tokio_tungstenite::connect_async(ws_url.as_str()).await {
-        Ok((socket, _)) => socket,
-        Err(e) => {
-            let _ = ready.send(Err(e.to_string()));
-            return;
-        }
-    };
-    let (mut write, mut read) = socket.split();
-    let mut last_id = 0u64;
-    let mut call = |method: &str, params: Value| {
-        last_id += 1;
-        (last_id, Message::text(json!({ "id": last_id, "method": method, "params": params }).to_string()))
-    };
-
-    let (subscription, subscribe) = call("JsDebug.subscribe", json!({ "events": ["Fetch.requestPaused"] }));
-    let subscribed = tokio::time::timeout(REQUEST_TIMEOUT, async {
-        write.send(subscribe).await.map_err(|e| e.to_string())?;
-        loop {
-            let reply = read.next().await.ok_or("the connection closed")?.map_err(|e| e.to_string())?;
-            let Some(reply) = reply.to_text().ok().and_then(|text| serde_json::from_str::<Value>(text).ok()) else {
-                continue;
-            };
-            if reply.get("id").and_then(Value::as_u64) != Some(subscription) {
-                continue;
-            }
-            break match reply.get("error") {
-                Some(error) => Err(error.get("message").and_then(Value::as_str).unwrap_or("refused").to_owned()),
-                None => Ok(()),
-            };
-        }
-    })
-    .await
-    .unwrap_or_else(|_| Err("no answer".to_owned()));
-    if let Err(why) = subscribed {
-        let _ = ready.send(Err(why));
-        let _ = write.close().await;
-        return;
-    }
-    let _ = ready.send(Ok(()));
-
-    let mut current = rules.borrow_and_update().clone();
-    let mut holding = !current.is_empty();
-    if holding && write.send(call("Fetch.enable", interception(&current)).1).await.is_err() {
-        return;
-    }
-    // The request each sent replacement is for, by command id, until the browser has taken it.
-    let mut replacing: HashMap<u64, String> = HashMap::new();
-    loop {
-        tokio::select! {
-            changed = rules.changed() => {
-                if changed.is_err() {
-                    break;
-                }
-                current = rules.borrow_and_update().clone();
-                let (_, command) = match (current.is_empty(), holding) {
-                    (true, false) => continue,
-                    (true, true) => call("Fetch.disable", json!({})),
-                    (false, _) => call("Fetch.enable", interception(&current)),
-                };
-                holding = !current.is_empty();
-                if write.send(command).await.is_err() {
-                    return;
-                }
-            }
-            message = read.next() => {
-                // The proxy closed (the page or the session ended): nothing is held any more.
-                let Some(Ok(message)) = message else { return };
-                let Ok(text) = message.to_text() else { continue };
-                let Ok(message) = serde_json::from_str::<Value>(text) else { continue };
-                if let Some(id) = message.get("id").and_then(Value::as_u64) {
-                    // The browser did not take the replacement: let the request through, or
-                    // it stays held and the page waits for it.
-                    if let Some(request_id) = replacing.remove(&id)
-                        && message.get("error").is_some()
-                    {
-                        let (_, go_on) = call("Fetch.continueRequest", json!({ "requestId": request_id }));
-                        if write.send(go_on).await.is_err() {
-                            return;
-                        }
-                    }
-                    continue;
-                }
-                if message.get("method").and_then(Value::as_str) != Some("Fetch.requestPaused") {
-                    continue;
-                }
-                let Some(held) = message.get("params") else { continue };
-                let Some(request_id) = held.get("requestId").and_then(Value::as_str) else { continue };
-                let (method, params) = answer(held, &current);
-                let (id, command) = call(method, params);
-                if method == "Fetch.fulfillRequest" {
-                    replacing.insert(id, request_id.to_owned());
-                }
-                if write.send(command).await.is_err() {
-                    return;
-                }
-            }
-        }
-    }
-    if holding {
-        let _ = write.send(call("Fetch.disable", json!({})).1).await;
-    }
-    let _ = write.close().await;
-}
-
-impl DebugManager {
-    /// Makes `rules` the page's response rules; none switches the replacing off. The first
-    /// rules of a session open the connection to js-debug's CDP proxy, later ones go over it.
-    /// An error means the rules are not applied.
-    pub async fn js_set_response_overrides(&self, s: DebugSessionId, rules: Vec<JsResponseRule>) -> IdeResult<()> {
-        let session = self.session(s)?;
-        if !js_debug::is_page(&session) {
-            return Err(IdeError::unavailable("this debug session is not a page in a browser"));
-        }
-        // Held to the end: two callers at once would each open a connection.
-        let mut applied = session.js_overrides.lock().await;
-        if applied.as_ref().is_some_and(|sender| sender.send(rules.clone()).is_ok()) {
-            return Ok(());
-        }
-        // No connection yet, or the proxy closed it.
-        applied.take();
-        if rules.is_empty() {
-            return Ok(());
-        }
-        let refused =
-            |why: String| IdeError::unavailable(format!("the JavaScript debugger has no browser connection: {why}"));
-        if !js_debug::launched(&session).await {
-            return Err(refused("the page's debug session did not finish starting".into()));
-        }
-        let proxy = session
-            .conn
-            .request_timeout("requestCDPProxy", json!({}), REQUEST_TIMEOUT)
-            .await
-            .map_err(|e| refused(e.to_string()))?;
-        let (Some(host), Some(port)) =
-            (proxy.get("host").and_then(Value::as_str), proxy.get("port").and_then(Value::as_u64))
-        else {
-            return Err(refused("no address".into()));
-        };
-        let path = proxy.get("path").and_then(Value::as_str).unwrap_or_default();
-        let (sender, receiver) = watch::channel(rules);
-        let (ready, is_ready) = oneshot::channel();
-        tokio::spawn(serve(format!("ws://{host}:{port}{path}"), receiver, ready));
-        match is_ready.await {
-            Ok(Ok(())) => {
-                *applied = Some(sender);
-                Ok(())
-            }
-            Ok(Err(why)) => Err(refused(why)),
-            Err(_) => Err(refused("no answer".into())),
-        }
-    }
-}
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use super::*;
-    use futures::{SinkExt, StreamExt};
-    use serde_json::json;
-    use tokio::sync::mpsc;
-    use tokio_tungstenite::tungstenite::Message;
-
-    pub(crate) fn rule(url_contains: &str, status: u16, body: &str) -> JsResponseRule {
-        JsResponseRule {
-            url_contains: url_contains.into(),
-            status,
-            content_type: "application/json".into(),
-            body: body.into(),
-        }
-    }
-
-    #[test]
-    fn a_part_of_a_url_becomes_a_pattern_that_matches_it_anywhere() {
-        assert_eq!(url_pattern("api/items"), "*api/items*");
-        // The pattern's own wildcards and escape character are taken literally.
-        assert_eq!(url_pattern(r"a*b?c\d"), r"*a\*b\?c\\d*");
-    }
-
-    #[test]
-    fn the_first_rule_whose_text_is_in_the_url_answers() {
-        let rules = [rule("api/items", 201, "{\"a\":\"é\"}"), rule("api", 500, "later")];
-        assert_eq!(rule_for(&rules, "http://h/api/items?x=1").map(|r| r.status), Some(201));
-        assert_eq!(rule_for(&rules, "http://h/api/users").map(|r| r.status), Some(500));
-        assert!(rule_for(&rules, "http://h/logo.png").is_none());
-
-        let (command, params) = answer(&held("7", "http://h/api/items")["params"], &rules);
-        assert_eq!(command, "Fetch.fulfillRequest");
-        assert_eq!(
-            params,
-            json!({
-                "requestId": "7",
-                "responseCode": 201,
-                "responsePhrase": "Created",
-                "responseHeaders": [{ "name": "Content-Type", "value": "application/json" }],
-                // base64 of the UTF-8 text `{"a":"é"}`
-                "body": "eyJhIjoiw6kifQ==",
-            })
-        );
-        // A request the browser held that no rule is for goes on to the network.
-        assert_eq!(
-            answer(&held("8", "http://h/logo.png")["params"], &rules),
-            ("Fetch.continueRequest", json!({ "requestId": "8" }))
-        );
-    }
-
-    #[test]
-    fn a_status_the_browser_has_no_phrase_for_is_given_one() {
-        // The browser refuses a response whose status it cannot name.
-        let (_, params) = answer(&held("1", "http://h/api")["params"], &[rule("api", 419, "")]);
-        assert_eq!((&params["responseCode"], &params["responsePhrase"]), (&json!(419), &json!("Unknown")));
-    }
-
-    fn header<'a>(params: &'a Value, name: &str) -> Option<&'a str> {
-        params["responseHeaders"].as_array()?.iter().find(|h| h["name"] == name)?["value"].as_str()
-    }
-
-    #[test]
-    fn a_replaced_response_passes_the_pages_cross_origin_check() {
-        let rules = [rule("api/items", 200, "[]")];
-        let from_page = |method: &str, headers: Value| json!({ "requestId": "3", "request": { "url": "http://localhost:8080/api/items", "method": method, "headers": headers } });
-        // A page on another origin: the response names that origin, as the real server would.
-        let (_, params) = answer(&from_page("GET", json!({ "origin": "http://localhost:5173" })), &rules);
-        assert_eq!(header(&params, "Access-Control-Allow-Origin"), Some("http://localhost:5173"));
-        assert_eq!(header(&params, "Access-Control-Allow-Credentials"), Some("true"));
-        assert_eq!(params["body"], "W10=");
-
-        // The browser's question before such a request is answered too: the server may not exist.
-        let preflight = from_page(
-            "OPTIONS",
-            json!({
-                "Origin": "http://localhost:5173",
-                "Access-Control-Request-Method": "PUT",
-                "Access-Control-Request-Headers": "content-type,x-token",
-            }),
-        );
-        let (command, params) = answer(&preflight, &rules);
-        assert_eq!((command, &params["responseCode"]), ("Fetch.fulfillRequest", &json!(204)));
-        assert_eq!(header(&params, "Access-Control-Allow-Origin"), Some("http://localhost:5173"));
-        assert_eq!(header(&params, "Access-Control-Allow-Methods"), Some("PUT"));
-        assert_eq!(header(&params, "Access-Control-Allow-Headers"), Some("content-type,x-token"));
-        assert_eq!(params.get("body"), None);
-
-        // Same origin: nothing but the rule's own header.
-        let (_, params) = answer(&from_page("GET", json!({})), &rules);
-        assert_eq!(params["responseHeaders"], json!([{ "name": "Content-Type", "value": "application/json" }]));
-    }
-
-    /// A stand-in for js-debug's CDP proxy: what it receives, and a way to send it events.
-    pub(crate) async fn proxy() -> (String, mpsc::UnboundedReceiver<Value>, mpsc::UnboundedSender<Value>) {
-        proxy_refusing(|_| false).await
-    }
-
-    /// A proxy that answers the commands `refused` picks with an error, like the real one does
-    /// for what it or the browser does not accept.
-    pub(crate) async fn proxy_refusing(
-        refused: fn(&Value) -> bool,
-    ) -> (String, mpsc::UnboundedReceiver<Value>, mpsc::UnboundedSender<Value>) {
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let url = format!("ws://127.0.0.1:{}/session", listener.local_addr().unwrap().port());
-        let (received_tx, received) = mpsc::unbounded_channel();
-        let (events, mut events_rx) = mpsc::unbounded_channel::<Value>();
-        tokio::spawn(async move {
-            let (stream, _) = listener.accept().await.unwrap();
-            let (mut write, mut read) = tokio_tungstenite::accept_async(stream).await.unwrap().split();
-            loop {
-                tokio::select! {
-                    message = read.next() => {
-                        let Some(Ok(message)) = message else { break };
-                        let Ok(text) = message.to_text() else { continue };
-                        let Ok(request) = serde_json::from_str::<Value>(text) else { continue };
-                        let reply = if refused(&request) {
-                            json!({ "id": request["id"], "error": { "code": -32602, "message": "refused" } })
-                        } else {
-                            json!({ "id": request["id"], "result": {} })
-                        };
-                        let _ = write.send(Message::text(reply.to_string())).await;
-                        let _ = received_tx.send(request);
-                    }
-                    Some(event) = events_rx.recv() => {
-                        let _ = write.send(Message::text(event.to_string())).await;
-                    }
-                }
-            }
-        });
-        (url, received, events)
-    }
-
-    pub(crate) async fn next(received: &mut mpsc::UnboundedReceiver<Value>) -> (String, Value) {
-        let request = tokio::time::timeout(std::time::Duration::from_secs(5), received.recv())
-            .await
-            .expect("the proxy got a request in time")
-            .expect("the connection is open");
-        (request["method"].as_str().unwrap().to_owned(), request["params"].clone())
-    }
-
-    /// The browser's event for a request it holds.
-    fn held(request_id: &str, url: &str) -> Value {
-        json!({ "method": "Fetch.requestPaused", "params": { "requestId": request_id, "request": { "url": url } } })
-    }
-
-    type Serving = (tokio::task::JoinHandle<()>, oneshot::Receiver<Result<(), String>>);
-
-    fn serving(url: String, rules: watch::Receiver<Vec<JsResponseRule>>) -> Serving {
-        let (ready, is_ready) = oneshot::channel();
-        (tokio::spawn(serve(url, rules, ready)), is_ready)
-    }
-
-    async fn ended(task: tokio::task::JoinHandle<()>) {
-        tokio::time::timeout(std::time::Duration::from_secs(5), task).await.unwrap().unwrap();
-    }
-
-    #[tokio::test]
-    async fn held_requests_are_answered_and_interception_ends_before_the_connection() {
-        let (url, mut received, events) = proxy().await;
-        let (rules, watched) = tokio::sync::watch::channel(vec![rule("api/items", 200, "[]")]);
-        let (serving, ready) = serving(url, watched);
-        assert_eq!(ready.await.unwrap(), Ok(()));
-
-        assert_eq!(
-            next(&mut received).await,
-            ("JsDebug.subscribe".into(), json!({ "events": ["Fetch.requestPaused"] }))
-        );
-        assert_eq!(
-            next(&mut received).await,
-            (
-                "Fetch.enable".into(),
-                json!({ "patterns": [{ "urlPattern": "*api/items*", "requestStage": "Request" }] })
-            )
-        );
-
-        events.send(held("1", "http://h/api/items")).unwrap();
-        let (command, params) = next(&mut received).await;
-        assert_eq!(
-            (command.as_str(), &params["requestId"], &params["responseCode"]),
-            ("Fetch.fulfillRequest", &json!("1"), &json!(200))
-        );
-        events.send(held("2", "http://h/other")).unwrap();
-        assert_eq!(next(&mut received).await, ("Fetch.continueRequest".into(), json!({ "requestId": "2" })));
-
-        // New rules replace the browser's patterns.
-        rules.send(vec![rule("api/users", 404, "{}")]).unwrap();
-        assert_eq!(
-            next(&mut received).await,
-            (
-                "Fetch.enable".into(),
-                json!({ "patterns": [{ "urlPattern": "*api/users*", "requestStage": "Request" }] })
-            )
-        );
-
-        // No rules left: the browser stops holding requests. The connection stays for the
-        // rules that come next, and goes with the session.
-        rules.send(Vec::new()).unwrap();
-        assert_eq!(next(&mut received).await.0, "Fetch.disable");
-        rules.send(vec![rule("api/items", 200, "[]")]).unwrap();
-        assert_eq!(next(&mut received).await.0, "Fetch.enable");
-        rules.send(Vec::new()).unwrap();
-        assert_eq!(next(&mut received).await.0, "Fetch.disable");
-        drop(rules);
-        ended(serving).await;
-        // Already off: not switched off a second time.
-        assert!(received.try_recv().is_err());
-    }
-
-    #[tokio::test]
-    async fn a_session_that_goes_away_switches_interception_off() {
-        let (url, mut received, _events) = proxy().await;
-        let (rules, watched) = tokio::sync::watch::channel(vec![rule("api", 200, "[]")]);
-        let (serving, _ready) = serving(url, watched);
-        assert_eq!(next(&mut received).await.0, "JsDebug.subscribe");
-        assert_eq!(next(&mut received).await.0, "Fetch.enable");
-        drop(rules);
-        assert_eq!(next(&mut received).await.0, "Fetch.disable");
-        ended(serving).await;
-    }
-
-    #[tokio::test]
-    async fn a_response_the_browser_refuses_lets_the_request_through() {
-        let (url, mut received, events) = proxy_refusing(|request| request["method"] == "Fetch.fulfillRequest").await;
-        let (_rules, watched) = tokio::sync::watch::channel(vec![rule("api", 200, "[]")]);
-        let (_serving, _ready) = serving(url, watched);
-        assert_eq!(next(&mut received).await.0, "JsDebug.subscribe");
-        assert_eq!(next(&mut received).await.0, "Fetch.enable");
-        events.send(held("9", "http://h/api")).unwrap();
-        assert_eq!(next(&mut received).await.0, "Fetch.fulfillRequest");
-        // Unanswered, the request would hang the page.
-        assert_eq!(next(&mut received).await, ("Fetch.continueRequest".into(), json!({ "requestId": "9" })));
-    }
-
-    #[tokio::test]
-    async fn a_proxy_that_does_not_report_held_requests_is_not_asked_to_hold_any() {
-        let (url, mut received, _events) = proxy_refusing(|request| request["method"] == "JsDebug.subscribe").await;
-        let (_rules, watched) = tokio::sync::watch::channel(vec![rule("api", 200, "[]")]);
-        let (serving, ready) = serving(url, watched);
-        assert_eq!(next(&mut received).await.0, "JsDebug.subscribe");
-        assert_eq!(ready.await.unwrap(), Err("refused".to_owned()));
-        ended(serving).await;
-        assert!(received.try_recv().is_err());
-    }
-
-    #[tokio::test]
-    async fn no_connection_to_the_proxy_is_reported() {
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let url = format!("ws://127.0.0.1:{}/session", listener.local_addr().unwrap().port());
-        drop(listener);
-        let (_rules, watched) = tokio::sync::watch::channel(vec![rule("api", 200, "[]")]);
-        let (serving, ready) = serving(url, watched);
-        assert!(ready.await.unwrap().is_err());
-        ended(serving).await;
-    }
-}