fix(agents): drop the status bar's Changes toggle

The session status bar ended with a Changes toggle that did the same as the "N changed files" chip right below it. The chip opens and closes the Changes pane and also shows the line counts, the pane has its own hide button, and the status-bar toggle was disabled whenever there were no changes, so the status bar now keeps only the Terminal button. The unused "Show changes" string goes from the locale catalogs.
fix(debug): load run configuration .env files for debug launches (#2633 )
2026-11-11 02:31:38 -10:00 · 2026-11-11 12:04:39 +08:00 · 2026-11-11 10:41:16 +08:00 · 2026-11-11 09:51:47 +08:00 · 2026-11-11 09:42:19 +08:00 · 2026-11-11 09:39:59 +08:00
1370 changed files with 81574 additions and 13107 deletions
@@ -3,3 +3,6 @@ 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.
@@ -103,7 +103,7 @@ jobs:
        if: runner.os == 'Linux'
        run: git diff --exit-code src/bindings.ts

-  # The remote development server ships as a static Linux binary (release.yml):
+  # The remote development server ships as a static Linux binary (release-build.yml):
  # keep that build working.
  server:
    name: Remote server (linux musl)
@@ -47,6 +47,7 @@ env:
  JDTLS: 1.63.0-202610191322
  KOTLIN_LSP: 263.7084.0
  GRADLE: 8.14.3
+  INTELEPHENSE: 1.18.5

 jobs:
  smoke:
@@ -54,8 +55,9 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        language: [typescript, python, rust, go, java, kotlin]
-    runs-on: ubuntu-22.04
+        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' }}
    timeout-minutes: 40
    steps:
      - uses: actions/checkout@v4
@@ -74,6 +76,12 @@ 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" }
@@ -108,6 +116,13 @@ 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'
@@ -0,0 +1,119 @@
+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 || echo 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
@@ -0,0 +1,262 @@
+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 }}" }
+      - 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
+
+  # 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 }}" }
+      - 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$/),
+            ];
+            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(", ")}`);
@@ -1,7 +1,7 @@
 name: Release
 on:
  push:
-    tags: ["v*"]
+    tags: ["v*", "!v*-nightly.*"]
  workflow_dispatch:
    inputs:
      tag:
@@ -9,7 +9,7 @@ on:
        required: true

 permissions:
-  contents: write
+  contents: read

 concurrency:
  group: release-${{ github.event.inputs.tag || github.ref_name }}
@@ -23,10 +23,12 @@ 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 }}" }
@@ -47,20 +49,6 @@ 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:
@@ -74,161 +62,26 @@ 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("-"), generate_release_notes: true,
+              draft: true, prerelease: tag.includes("-"), body: notes.body,
            });
            core.setOutput("id", data.id);

-  build:
+  binaries:
+    permissions:
+      contents: write
    needs: create-release
-    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
+    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

  # The official plugins, signed, and the marketplace index released apps read
  # (releases/latest/download/plugins-index.json). They are not in the
@@ -240,6 +93,8 @@ 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
@@ -303,70 +158,10 @@ 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:
-    needs: [create-release, build, server, plugins, updater-manifest]
+    permissions:
+      contents: write
+    needs: [create-release, binaries, plugins]
    runs-on: ubuntu-latest
    steps:
      - uses: actions/github-script@v8
@@ -12,7 +12,7 @@
    "src/editor/core/cm/angular/parser*.ts",
    "src/editor/core/cm/jsp/parser*.ts",
    "src/editor/core/cm/astro/parser*.ts",
-    "docs/plugins/themes.md",
+    "plugins/themes.md",
    "pnpm-lock.yaml",
    "**/*.toml",
    "fixtures",
@@ -21,11 +21,13 @@ 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`, `docs/plugins/themes.md`.
+  Plugin docs: `plugins/README.md`, `plugins/themes.md`.
 - `java/` — JDT LS extension bundles (`java-usages`, `kotlin-bridge`) and the patched
  Lombok agent, embedded into the app by `ide-sdk` / `ide-tools`.
 - `e2e/` — Playwright UI tests (`pnpm e2e`). `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/`.

 ## Rules

@@ -1578,16 +1578,6 @@ dependencies = [
 "syn 2.0.119",
 ]

-[[package]]
-name = "darling"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
-dependencies = [
- "darling_core 0.13.4",
- "darling_macro 0.13.4",
-]
-
 [[package]]
 name = "darling"
 version = "0.23.0"
@@ -1608,20 +1598,6 @@ dependencies = [
 "darling_macro 0.24.1",
 ]

-[[package]]
-name = "darling_core"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.10.0",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "darling_core"
 version = "0.23.0"
@@ -1631,7 +1607,7 @@ dependencies = [
 "ident_case",
 "proc-macro2",
 "quote",
- "strsim 0.11.1",
+ "strsim",
 "syn 2.0.119",
 ]

@@ -1644,21 +1620,10 @@ dependencies = [
 "ident_case",
 "proc-macro2",
 "quote",
- "strsim 0.11.1",
+ "strsim",
 "syn 3.0.9",
 ]

-[[package]]
-name = "darling_macro"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
-dependencies = [
- "darling_core 0.13.4",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "darling_macro"
 version = "0.23.0"
@@ -2685,7 +2650,7 @@ checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
 "cfg-if",
 "libc",
- "wasi",
+ "wasi 0.11.1+wasi-snapshot-preview1",
 ]

 [[package]]
@@ -4180,7 +4145,7 @@ checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"

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

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

 [[package]]
 name = "ide-android"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "serde",
@@ -4229,11 +4194,13 @@ dependencies = [

 [[package]]
 name = "ide-build"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "blake3",
+ "chardetng",
 "dirs 6.0.0",
 "dunce",
+ "encoding_rs",
 "ide-core",
 "serde",
 "serde_json",
@@ -4245,7 +4212,7 @@ dependencies = [

 [[package]]
 name = "ide-cli"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "dirs 6.0.0",
 "serde",
@@ -4259,8 +4226,9 @@ dependencies = [

 [[package]]
 name = "ide-clipboard"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
+ "gtk",
 "objc2 0.6.5",
 "objc2-app-kit 0.3.2",
 "objc2-foundation 0.3.2",
@@ -4268,12 +4236,11 @@ dependencies = [

 [[package]]
 name = "ide-core"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "dunce",
 "encoding_rs",
 "libc",
- "percent-encoding",
 "serde",
 "serde_json",
 "specta",
@@ -4286,7 +4253,7 @@ dependencies = [

 [[package]]
 name = "ide-coverage"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "ide-run",
@@ -4300,14 +4267,12 @@ dependencies = [

 [[package]]
 name = "ide-dap"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "futures",
 "ide-core",
 "ide-jsonrpc",
 "ide-language",
- "ide-remote",
- "ide-run",
 "libc",
 "memchr",
 "parking_lot",
@@ -4323,7 +4288,7 @@ dependencies = [

 [[package]]
 name = "ide-db"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "bb8",
 "blake3",
@@ -4333,7 +4298,7 @@ dependencies = [
 "ide-core",
 "ide-http",
 "ide-ssh",
- "oracle",
+ "oracledb",
 "parking_lot",
 "reqwest",
 "rustls",
@@ -4353,7 +4318,7 @@ dependencies = [

 [[package]]
 name = "ide-docker"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "serde",
@@ -4366,10 +4331,11 @@ dependencies = [

 [[package]]
 name = "ide-extension"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "base64 0.22.1",
 "blake3",
+ "dunce",
 "ed25519-dalek",
 "ide-core",
 "parking_lot",
@@ -4386,7 +4352,7 @@ dependencies = [

 [[package]]
 name = "ide-fonts"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "objc2-core-foundation",
 "objc2-core-text",
@@ -4398,7 +4364,7 @@ dependencies = [

 [[package]]
 name = "ide-github"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "ide-vcs",
@@ -4411,7 +4377,7 @@ dependencies = [

 [[package]]
 name = "ide-host"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "base64 0.22.1",
 "blake3",
@@ -4455,7 +4421,6 @@ dependencies = [
 "ignore",
 "jsonschema",
 "parking_lot",
- "percent-encoding",
 "quick-xml 0.42.0",
 "regex-lite",
 "regex-syntax",
@@ -4478,9 +4443,10 @@ dependencies = [

 [[package]]
 name = "ide-http"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "ide-core",
+ "ide-vfs",
 "parking_lot",
 "reqwest",
 "rustls",
@@ -4496,7 +4462,7 @@ dependencies = [

 [[package]]
 name = "ide-index"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "blake3",
 "criterion",
@@ -4518,7 +4484,7 @@ dependencies = [

 [[package]]
 name = "ide-jsonrpc"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "encoding_rs",
 "futures",
@@ -4535,7 +4501,7 @@ dependencies = [

 [[package]]
 name = "ide-language"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "blake3",
 "criterion",
@@ -4591,7 +4557,7 @@ dependencies = [

 [[package]]
 name = "ide-lsp"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "dunce",
 "futures",
@@ -4617,7 +4583,7 @@ dependencies = [

 [[package]]
 name = "ide-mcp"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "bytes",
 "dunce",
@@ -4636,7 +4602,7 @@ dependencies = [

 [[package]]
 name = "ide-notebook"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "futures",
 "ide-core",
@@ -4659,7 +4625,7 @@ dependencies = [

 [[package]]
 name = "ide-plugin"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "blake3",
 "dunce",
@@ -4682,7 +4648,7 @@ dependencies = [

 [[package]]
 name = "ide-profiler"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "ide-run",
@@ -4695,7 +4661,7 @@ dependencies = [

 [[package]]
 name = "ide-remote"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "dunce",
 "globset",
@@ -4714,7 +4680,7 @@ dependencies = [

 [[package]]
 name = "ide-run"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "dunce",
 "encoding_rs",
@@ -4738,7 +4704,7 @@ dependencies = [

 [[package]]
 name = "ide-sdk"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "dunce",
 "ide-core",
@@ -4746,6 +4712,7 @@ dependencies = [
 "ide-run",
 "ide-vfs",
 "ignore",
+ "quick-xml 0.42.0",
 "serde",
 "serde_json",
 "specta",
@@ -4757,7 +4724,7 @@ dependencies = [

 [[package]]
 name = "ide-search"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "criterion",
 "globset",
@@ -4777,7 +4744,7 @@ dependencies = [

 [[package]]
 name = "ide-spell"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "parking_lot",
@@ -4790,7 +4757,7 @@ dependencies = [

 [[package]]
 name = "ide-ssh"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "dirs 6.0.0",
 "flate2",
@@ -4811,7 +4778,7 @@ dependencies = [

 [[package]]
 name = "ide-syntax"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "ide-language",
@@ -4826,7 +4793,7 @@ dependencies = [

 [[package]]
 name = "ide-terminal"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "libc",
@@ -4839,7 +4806,7 @@ dependencies = [

 [[package]]
 name = "ide-text"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "criterion",
 "ide-core",
@@ -4852,7 +4819,7 @@ dependencies = [

 [[package]]
 name = "ide-tools"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "flate2",
 "hex",
@@ -4873,7 +4840,7 @@ dependencies = [

 [[package]]
 name = "ide-vcs"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "blake3",
 "dunce",
@@ -4894,7 +4861,7 @@ dependencies = [

 [[package]]
 name = "ide-vfs"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "chardetng",
 "dunce",
@@ -4918,7 +4885,7 @@ dependencies = [

 [[package]]
 name = "ide-web"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "ide-core",
 "open",
@@ -4934,7 +4901,7 @@ dependencies = [

 [[package]]
 name = "ide-workspace"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "blake3",
 "dunce",
@@ -5581,9 +5548,9 @@ dependencies = [

 [[package]]
 name = "libsqlite3-sys"
-version = "0.37.0"
+version = "0.39.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f111c8c41e7c61a49cd34e44c7619462967221a6443b0ec299e0ac30cfb9b1"
+checksum = "14a5f01b87b92705d07b433c06f96cbc764637d81a0bffb5734ce17cf0f9a2b3"
 dependencies = [
 "cc",
 "pkg-config",
@@ -5751,7 +5718,7 @@ checksum = "1788edb87fdc09c7e26304471e2f5be8cdefb1b6930d6e3985fc02ff53bf86ee"
 dependencies = [
 "libc",
 "log",
- "wasi",
+ "wasi 0.11.1+wasi-snapshot-preview1",
 "windows-sys 0.61.2",
 ]

@@ -6363,6 +6330,15 @@ dependencies = [
 "objc2-foundation 0.2.2",
 ]

+[[package]]
+name = "objc2-system-configuration"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7216bd11cbda54ccabcab84d523dc93b858ec75ecfb3a7d89513fa22464da396"
+dependencies = [
+ "objc2-core-foundation",
+]
+
 [[package]]
 name = "objc2-ui-kit"
 version = "0.2.2"
@@ -6478,15 +6454,6 @@ dependencies = [
 "memchr",
 ]

-[[package]]
-name = "odpic-sys"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "920b5474a5128a9f0232df5a0ffc50aaa5b077b29b8b06ab0131985ac82793ed"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.21.4"
@@ -6512,7 +6479,7 @@ dependencies = [

 [[package]]
 name = "openidea"
-version = "0.1.39"
+version = "0.1.41"
 dependencies = [
 "base64 0.22.1",
 "blake3",
@@ -6600,29 +6567,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"

 [[package]]
-name = "oracle"
-version = "0.6.3"
+name = "oracledb"
+version = "26.0.0-beta.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3db40fe6e4df881b683691ade5ef1f7b1afd52aefa115581f7b92855524d7ec0"
+checksum = "27b98c7346f2bb5169ec4b2d4f066fb616529ac766b395440c5019fe88d1ef45"
 dependencies = [
- "cc",
- "odpic-sys",
- "once_cell",
- "oracle_procmacro",
- "paste",
- "rustversion",
-]
-
-[[package]]
-name = "oracle_procmacro"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad247f3421d57de56a0d0408d3249d4b1048a522be2013656d92f022c3d8af27"
-dependencies = [
- "darling 0.13.4",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "aes",
+ "base16ct",
+ "base64ct",
+ "cbc",
+ "chrono",
+ "pbkdf2",
+ "pkcs8",
+ "rand 0.10.3",
+ "rustls",
+ "sha2 0.11.1",
+ "uuid",
+ "webpki-roots",
+ "whoami",
 ]

 [[package]]
@@ -8629,8 +8591,7 @@ checksum = "3a0219bd7d979d58245a4f41f695e1ac9f8befdffadd7f61f1bae9e39abc6620"
 [[package]]
 name = "sqlx"
 version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "378620ccc25c62c89d8be1c819e76a88d59bdcc3304733330788948e619bfd71"
+source = "git+https://github.com/transact-rs/sqlx?rev=10462fa4414c6c7f1ed1d39bb31678e3b726878c#10462fa4414c6c7f1ed1d39bb31678e3b726878c"
 dependencies = [
 "sqlx-core",
 "sqlx-macros",
@@ -8642,8 +8603,7 @@ dependencies = [
 [[package]]
 name = "sqlx-core"
 version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b44e85bf579a8eeb4ceaa77a3a523baf2bf0e9bac7e40f405d537b5d2d5ccb"
+source = "git+https://github.com/transact-rs/sqlx?rev=10462fa4414c6c7f1ed1d39bb31678e3b726878c#10462fa4414c6c7f1ed1d39bb31678e3b726878c"
 dependencies = [
 "base64 0.22.1",
 "bytes",
@@ -8665,7 +8625,7 @@ dependencies = [
 "rustls",
 "serde",
 "serde_json",
- "sha2 0.10.9",
+ "sha2 0.11.1",
 "smallvec",
 "thiserror 2.0.21",
 "tokio",
@@ -8678,8 +8638,7 @@ dependencies = [
 [[package]]
 name = "sqlx-macros"
 version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd2b84f2bc39a5705ef27ec785a11c934a41bbd4a24941e257927cddc26b60bf"
+source = "git+https://github.com/transact-rs/sqlx?rev=10462fa4414c6c7f1ed1d39bb31678e3b726878c#10462fa4414c6c7f1ed1d39bb31678e3b726878c"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -8691,8 +8650,7 @@ dependencies = [
 [[package]]
 name = "sqlx-macros-core"
 version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb8d96de5fdc85a5c4ec813432b523ec637e80ba98f046555f75f7908ddac7c3"
+source = "git+https://github.com/transact-rs/sqlx?rev=10462fa4414c6c7f1ed1d39bb31678e3b726878c#10462fa4414c6c7f1ed1d39bb31678e3b726878c"
 dependencies = [
 "cfg-if",
 "dotenvy",
@@ -8703,7 +8661,7 @@ dependencies = [
 "quote",
 "serde",
 "serde_json",
- "sha2 0.10.9",
+ "sha2 0.11.1",
 "sqlx-core",
 "sqlx-mysql",
 "sqlx-postgres",
@@ -8716,8 +8674,7 @@ dependencies = [
 [[package]]
 name = "sqlx-mysql"
 version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90b8020fe17c5f2c245bfa2505d7ef59c5604839527c740266ad2214acebea27"
+source = "git+https://github.com/transact-rs/sqlx?rev=10462fa4414c6c7f1ed1d39bb31678e3b726878c#10462fa4414c6c7f1ed1d39bb31678e3b726878c"
 dependencies = [
 "bitflags 2.13.2",
 "byteorder",
@@ -8742,8 +8699,7 @@ dependencies = [
 [[package]]
 name = "sqlx-postgres"
 version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87a2bdd6e83f6b3ea525ca9fee568030508b58355a43d0b2c1674d5f79dcd65e"
+source = "git+https://github.com/transact-rs/sqlx?rev=10462fa4414c6c7f1ed1d39bb31678e3b726878c#10462fa4414c6c7f1ed1d39bb31678e3b726878c"
 dependencies = [
 "atoi",
 "base64 0.22.1",
@@ -8777,8 +8733,7 @@ dependencies = [
 [[package]]
 name = "sqlx-sqlite"
 version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488e99c397a62007e4229aec669a179816339afc6d2620ca6fa420dbee2e982c"
+source = "git+https://github.com/transact-rs/sqlx?rev=10462fa4414c6c7f1ed1d39bb31678e3b726878c#10462fa4414c6c7f1ed1d39bb31678e3b726878c"
 dependencies = [
 "atoi",
 "flume",
@@ -8916,12 +8871,6 @@ dependencies = [
 "unicode-properties",
 ]

-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -8958,7 +8907,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
 "proc-macro2",
- "quote",
 "unicode-ident",
 ]

@@ -9181,7 +9129,7 @@ dependencies = [
 "serde",
 "serde_json",
 "static_vcruntime",
- "strsim 0.11.1",
+ "strsim",
 "tauri-utils",
 "tauri-winres",
 "walkdir",
@@ -9543,7 +9491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
 "fastrand",
- "getrandom 0.4.3",
+ "getrandom 0.3.4",
 "once_cell",
 "rustix",
 "windows-sys 0.61.2",
@@ -10721,6 +10669,15 @@ version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"

+[[package]]
+name = "wasi"
+version = "0.14.7+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c"
+dependencies = [
+ "wasip2",
+]
+
 [[package]]
 name = "wasip2"
 version = "1.0.4+wasi-0.2.12"
@@ -10730,6 +10687,15 @@ dependencies = [
 "wit-bindgen",
 ]

+[[package]]
+name = "wasite"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66fe902b4a6b8028a753d5424909b764ccf79b7a209eac9bf97e59cda9f71a42"
+dependencies = [
+ "wasi 0.14.7+wasi-0.2.4",
+]
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.129"
@@ -11309,6 +11275,13 @@ name = "whoami"
 version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "626c4bac6755d76ffc12cb01b2eac751db1996b9e0041de9aa02c8c211ddc82c"
+dependencies = [
+ "libc",
+ "libredox",
+ "objc2-system-configuration",
+ "wasite",
+ "web-sys",
+]

 [[package]]
 name = "win_uds"
@@ -12144,14 +12117,15 @@ dependencies = [

 [[package]]
 name = "zip"
-version = "9.1.3"
+version = "9.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1156b39d142a34b999c2310a50455e0cb3760bf7efad0122f796d813bee26ccb"
+checksum = "00fb4744e923442ecadfd3f85f51a5d24e03bf43d53813b81ebb4c91d02baa62"
 dependencies = [
 "crc32fast",
 "flate2",
 "getrandom 0.4.3",
 "indexmap 2.14.2",
+ "libc",
 "memchr",
 "nix 0.31.3",
 "typed-path",
@@ -5,7 +5,7 @@ members = ["crates/*", "src-tauri"]
 exclude = ["sdk", "plugins"]

 [workspace.package]
-version = "0.1.39"
+version = "0.1.41"
 edition = "2024"
 rust-version = "1.96"
 license = "Apache-2.0"
@@ -82,7 +82,7 @@ trash = "5"
 blake3 = "1"
 dunce = "1"
 dirs = "6"
-zip = { version = "9", default-features = false, features = ["deflate"] }
+zip = { version = "9.2.3", default-features = false, features = ["deflate"] }

 # search, index, language
 grep-searcher = "0.1"
@@ -103,9 +103,11 @@ 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"
-sqlx = { version = "0.9", default-features = false, features = ["runtime-tokio", "tls-rustls-ring-webpki", "sqlite", "postgres", "mysql"] }
+# Until SQLx releases its libsqlite3-sys 0.39 update (RUSTSEC-2026-0459).
+sqlx = { version = "0.9", git = "https://github.com/transact-rs/sqlx", rev = "10462fa4414c6c7f1ed1d39bb31678e3b726878c", 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"] }
-oracle = { version = "0.6", default-features = false }
+# Pure-Rust thin Oracle driver; pinned to the beta until it stabilizes.
+oracledb = "=26.0.0-beta.5"
 bb8 = "0.9"
 uuid = { version = "1", features = ["v4"] }
 # OS credential stores
@@ -131,7 +133,9 @@ debug = false

 [profile.release]
 codegen-units = 1
-lto = true
+# 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"
 opt-level = 3
 # Unwind, so a panic fails one task or command instead of quitting the IDE.
 panic = "unwind"
@@ -12,6 +12,8 @@
 <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>
@@ -25,9 +27,7 @@ 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. On Windows, if you'd
-rather skip the installer, each release also ships a portable zip — unpack it
-and run `openidea.exe`.
+for 60+ languages. Builds for macOS, Windows and Linux.

 ## Benchmark

@@ -56,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](plugins/README.md) and
+`openidea-plugin new` — see [Writing OpenIDEA plugins](https://openidea.sh/en/plugins) and
 the [official plugins](plugins/official). The plugin API is still a preview.

 ## Community
@@ -64,13 +64,9 @@ 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="docs/assets/wechat-group.png" alt="WeChat group QR code" width="200">
+  <img src=".github/assets/wechat-group.png" alt="WeChat group QR code" width="200">

-### 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>
+- Contributing: see [CONTRIBUTING.md](CONTRIBUTING.md) and the [contributor docs](https://openidea.sh/en/contribute/setup).

 ## License

@@ -0,0 +1,26 @@
+# 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,5 +1,12 @@
 # Third-party licenses

+## Flutter and Vite project icons
+
+`src/ui/brands/flutter.svg` and `vite.svg` use the unmodified logo paths from
+[Simple Icons](https://github.com/simple-icons/simple-icons), retrieved through
+Iconify (`simple-icons:flutter`, `simple-icons:vite`) and filled with the project
+icon colors. 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
@@ -262,7 +269,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).
-See [theme sources and mapping](docs/themes.md). MIT license:
+MIT license:

 ```text
 Copyright (c) 2011 Ethan Schoonover
@@ -290,7 +297,11 @@ 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 are listed in [theme sources and mapping](docs/themes.md).
+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).
 Both syntax themes use the following MIT notice:

 ```text
@@ -164,6 +164,11 @@ 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())
@@ -10,6 +10,7 @@
 mod acp;
 mod config;
 mod conversation;
+pub mod mcp;
 mod model;
 mod native;
 mod provider;
@@ -91,6 +92,9 @@ type Connector = Arc<
        + Sync,
 >;

+/// Returns the configured MCP servers (User and Workspace) for this project.
+pub type McpServersFn = dyn Fn() -> Vec<McpServer> + Send + Sync;
+
 struct Shared {
    paths: AgentPaths,
    runtime: tokio::runtime::Handle,
@@ -104,6 +108,7 @@ struct Shared {
    command_fetches: Mutex<HashMap<String, tokio::sync::watch::Receiver<bool>>>,
    /// [`IDLE_RELEASE`], in milliseconds (shorter in tests).
    idle_release_ms: AtomicU64,
+    mcp_servers_hook: RwLock<Option<Arc<McpServersFn>>>,
 }

 /// What an agent offered in its last session, for the New Task page.
@@ -131,6 +136,13 @@ impl Shared {
        }
    }

+    fn mcp_servers_for_session(&self, provider: &str, init: &acp::Negotiated) -> Vec<Value> {
+        let mut servers = mcp_servers_for(init.mcp_stdio(), &self.paths.project_root);
+        let configured = self.mcp_servers_hook.read().as_ref().map(|hook| hook()).unwrap_or_default();
+        servers.extend(mcp::acp_mcp_servers(&configured, provider, init));
+        servers
+    }
+
    fn known_config(&self, provider: &str) -> Vec<AgentConfigOption> {
        let mut config = self.known.lock().get(provider).map(|k| k.config.clone()).unwrap_or_default();
        // Model-specific options are offered separately, never as provider-wide defaults.
@@ -163,14 +175,25 @@ impl Shared {
                    let shared = self.clone();
                    // Keep the lookup alive if a composer unmounts while it is waiting.
                    self.runtime.spawn(async move {
-                        if let Ok((commands, options)) =
+                        if let Ok(found) =
                            native::claude::discover(spec.clone(), shared.paths.project_root.clone()).await
                        {
-                            let commands = config::commands_of(&json!({ "availableCommands": commands }), &spec.id);
-                            let options = config::options_of(&json!({ "configOptions": options }));
+                            let commands =
+                                config::commands_of(&json!({ "availableCommands": found.commands }), &spec.id);
+                            let options = config::options_of(&json!({ "configOptions": found.options }));
+                            let levels: Vec<_> = found
+                                .efforts
+                                .into_iter()
+                                .map(|(model, o)| {
+                                    let options = o.map(|o| config::options_of(&json!({ "configOptions": [o] })));
+                                    (model, options.unwrap_or_default())
+                                })
+                                .collect();
                            let _ = tokio::task::spawn_blocking(move || {
-                                shared.remember_discovered(&spec.id, &options, &commands);
-                                shared.emit(AgentEvent::Providers);
+                                // Notifies subscribers itself when the discovery
+                                // changed the cached config; unchanged results
+                                // stay silent.
+                                shared.remember_discovered(&spec.id, &options, &commands, &levels);
                            })
                            .await;
                        }
@@ -191,6 +214,18 @@ impl Shared {
        self.known.lock().get(provider).is_some_and(|k| !k.config.is_empty())
    }

+    /// Whether the thinking levels of every model the agent offers are known (#1686).
+    fn knows_all_levels(&self, provider: &str) -> bool {
+        let cache = self.known.lock();
+        let Some(known) = cache.get(provider) else { return false };
+        known
+            .config
+            .iter()
+            .filter(|o| o.category.as_deref() == Some("model"))
+            .flat_map(|o| &o.values)
+            .all(|v| known.thought_levels.contains_key(&v.value))
+    }
+
    fn root_key(&self) -> String {
        self.paths.project_root.to_string_lossy().into_owned()
    }
@@ -203,11 +238,19 @@ impl Shared {
        commands: Option<&[AgentCommand]>,
        model: Option<&str>,
    ) {
-        self.remember_inner(provider, config, commands, model, false);
+        self.remember_inner(provider, config, commands, model, &[], false);
    }

-    fn remember_discovered(&self, provider: &str, config: &[AgentConfigOption], commands: &[AgentCommand]) {
-        self.remember_inner(provider, Some(config), Some(commands), model_of(config).as_deref(), true);
+    /// `levels`: each model's thinking-level options, so a new task offers them for any model
+    /// it picks (#1686). A session's report for a model wins over these.
+    fn remember_discovered(
+        &self,
+        provider: &str,
+        config: &[AgentConfigOption],
+        commands: &[AgentCommand],
+        levels: &[(String, Vec<AgentConfigOption>)],
+    ) {
+        self.remember_inner(provider, Some(config), Some(commands), model_of(config).as_deref(), levels, true);
    }

    fn remember_inner(
@@ -216,12 +259,19 @@ impl Shared {
        config: Option<&[AgentConfigOption]>,
        commands: Option<&[AgentCommand]>,
        model: Option<&str>,
+        discovered_levels: &[(String, Vec<AgentConfigOption>)],
        discovered: bool,
    ) {
        // Keep the update and its disk write ordered; a session report wins over discovery.
        let mut cache = self.known.lock();
        let known = cache.entry(provider.to_owned()).or_default();
        let mut changed = false;
+        for (model, levels) in discovered_levels {
+            if !known.thought_levels.contains_key(model) {
+                known.thought_levels.insert(model.clone(), levels.clone());
+                changed = true;
+            }
+        }
        if let Some(c) = config.filter(|_| !discovered || known.config.is_empty()) {
            if let Some(model) = model {
                let levels: Vec<_> =
@@ -253,6 +303,13 @@ impl Shared {
        {
            tracing::warn!("saving agent settings: {e}");
        }
+        // The cached provider config actually changed (a session report, discovery,
+        // or a turn update): tell subscribers to re-list, so a changed model list
+        // reaches the composer without waiting for the next task (#1490). Unchanged
+        // reports stay silent, so routine session traffic emits nothing. The cache
+        // lock is released first; the sink never runs under it.
+        drop(cache);
+        self.emit(AgentEvent::Providers);
    }
 }

@@ -268,6 +325,9 @@ struct TaskFile {
    /// In the project's own checkout: files already changed when the task started.
    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
    before: BTreeMap<String, worktree::Stamp>,
+    /// The folder (in the task store) with copies of the `before` files, for rolling back.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    saved: Option<String>,
    #[serde(default, skip_serializing_if = "Vec::is_empty")]
    subagents: Vec<SavedSubagent>,
    /// Turns to drop from the session once it is loaded (a fork of an earlier point).
@@ -284,6 +344,7 @@ struct TaskState {
    conversation: Conversation,
    wanted: Vec<AgentConfigChoice>,
    before: Arc<BTreeMap<String, worktree::Stamp>>,
+    saved: Option<String>,
    pending_rollback: u32,
    /// The user named the task; see `TaskFile::title_renamed`.
    title_renamed: bool,
@@ -306,7 +367,7 @@ struct Live {
    embedded: bool,
    /// `session/load`: the process can be stopped between turns and the session reloaded.
    resumable: bool,
-    mcp_stdio: bool,
+    init: acp::Negotiated,
 }

 struct Task {
@@ -336,6 +397,8 @@ struct Task {
    /// Settings already sent this session (`(option, value)`), so a refusal is not retried.
    config_sent: Mutex<HashSet<(String, String)>>,
    dirty: Mutex<BTreeSet<(Session, usize)>>,
+    /// How much of each session's streaming message was last sent, so the next flush sends the rest.
+    streamed: Mutex<HashMap<Session, Sent>>,
    flush_scheduled: AtomicBool,
    stderr: Mutex<VecDeque<String>>,
    /// Set by `delete`; held while saving.
@@ -374,6 +437,7 @@ impl AgentManager {
            probes: Mutex::new(HashMap::new()),
            command_fetches: Mutex::new(HashMap::new()),
            idle_release_ms: AtomicU64::new(IDLE_RELEASE.as_millis() as u64),
+            mcp_servers_hook: RwLock::new(None),
        });
        let mut tasks = HashMap::new();
        for file in std::fs::read_dir(&shared.paths.store_dir).into_iter().flatten().flatten() {
@@ -414,8 +478,11 @@ impl AgentManager {
    /// The agents (custom ones re-read), whether each is installed, and what they offered last time.
    pub fn providers(&self) -> Vec<AgentProvider> {
        let specs = provider::load(self.shared.paths.custom_agents_dir.as_deref());
+        let in_use: std::collections::HashSet<String> =
+            self.tasks.read().values().map(|t| t.state.lock().task.provider.clone()).collect();
        let list = specs
            .iter()
+            .filter(|p| !provider::is_unlisted(p) || in_use.contains(&p.id))
            .map(|p| {
                let mut info = provider::describe(p);
                info.config = self.shared.known_config(&p.id);
@@ -461,6 +528,11 @@ impl AgentManager {
        self.shared.emit(AgentEvent::Providers);
    }

+    /// Provides the user and workspace MCP servers configured in settings.
+    pub fn set_mcp_servers_hook(&self, hook: Box<McpServersFn>) {
+        *self.shared.mcp_servers_hook.write() = Some(Arc::from(hook));
+    }
+
    /// The slash commands to complete for `provider`, in `task`'s directory or (without one)
    /// in the project: what the agent offered last time there, unadvertised builtins,
    /// and, for Claude Code, skills and custom commands on disk it has not listed.
@@ -477,7 +549,7 @@ impl AgentManager {
        // merged without duplicating what `availableCommands` or the disk offer.
        let mut offered = offered;
        if task.is_none()
-            && (offered.is_empty() || !self.shared.has_config(&provider))
+            && (offered.is_empty() || !self.shared.has_config(&provider) || !self.shared.knows_all_levels(&provider))
            && let Some(spec) = self.shared.spec(&provider).filter(|s| s.driver == provider::Driver::Claude)
        {
            self.shared.fetch_settings(spec).await;
@@ -565,9 +637,24 @@ impl AgentManager {
            }));
        }
        let now = now_ms();
+        let id = uuid::Uuid::new_v4().simple().to_string();
+        // Copies of the files the user had changed already, for rolling back the task's changes to them.
+        let saved = if before.is_empty() {
+            None
+        } else {
+            let name = format!("{id}.before");
+            let (dir, at, files) = (self.shared.paths.store_dir.join(&name), cwd.clone(), before.clone());
+            match blocking(move || worktree::save_before(&at, &files, &dir)).await {
+                Ok(saved) => saved.then_some(name),
+                Err(e) => {
+                    tracing::warn!("saving the changed files of agent task {id}: {e}");
+                    None
+                }
+            }
+        };
        let task = AgentTask {
            project_root,
-            id: uuid::Uuid::new_v4().simple().to_string(),
+            id,
            title,
            provider: spec.id.clone(),
            model: model_of(&config),
@@ -595,6 +682,7 @@ impl AgentManager {
            entries: Vec::new(),
            wanted: req.config,
            before,
+            saved,
            subagents: Vec::new(),
            pending_rollback: 0,
            title_renamed: false,
@@ -762,10 +850,16 @@ impl AgentManager {
            return Err(IdeError::invalid("this agent can't copy a conversation from there"));
        }
        let cwd = source.state.lock().task.cwd.0.clone();
+        let provider_id = source.state.lock().task.provider.clone();
+        let mcp_servers = source.shared.mcp_servers_for_session(&provider_id, &live.init);
        let cwd_s = dunce::canonicalize(&cwd).unwrap_or(cwd).to_string_lossy().into_owned();
        let reply: Value = live
            .peer
-            .request("session/fork", json!({ "sessionId": live.session, "cwd": cwd_s, "mcpServers": mcp_servers_for(live.mcp_stdio, &source.shared.paths.project_root) }), None)
+            .request(
+                "session/fork",
+                json!({ "sessionId": live.session, "cwd": cwd_s, "mcpServers": mcp_servers }),
+                None,
+            )
            .await
            .map_err(|e| IdeError::internal(source.describe(e)))?;
        let session = reply
@@ -799,6 +893,7 @@ impl AgentManager {
                entries,
                wanted: s.wanted.clone(),
                before: (*s.before).clone(),
+                saved: s.saved.clone(),
                subagents: s.conversation.saved_subagents(),
                pending_rollback: total - keep,
                title_renamed: s.title_renamed,
@@ -843,6 +938,7 @@ impl AgentManager {
                s.task.updated_ms = now_ms();
                first
            };
+            task.streamed.lock().clear();
            task.persist();
            self.shared.emit(AgentEvent::Truncated { task: id.to_owned(), length: 0 });
            task.emit_task();
@@ -868,6 +964,7 @@ impl AgentManager {
            s.task.updated_ms = now_ms();
            first
        };
+        task.streamed.lock().clear();
        task.persist();
        self.shared.emit(AgentEvent::Truncated { task: id.to_owned(), length: cut as u32 });
        task.emit_task();
@@ -1060,6 +1157,12 @@ impl AgentManager {
        self.tasks.write().remove(id);
        *task.deleted.lock() = true;
        let _ = std::fs::remove_file(self.shared.paths.store_dir.join(format!("{id}.json")));
+        let saved = task.state.lock().saved.clone();
+        if let Some(saved) = saved
+            && !self.tasks.read().values().any(|t| t.state.lock().saved.as_ref() == Some(&saved))
+        {
+            let _ = std::fs::remove_dir_all(self.shared.paths.store_dir.join(saved));
+        }
        self.shared.emit(AgentEvent::Removed { id: id.to_owned() });
        Ok(())
    }
@@ -1078,6 +1181,41 @@ impl AgentManager {
        blocking(move || worktree::file_at(&cwd, &path, &base)).await
    }

+    /// Rollback: puts the task's changed files among `rel_paths` (all with `None`) back as they
+    /// were when it started (files the user had changed then, as the user left them).
+    pub async fn rollback_changes(&self, id: &str, rel_paths: Option<Vec<String>>) -> IdeResult<()> {
+        let task = self.task(id)?;
+        if task.state.lock().busy {
+            return Err(IdeError::invalid("the agent is working: stop it before rolling back its changes"));
+        }
+        let (cwd, base) = task.cwd_and_base();
+        let (before, saved) = {
+            let s = task.state.lock();
+            (s.before.clone(), s.saved.as_ref().map(|name| self.shared.paths.store_dir.join(name)))
+        };
+        let restamped = blocking(move || {
+            let changes = worktree::without_untouched(worktree::changes(&cwd, &base)?, &before);
+            let mut restamped = Vec::new();
+            for change in changes.iter().filter(|c| rel_paths.as_ref().is_none_or(|p| p.contains(&c.rel_path))) {
+                worktree::restore(&cwd, &base, change, &before, saved.as_deref())?;
+                // Back to the user's own edits: not a change of the task any more.
+                if before.contains_key(&change.rel_path) {
+                    restamped.push((change.rel_path.clone(), worktree::stamp(&change.path.0)));
+                }
+            }
+            Ok(restamped)
+        })
+        .await?;
+        if !restamped.is_empty() {
+            let mut s = task.state.lock();
+            let mut before = (*s.before).clone();
+            before.extend(restamped);
+            s.before = Arc::new(before);
+        }
+        task.persist();
+        Ok(())
+    }
+
    /// Stops every agent (project closed).
    pub fn shutdown(&self) {
        for task in self.tasks.read().values() {
@@ -1103,6 +1241,7 @@ impl Task {
                conversation,
                wanted: file.wanted,
                before: Arc::new(file.before),
+                saved: file.saved,
                pending_rollback: file.pending_rollback,
                title_renamed: file.title_renamed,
                busy: false,
@@ -1120,6 +1259,7 @@ impl Task {
            idle_epoch: AtomicU64::new(0),
            config_sent: Mutex::new(HashSet::new()),
            dirty: Mutex::new(BTreeSet::new()),
+            streamed: Mutex::new(HashMap::new()),
            flush_scheduled: AtomicBool::new(false),
            stderr: Mutex::new(VecDeque::new()),
            deleted: Mutex::new(false),
@@ -1214,6 +1354,7 @@ impl Task {
                entries: s.conversation.main.entries.clone(),
                wanted: s.wanted.clone(),
                before: (*s.before).clone(),
+                saved: s.saved.clone(),
                subagents: s.conversation.saved_subagents(),
                pending_rollback: s.pending_rollback,
                title_renamed: s.title_renamed,
@@ -1241,11 +1382,12 @@ impl Task {
        let indices = std::mem::take(&mut *self.dirty.lock());
        let events: Vec<AgentEvent> = {
            let s = self.state.lock();
+            let mut streamed = self.streamed.lock();
            indices
                .into_iter()
                .filter_map(|(subagent, i)| {
-                    let entry = s.conversation.timeline(&subagent)?.entries.get(i)?.clone();
-                    Some(AgentEvent::Entry { task: self.id.clone(), subagent, index: i as u32, entry })
+                    let entry = s.conversation.timeline(&subagent)?.entries.get(i)?;
+                    Some(entry_event(&self.id, &mut streamed, subagent, i, entry))
                })
                .collect()
        };
@@ -1518,16 +1660,17 @@ impl Task {
        let init = peer.initialize(&client_info()).await.map_err(|e| self.describe(e))?;
        let sign_in_message = spec.sign_in_message(&init.auth_methods);
        let can_load = init.load_session();
-        let mcp_stdio = init.mcp_stdio();
        let (capabilities, embedded) = capabilities_of(&init);
+        let mcp_servers = self.shared.mcp_servers_for_session(&provider_id, &init);
        // Agents that compare canonical paths fail in a symlinked directory (macOS `/tmp`).
        let cwd_s = dunce::canonicalize(&cwd).unwrap_or(cwd).to_string_lossy().into_owned();

        let mut session = None;
        if let (Some(id), true) = (saved, can_load) {
            self.replaying.store(true, Ordering::Release);
-            let loaded: Result<Value, RpcError> =
-                peer.request("session/load", json!({ "sessionId": id, "cwd": cwd_s, "mcpServers": mcp_servers_for(mcp_stdio, &self.shared.paths.project_root) }), None).await;
+            let loaded: Result<Value, RpcError> = peer
+                .request("session/load", json!({ "sessionId": id, "cwd": cwd_s, "mcpServers": mcp_servers }), None)
+                .await;
            tokio::time::sleep(REPLAY_GRACE).await;
            self.replaying.store(false, Ordering::Release);
            match loaded {
@@ -1540,11 +1683,7 @@ impl Task {
            Some(s) => s,
            None => {
                let v: Value = peer
-                    .request(
-                        "session/new",
-                        json!({ "cwd": cwd_s, "mcpServers": mcp_servers_for(mcp_stdio, &self.shared.paths.project_root) }),
-                        None,
-                    )
+                    .request("session/new", json!({ "cwd": cwd_s, "mcpServers": mcp_servers }), None)
                    .await
                    .map_err(|e| self.sign_in_error(&e, Some(&sign_in_message)).unwrap_or_else(|| self.describe(e)))?;
                let id = v.get("sessionId").and_then(Value::as_str).ok_or("the agent returned no session")?.to_owned();
@@ -1636,7 +1775,7 @@ impl Task {
        self.persist();
        self.emit_task();
        let live =
-            Live { sign_in_message, peer, session: session_id, capabilities, embedded, resumable: can_load, mcp_stdio };
+            Live { sign_in_message, peer, session: session_id, capabilities, embedded, resumable: can_load, init };
        *self.live.lock() = Some(live.clone());
        Ok(live)
    }
@@ -1707,7 +1846,7 @@ impl Task {
                    format!("The agent process exited:\n{}", tail.join("\n"))
                }
            }
-            RpcError::Server { message, .. } => message,
+            RpcError::Server { message, data, .. } => with_details(message, data.as_ref()),
            e => e.to_string(),
        }
    }
@@ -2165,6 +2304,24 @@ fn usage_limit(e: &RpcError) -> Option<Option<f64>> {
        .then_some(None)
 }

+/// An error's message with the detail ACP agents put in `data` (`{"details": …}` or a string):
+/// generic codes such as "Internal error" say nothing without it.
+fn with_details(message: String, data: Option<&Value>) -> String {
+    let details = match data {
+        Some(Value::String(text)) => text.as_str(),
+        Some(data) => data.get("details").and_then(Value::as_str).unwrap_or_default(),
+        None => "",
+    }
+    .trim();
+    if details.is_empty() || message.contains(details) {
+        message
+    } else if message.trim().is_empty() {
+        details.to_owned()
+    } else {
+        format!("{message}: {details}")
+    }
+}
+
 fn client_info() -> Value {
    json!({ "name": "OpenIDEA", "version": env!("CARGO_PKG_VERSION") })
 }
@@ -2307,3 +2464,77 @@ fn stdio_mcp_servers(executable: Option<&std::path::Path>, supported: bool, root
    let command = ide_mcp::stdio_command(executable, root);
    vec![json!({ "name": "OpenIDEA", "command": command[0], "args": command[1..], "env": [] })]
 }
+
+/// What was sent of a streaming message: its first `bytes` (`utf16` UTF-16 units), which
+/// ended with `tail`. A message only grows while it streams, so its tail tells a message
+/// that went on from one that was replaced without comparing (or keeping) all of it.
+struct Sent {
+    index: usize,
+    bytes: usize,
+    utf16: usize,
+    tail: String,
+}
+
+const SENT_TAIL: usize = 64;
+
+impl Sent {
+    fn new(index: usize, text: &str) -> Self {
+        Self::after(index, text, 0, 0)
+    }
+
+    /// `text` as sent, of which the first `bytes` (`utf16` units) were sent before.
+    fn after(index: usize, text: &str, bytes: usize, utf16: usize) -> Self {
+        let mut start = text.len().saturating_sub(SENT_TAIL);
+        while !text.is_char_boundary(start) {
+            start -= 1;
+        }
+        let utf16 = utf16 + text[bytes..].encode_utf16().count();
+        Self { index, bytes: text.len(), utf16, tail: text[start..].to_owned() }
+    }
+
+    /// Whether `text` at `index` is this message, gone on.
+    fn extended_by(&self, index: usize, text: &str) -> bool {
+        self.index == index
+            && text.len() > self.bytes
+            && text.is_char_boundary(self.bytes)
+            && text[..self.bytes].ends_with(&self.tail)
+    }
+}
+
+/// The event that brings the UI's copy of entry `i` up to date: only the new text when
+/// it extends the message last sent for the session, else the whole entry.
+fn entry_event(
+    task: &str,
+    streamed: &mut HashMap<Session, Sent>,
+    subagent: Session,
+    i: usize,
+    entry: &AgentEntry,
+) -> AgentEvent {
+    let text = match entry {
+        AgentEntry::Agent { text } | AgentEntry::Thought { text } => Some(text),
+        _ => None,
+    };
+    let Some(text) = text else {
+        if streamed.get(&subagent).is_some_and(|sent| sent.index == i) {
+            streamed.remove(&subagent);
+        }
+        return AgentEvent::Entry { task: task.to_owned(), subagent, index: i as u32, entry: entry.clone() };
+    };
+    match streamed.get(&subagent).filter(|sent| sent.extended_by(i, text)) {
+        Some(sent) => {
+            let (bytes, from) = (sent.bytes, sent.utf16);
+            streamed.insert(subagent.clone(), Sent::after(i, text, bytes, from));
+            AgentEvent::Append {
+                task: task.to_owned(),
+                subagent,
+                index: i as u32,
+                from: from as u32,
+                text: text[bytes..].to_owned(),
+            }
+        }
+        None => {
+            streamed.insert(subagent.clone(), Sent::new(i, text));
+            AgentEvent::Entry { task: task.to_owned(), subagent, index: i as u32, entry: entry.clone() }
+        }
+    }
+}
@@ -0,0 +1,507 @@
+//! 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);
+    }
+}
@@ -518,6 +518,15 @@ 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,
@@ -526,3 +535,70 @@ pub enum AgentEvent {
    /// 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
+}
@@ -69,9 +69,17 @@ 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<(Vec<Value>, Value), String> {
+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())?;
@@ -100,7 +108,11 @@ pub(crate) async fn discover(spec: ProviderSpec, cwd: PathBuf) -> Result<(Vec<Va
        .flatten()
        .unwrap_or_default();
        let settings = Settings::from_cli(&init, &applied);
-        Ok((settings.commands.clone(), settings.options()))
+        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())?
@@ -132,19 +132,18 @@ impl Settings {
                }).collect::<Vec<_>>(),
            }));
        }
-        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,
-            }));
+        if let Some(effort) = self.current_model().and_then(|m| effort_option(m, &self.effort)) {
+            out.push(effort);
        }
        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()
@@ -156,6 +155,20 @@ 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)
@@ -231,4 +244,20 @@ 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");
+    }
 }
@@ -64,6 +64,7 @@ const BUILTIN: &[(&str, &str, Driver, &[&str], &str)] = &[
    ("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> {
@@ -184,6 +185,14 @@ 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);
@@ -590,6 +599,15 @@ mod tests {
        set_builtin_env(dir.path(), "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)).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(), "codex-acp", BTreeMap::from([("A".to_owned(), "1".to_owned())])).unwrap();
+        assert_eq!(unlisted(dir.path()), ["claude-acp"]);
+    }
+
    #[test]
    fn set_builtin_command_overrides_and_clears_a_builtin() {
        let dir = tempfile::tempdir().unwrap();
@@ -366,6 +366,35 @@ fn manager_at(dir: &Path, models_file: &Path, agent: Arc<FakeAgent>) -> AgentMan
    )
 }

+#[tokio::test(flavor = "multi_thread")]
+async fn saved_conversation_reads_do_not_start_or_load_the_agent() {
+    let tmp = tempfile::tempdir().unwrap();
+    let agent = Arc::new(FakeAgent::default());
+    let mgr = manager(tmp.path(), agent.clone());
+    let task = mgr
+        .create(NewAgentTask {
+            project_root: None,
+            prompt: text("Review the saved conversation"),
+            provider: "claude".into(),
+            config: Vec::new(),
+            isolation: Isolation::Local,
+            base: None,
+        })
+        .await
+        .unwrap();
+    wait_for(&mgr, &task.id, AgentStatus::NeedsInput).await;
+    mgr.shutdown();
+    let restored_agent = Arc::new(FakeAgent::default());
+    let restored = manager(tmp.path(), restored_agent.clone());
+    assert!(!restored.entries(&task.id, None).unwrap().is_empty());
+    assert!(restored_agent.calls.lock().is_empty());
+    assert!(restored.entries("missing-task", None).is_err());
+    assert!(restored.entries(&task.id, Some("missing-subagent".into())).is_err());
+    restored.task(&task.id).unwrap().state.lock().conversation = Conversation::default();
+    assert!(restored.entries(&task.id, None).unwrap().is_empty());
+    restored.shutdown();
+}
+
 #[cfg(unix)]
 #[tokio::test(flavor = "multi_thread")]
 async fn claude_commands_before_session_are_fetched_once_and_saved() {
@@ -2146,6 +2175,49 @@ async fn reload_providers_updates_registry_install_clears_stale_probes_and_notif
    assert!(probe.error.is_none());
 }

+/// A session report that changes the cached provider config notifies subscribers,
+/// so the composer re-lists models without waiting for the next task (#1490).
+/// Reports that change nothing stay silent.
+#[tokio::test(flavor = "multi_thread")]
+async fn remembered_config_changes_notify_subscribers_once() {
+    let tmp = tempfile::tempdir().unwrap();
+    let mgr = manager(tmp.path(), Arc::new(FakeAgent::default()));
+    let events = Arc::new(Mutex::new(Vec::new()));
+    let sink = events.clone();
+    mgr.subscribe(Arc::new(move |e| sink.lock().push(e)));
+    events.lock().clear();
+
+    let reported = config::options_of(&json!({ "configOptions": [
+        { "id": "model", "category": "model", "type": "select", "currentValue": "default",
+          "options": [{ "value": "default" }, { "value": "custom-opus" }] },
+    ] }));
+    mgr.shared.remember("claude", Some(&reported), None, Some("default"));
+    assert!(
+        events.lock().iter().any(|ev| matches!(ev, AgentEvent::Providers)),
+        "a first report changing the cache notifies subscribers"
+    );
+    events.lock().clear();
+
+    // The same report again: the cache is unchanged, so subscribers hear nothing.
+    mgr.shared.remember("claude", Some(&reported), None, Some("default"));
+    assert!(events.lock().is_empty(), "an unchanged report must stay silent");
+
+    // A changed model list notifies again, and providers() serves the new list.
+    let updated = config::options_of(&json!({ "configOptions": [
+        { "id": "model", "category": "model", "type": "select", "currentValue": "default",
+          "options": [{ "value": "default" }, { "value": "custom-opus" }, { "value": "custom-sonnet" }] },
+    ] }));
+    mgr.shared.remember("claude", Some(&updated), None, Some("default"));
+    assert!(
+        events.lock().iter().any(|ev| matches!(ev, AgentEvent::Providers)),
+        "a changed model list notifies subscribers"
+    );
+    let claude = mgr.providers().into_iter().find(|p| p.id == "claude").unwrap();
+    let model = claude.config.iter().find(|o| o.category.as_deref() == Some("model")).unwrap();
+    let values: Vec<_> = model.values.iter().map(|v| v.value.as_str()).collect();
+    assert_eq!(values, ["default", "custom-opus", "custom-sonnet"]);
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn idle_agents_stop_and_resume_their_session_on_the_next_message() {
    let new = || NewAgentTask {
@@ -2449,10 +2521,10 @@ async fn session_settings_win_over_discovery_in_memory_and_on_disk() {
        let saved = options("saved", "low");
        let discovered = options("discovered", "high");
        if discovery_first {
-            mgr.shared.remember_discovered("claude", &discovered, &[]);
+            mgr.shared.remember_discovered("claude", &discovered, &[], &[]);
        }
        mgr.shared.remember("claude", Some(&saved), None, Some("saved"));
-        mgr.shared.remember_discovered("claude", &discovered, &[]);
+        mgr.shared.remember_discovered("claude", &discovered, &[], &[]);
        let restored = manager(tmp.path(), Arc::new(FakeAgent::default()));
        for mgr in [&mgr, &restored] {
            assert_eq!(model_of(&mgr.shared.known_config("claude")).as_deref(), Some("saved"));
@@ -2460,3 +2532,143 @@ async fn session_settings_win_over_discovery_in_memory_and_on_disk() {
        }
    }
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn discovered_effort_levels_fill_models_no_session_has_reported() {
+    let tmp = tempfile::tempdir().unwrap();
+    let mgr = manager(tmp.path(), Arc::new(FakeAgent::default()));
+    let effort = |values: &[&str], current: &str| {
+        config::options_of(&json!({ "configOptions": [
+            { "id": "effort", "category": "thought_level", "type": "select", "currentValue": current,
+              "options": values.iter().map(|v| json!({ "value": v })).collect::<Vec<_>>() }
+        ] }))
+    };
+    let model = config::options_of(&json!({ "configOptions": [
+        { "id": "model", "category": "model", "type": "select", "currentValue": "sonnet",
+          "options": [{ "value": "sonnet" }, { "value": "opus" }] }
+    ] }));
+    // A session already reported sonnet's levels; discovery adds opus's.
+    let reported = [model.clone(), effort(&["low", "high"], "high")].concat();
+    mgr.shared.remember("claude", Some(&reported), None, Some("sonnet"));
+    let levels =
+        [("sonnet".to_owned(), effort(&["low"], "low")), ("opus".to_owned(), effort(&["low", "max"], "default"))];
+    mgr.shared.remember_discovered("claude", &model, &[], &levels);
+    let known = mgr.shared.known.lock();
+    assert_eq!(known["claude"].thought_levels["sonnet"], effort(&["low", "high"], "high"), "the session's report wins");
+    assert_eq!(known["claude"].thought_levels["opus"], effort(&["low", "max"], "default"));
+}
+
+#[test]
+fn streamed_text_is_sent_as_appends() {
+    let mut streamed = HashMap::new();
+    let agent = |t: &str| AgentEntry::Agent { text: t.into() };
+    let first = entry_event("t", &mut streamed, None, 3, &agent("Hé"));
+    assert!(matches!(first, AgentEvent::Entry { index: 3, .. }), "the first sight of a message is whole");
+    let next = entry_event("t", &mut streamed, None, 3, &agent("Hé 👋 there"));
+    assert!(
+        matches!(&next, AgentEvent::Append { subagent: None, index: 3, from: 2, text, .. } if text == " 👋 there"),
+        "{next:?}"
+    );
+    let sub = entry_event("t", &mut streamed, Some("s".into()), 3, &agent("Hé 👋 there!"));
+    assert!(matches!(sub, AgentEvent::Entry { .. }), "each session streams on its own");
+    let after = entry_event("t", &mut streamed, None, 3, &agent("Hé 👋 there."));
+    assert!(
+        matches!(&after, AgentEvent::Append { from: 11, text, .. } if text == "."),
+        "from counts UTF-16 units: {after:?}"
+    );
+    let replaced = entry_event("t", &mut streamed, None, 3, &agent("Other"));
+    assert!(matches!(replaced, AgentEvent::Entry { .. }), "text that doesn't extend the sent text is sent whole");
+    let thought = entry_event("t", &mut streamed, None, 4, &AgentEntry::Thought { text: "hmm…".into() });
+    assert!(matches!(thought, AgentEvent::Entry { index: 4, .. }), "a new message starts whole");
+    let tool = AgentEntry::Error { message: "x".into() };
+    entry_event("t", &mut streamed, None, 4, &tool);
+    let again = entry_event("t", &mut streamed, None, 4, &AgentEntry::Thought { text: "hmm… ok".into() });
+    assert!(matches!(again, AgentEvent::Entry { .. }), "an entry replaced by another kind forgets its text");
+
+    let long = "é".repeat(5000);
+    entry_event("t", &mut streamed, None, 5, &agent(&long));
+    assert!(streamed[&None].tail.len() <= 64, "only the end of what was sent is kept");
+    let on = entry_event("t", &mut streamed, None, 5, &agent(&format!("{long}!")));
+    assert!(matches!(&on, AgentEvent::Append { from: 5000, text, .. } if text == "!"), "{on:?}");
+    let rewritten = entry_event("t", &mut streamed, None, 5, &agent(&format!("{}x!??", "é".repeat(4999))));
+    assert!(matches!(rewritten, AgentEvent::Entry { .. }), "a rewritten end is sent whole");
+}
+
+#[test]
+fn error_messages_keep_the_agents_details() {
+    let details = json!({ "details": "spawn claude ENOENT" });
+    assert_eq!(with_details("Internal error".into(), Some(&details)), "Internal error: spawn claude ENOENT");
+    assert_eq!(
+        with_details("Internal error".into(), Some(&json!("model not found"))),
+        "Internal error: model not found"
+    );
+    assert_eq!(with_details(String::new(), Some(&details)), "spawn claude ENOENT");
+    assert_eq!(with_details("spawn claude ENOENT".into(), Some(&details)), "spawn claude ENOENT");
+    assert_eq!(with_details("Internal error".into(), Some(&json!({ "other": 1 }))), "Internal error");
+    assert_eq!(with_details("Internal error".into(), None), "Internal error");
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn rolling_back_restores_the_start_of_the_task_and_keeps_the_users_own_edits() {
+    let tmp = tempfile::tempdir().unwrap();
+    let dir = dunce::canonicalize(tmp.path()).unwrap();
+    let git = |args: &[&str]| {
+        let ok = std::process::Command::new("git")
+            .args(["-c", "user.name=t", "-c", "user.email=t@t", "-c", "commit.gpgsign=false"])
+            .args(args)
+            .current_dir(&dir)
+            .status()
+            .unwrap()
+            .success();
+        assert!(ok, "{args:?}");
+    };
+    let write = |rel: &str, text: &str| std::fs::write(dir.join(rel), text).unwrap();
+    let read = |rel: &str| std::fs::read_to_string(dir.join(rel)).unwrap();
+    git(&["init", "-q", "-b", "main"]);
+    write(".gitignore", "store/\nworktrees/\nagents/\nmodels.json\n");
+    write("mine.txt", "base\n");
+    write("other.txt", "base\n");
+    git(&["add", "."]);
+    git(&["commit", "-q", "-m", "init"]);
+    // The user's own uncommitted edit, before the task starts.
+    write("mine.txt", "my edit\n");
+
+    let mgr = manager(&dir, Arc::new(FakeAgent::default()));
+    let task = mgr
+        .create(NewAgentTask {
+            project_root: None,
+            prompt: text("Hello"),
+            provider: "claude".into(),
+            config: Vec::new(),
+            isolation: Isolation::Local,
+            base: None,
+        })
+        .await
+        .unwrap();
+    wait_for(&mgr, &task.id, AgentStatus::NeedsInput).await;
+    mgr.cancel(&task.id, None).unwrap();
+    wait_for(&mgr, &task.id, AgentStatus::Ready).await;
+    // What the agent did.
+    write("mine.txt", "my edit\nand the agent's\n");
+    write("other.txt", "agent\n");
+    write("new.txt", "agent\n");
+    async fn changed(mgr: &AgentManager, id: &str) -> Vec<String> {
+        mgr.changes(id).await.unwrap().into_iter().map(|c| c.rel_path).collect()
+    }
+    assert_eq!(changed(&mgr, &task.id).await, ["mine.txt", "new.txt", "other.txt"]);
+
+    mgr.rollback_changes(&task.id, Some(vec!["other.txt".into()])).await.unwrap();
+    assert_eq!(read("other.txt"), "base\n");
+    assert_eq!(changed(&mgr, &task.id).await, ["mine.txt", "new.txt"]);
+
+    // After a restart, from the saved copy.
+    mgr.shutdown();
+    let mgr = manager(&dir, Arc::new(FakeAgent::default()));
+    mgr.rollback_changes(&task.id, None).await.unwrap();
+    assert_eq!(read("mine.txt"), "my edit\n", "the user's edit stays");
+    assert!(!dir.join("new.txt").exists());
+    assert!(changed(&mgr, &task.id).await.is_empty());
+
+    mgr.delete(&task.id, false).await.unwrap();
+    assert!(!dir.join("store").join(format!("{}.before", task.id)).exists());
+}
@@ -116,7 +116,7 @@ pub(crate) fn changes(cwd: &Path, base: &str) -> IdeResult<Vec<AgentChange>> {
 /// Size and modification time of a file, `None` once it is gone.
 pub(crate) type Stamp = Option<(u64, u128)>;

-fn stamp(path: &Path) -> Stamp {
+pub(crate) fn stamp(path: &Path) -> Stamp {
    let meta = std::fs::metadata(path).ok()?;
    let modified = meta.modified().ok()?.duration_since(UNIX_EPOCH).ok()?.as_nanos();
    Some((meta.len(), modified))
@@ -132,6 +132,77 @@ pub(crate) fn without_untouched(changes: Vec<AgentChange>, before: &BTreeMap<Str
    changes.into_iter().filter(|c| before.get(&c.rel_path).is_none_or(|s| *s != stamp(&c.path))).collect()
 }

+/// Files larger than this that were changed before the task keep no copy: they can't be rolled back.
+const SAVED_MAX: u64 = 8 * 1024 * 1024;
+
+fn saved_name(rel: &str) -> String {
+    use std::hash::{DefaultHasher, Hash, Hasher};
+    let mut hash = DefaultHasher::new();
+    rel.hash(&mut hash);
+    format!("{:016x}", hash.finish())
+}
+
+/// Copies the files in `before` (already changed in the checkout at `cwd` when the task started)
+/// into `dir`, so rolling back the task's changes to them restores the user's own edits.
+/// Whether anything was saved.
+pub(crate) fn save_before(cwd: &Path, before: &BTreeMap<String, Stamp>, dir: &Path) -> IdeResult<bool> {
+    let Some(repo) = Repo::discover(cwd)? else { return Ok(false) };
+    let mut saved = false;
+    for (rel, stamp) in before {
+        let path = repo.root().join(rel);
+        if stamp.is_none() || !std::fs::metadata(&path).is_ok_and(|m| m.is_file() && m.len() <= SAVED_MAX) {
+            continue;
+        }
+        std::fs::create_dir_all(dir)?;
+        std::fs::copy(&path, dir.join(saved_name(rel)))?;
+        saved = true;
+    }
+    Ok(saved)
+}
+
+/// Rolls `change` back: to the copy saved when the task started when the file had changes
+/// then (`before`, `saved` holding the copies), otherwise to `base` (removed when `base`
+/// lacks it).
+pub(crate) fn restore(
+    cwd: &Path,
+    base: &str,
+    change: &AgentChange,
+    before: &BTreeMap<String, Stamp>,
+    saved: Option<&Path>,
+) -> IdeResult<()> {
+    let path = &change.path.0;
+    let content = match before.get(&change.rel_path) {
+        Some(None) => None,
+        Some(Some(_)) => {
+            let copy =
+                saved.map(|d| d.join(saved_name(&change.rel_path))).filter(|p| p.is_file()).ok_or_else(|| {
+                    IdeError::invalid(format!(
+                        "{} had changes of yours when the task started that weren't saved; roll it back in Git instead",
+                        change.rel_path
+                    ))
+                })?;
+            Some(std::fs::read(copy)?)
+        }
+        None => {
+            let repo = Repo::discover(cwd)?.ok_or_else(|| IdeError::invalid("not in a git repository"))?;
+            repo.file_bytes_at(path, Some(base))?
+        }
+    };
+    match content {
+        Some(bytes) => {
+            if let Some(parent) = path.parent() {
+                std::fs::create_dir_all(parent)?;
+            }
+            std::fs::write(path, bytes)?;
+        }
+        None => match std::fs::remove_file(path) {
+            Err(e) if e.kind() != std::io::ErrorKind::NotFound => return Err(e.into()),
+            _ => {}
+        },
+    }
+    Ok(())
+}
+
 pub(crate) fn file_at(cwd: &Path, path: &Path, rev: &str) -> IdeResult<Option<String>> {
    let Some(repo) = Repo::discover(cwd)? else { return Ok(None) };
    let encoding = match ide_vfs::load_text(path) {
@@ -7,7 +7,9 @@ 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
@@ -184,6 +184,30 @@ pub fn launch_fingerprint(
    Ok(Some(LaunchFingerprint { version: 2, parameters, files }))
 }

+impl LaunchFingerprint {
+    /// 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
+    }
+}
+
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -282,6 +306,60 @@ 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();
@@ -263,7 +263,12 @@ pub(super) fn maven_steps(
        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"], &subdir(root, &p.dir), Format::Maven);
+        let mut s = BuildStep::new(
+            &p.command,
+            &["-B", "-Dstyle.color=never", maven::LOCAL_REPO_TRACKING_ARG],
+            &subdir(root, &p.dir),
+            Format::Maven,
+        );
        s.args.extend(p.options.iter().cloned());
        s.args.extend(extra.iter().cloned());
        s.args.extend(goals.iter().map(|g| (*g).to_owned()));
@@ -1044,9 +1049,21 @@ 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", "test-compile"]);
+        assert_eq!(p.steps[0].args, ["-B", "-Dstyle.color=never", maven::LOCAL_REPO_TRACKING_ARG, "test-compile"]);
        let p = plan(&root, &model, BuildKind::Rebuild, Some(&root.join("core/src/main/java/A.java")), None).unwrap();
-        assert_eq!(p.steps[0].args, ["-B", "-Dstyle.color=never", "-pl", "core", "-am", "clean", "test-compile"]);
+        assert_eq!(
+            p.steps[0].args,
+            [
+                "-B",
+                "-Dstyle.color=never",
+                maven::LOCAL_REPO_TRACKING_ARG,
+                "-pl",
+                "core",
+                "-am",
+                "clean",
+                "test-compile"
+            ]
+        );
        assert_eq!(p.steps[0].cwd, root);
        assert_eq!(p.title, "demo: build module 'core'");

@@ -1320,12 +1337,36 @@ mod tests {
            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", "-s", "settings.xml", "-pl", "app", "-am", goal]);
+            assert_eq!(
+                step.args,
+                [
+                    "-B",
+                    "-Dstyle.color=never",
+                    maven::LOCAL_REPO_TRACKING_ARG,
+                    "-s",
+                    "settings.xml",
+                    "-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", "-s", "settings.xml", "-pl", "app", "-am", "clean", goal]
+                [
+                    "-B",
+                    "-Dstyle.color=never",
+                    maven::LOCAL_REPO_TRACKING_ARG,
+                    "-s",
+                    "settings.xml",
+                    "-pl",
+                    "app",
+                    "-am",
+                    "clean",
+                    goal
+                ]
            );
        }
    }
@@ -528,7 +528,17 @@ 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", "-o", "-Peditor", "test-compile"]);
+                assert_eq!(
+                    step.args,
+                    [
+                        "-B",
+                        "-Dstyle.color=never",
+                        crate::maven::LOCAL_REPO_TRACKING_ARG,
+                        "-o",
+                        "-Peditor",
+                        "test-compile"
+                    ]
+                );
                assert_eq!(step.env.get("JAVA_HOME").map(String::as_str), Some("/jdk"));
            }
        }
@@ -16,6 +16,16 @@ use std::io::Read;
 use std::path::{Path, PathBuf};
 use std::sync::{Mutex, OnceLock};

+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"];
@@ -497,7 +507,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) = std::fs::read_to_string(settings).ok().and_then(|text| xml::parse(&text)) else {
+    let Some(root) = xml::read_text(settings).as_deref().and_then(xml::parse) else {
        return Vec::new();
    };
    let active: Vec<String> =
@@ -517,7 +527,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 = std::fs::read_to_string(settings).ok()?;
+    let text = xml::read_text(settings)?;
    let root = xml::parse(&text)?;
    let repo = root.text_of("localRepository")?.trim().to_owned();
    if repo.is_empty() {
@@ -543,7 +553,7 @@ impl Resolver {
    fn pom(&mut self, path: &Path) -> Option<RawPom> {
        self.poms
            .entry(path.to_path_buf())
-            .or_insert_with(|| std::fs::read_to_string(path).ok().and_then(|t| parse_pom(&t)))
+            .or_insert_with(|| xml::read_text(path).as_deref().and_then(parse_pom))
            .clone()
    }

@@ -734,7 +744,7 @@ pub(crate) fn launch_inputs(
                return None;
            }
            out.push(path.clone());
-            let text = std::fs::read_to_string(&path).ok()?;
+            let text = xml::read_text(&path)?;
            roots(&xml::parse(&text)?, "", &dir, &mut out)?;
            let raw = resolver.pom(&path)?;
            let Some(parent) = raw.parent else { break };
@@ -1638,7 +1648,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 Ok(next) = std::fs::read_to_string(&pp) else { return chain };
+        let Some(next) = xml::read_text(&pp) else { return chain };
        pom = resolver.pom(&pp);
        dir = pp.parent().unwrap_or(Path::new("")).to_path_buf();
        chain.push((pp, next));
@@ -2295,6 +2305,24 @@ 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,
@@ -0,0 +1,124 @@
+//! 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}");
+        }
+    }
+}
@@ -341,7 +341,13 @@ 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()];
+        let mut args: Vec<String> = vec![
+            "-B".into(),
+            "-fae".into(),
+            "-Dstyle.color=never".into(),
+            "-T1".into(),
+            maven::LOCAL_REPO_TRACKING_ARG.into(),
+        ];
        args.extend(sync_maven_options(&options.maven_options));
        if options.offline {
            args.push("-o".into());
@@ -3,6 +3,57 @@
 //! 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,
@@ -210,4 +261,19 @@ 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"));
+    }
 }
@@ -11,3 +11,6 @@ license.workspace = true
 objc2 = { version = "0.6", default-features = false, features = ["std"] }
 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"] }
+
+[target.'cfg(target_os = "linux")'.dependencies]
+gtk = "0.18"
@@ -21,6 +21,12 @@

 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)
+}
+
 /// Size of `DROPFILES`: `pFiles`, `pt` (two `LONG`s), `fNC`, `fWide`.
 const HEADER: usize = 20;

@@ -165,8 +171,12 @@ 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(ptr::null_mut()) } != 0 {
+            if unsafe { OpenClipboard(owner) } != 0 {
                return true;
            }
            std::thread::sleep(OPEN_RETRY);
@@ -230,6 +240,29 @@ 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 {
@@ -340,6 +373,19 @@ mod imp {
        })
    }

+    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(|_| {
@@ -370,6 +416,19 @@ 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
    }
@@ -7,7 +7,6 @@ license.workspace = true

 [dependencies]
 dunce.workspace = true
-percent-encoding = "2"
 encoding_rs.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -23,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_Registry", "Win32_System_SystemInformation", "Win32_System_Threading"] }
+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"] }
@@ -73,6 +73,8 @@ pub struct EditorAppearanceSettings {
    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,
@@ -95,6 +97,7 @@ impl Default for EditorAppearanceSettings {
            whitespace_inner: true,
            whitespace_trailing: true,
            indent_guides: true,
+            rainbow_indent_guides: false,
            hard_wrap_guides: true,
            intention_bulb: true,
            distraction_free_width: 80,
@@ -42,6 +42,10 @@ 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 {
@@ -148,6 +152,12 @@ 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 {
@@ -16,7 +16,6 @@ pub mod ipc_path;
 pub mod java_runtime;
 pub mod jsonc;
 pub mod output_encoding;
-pub mod path_mapping;
 pub mod platform;
 pub mod process;
 pub mod project_dir;
@@ -27,6 +26,7 @@ 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;
@@ -1,193 +0,0 @@
-//! Lexical path translation at protocol boundaries, independent of LSP or DAP.
-use percent_encoding::{CONTROLS, percent_decode_str, utf8_percent_encode};
-use serde_json::Value;
-
-const ESCAPES: &percent_encoding::AsciiSet = &CONTROLS
-    .add(b' ')
-    .add(b'"')
-    .add(b'#')
-    .add(b'%')
-    .add(b'<')
-    .add(b'>')
-    .add(b'?')
-    .add(b'[')
-    .add(b']')
-    .add(b'\\')
-    .add(b'^')
-    .add(b'`')
-    .add(b'{')
-    .add(b'|')
-    .add(b'}');
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct PathMapping {
-    host: String,
-    target: String,
-    windows: bool,
-}
-
-#[derive(Clone, Copy)]
-pub enum Direction {
-    ToTarget,
-    ToHost,
-}
-
-fn normalized(path: &str) -> String {
-    let path = path
-        .strip_prefix(r"\\?\UNC\")
-        .map(|p| format!("//{p}"))
-        .unwrap_or_else(|| path.strip_prefix(r"\\?\").unwrap_or(path).to_owned());
-    let path = path.replace('\\', "/");
-    if path == "/" { path } else { path.trim_end_matches('/').to_owned() }
-}
-
-pub fn file_path(uri: &str) -> Option<String> {
-    if !uri.get(..7)?.eq_ignore_ascii_case("file://") {
-        return None;
-    }
-    let rest = &uri[7..];
-    let path = if rest.starts_with('/') {
-        rest.to_owned()
-    } else {
-        let (authority, path) = rest.split_once('/')?;
-        if authority.eq_ignore_ascii_case("localhost") { format!("/{path}") } else { format!("//{authority}/{path}") }
-    };
-    let decoded = percent_decode_str(path.split(['?', '#']).next()?).decode_utf8().ok()?;
-    let path = decoded.strip_prefix('/').filter(|p| p.as_bytes().get(1) == Some(&b':')).unwrap_or(&decoded);
-    Some(path.to_owned())
-}
-
-pub fn file_uri(path: &str) -> String {
-    let path = normalized(path);
-    format!("file://{}{}", if path.starts_with('/') { "" } else { "/" }, utf8_percent_encode(&path, ESCAPES))
-}
-
-impl PathMapping {
-    pub fn new(host: &str, target: &str) -> Self {
-        let host = normalized(host);
-        let windows = host.as_bytes().get(1) == Some(&b':') || host.starts_with("//");
-        Self { host, target: normalized(target), windows }
-    }
-
-    pub fn map(&self, value: &str, direction: Direction) -> Option<String> {
-        let uri_path = file_path(value);
-        let is_uri = uri_path.is_some();
-        let path = normalized(uri_path.as_deref().unwrap_or(value));
-        let (from, to) = match direction {
-            Direction::ToTarget => (&self.host, &self.target),
-            Direction::ToHost => (&self.target, &self.host),
-        };
-        let prefix = path.get(..from.len())?;
-        let same = if self.windows && matches!(direction, Direction::ToTarget) {
-            prefix.eq_ignore_ascii_case(from)
-        } else {
-            prefix == from
-        };
-        if !same {
-            return None;
-        }
-        let suffix = &path[from.len()..];
-        if !suffix.is_empty() && !suffix.starts_with('/') && from != "/" {
-            return None;
-        }
-        // Never let lexical parent segments escape either mapped root.
-        if suffix.split('/').any(|p| p == ".." || p == ".") {
-            return None;
-        }
-        let mapped = format!("{}/{}", to.trim_end_matches('/'), suffix.trim_start_matches('/'));
-        let mapped = if suffix.is_empty() { to.clone() } else { mapped };
-        Some(if is_uri {
-            let suffix = value.find(['?', '#']).map(|i| &value[i..]).unwrap_or("");
-            format!("{}{suffix}", file_uri(&mapped))
-        } else if self.windows && matches!(direction, Direction::ToHost) {
-            mapped.replace('/', "\\")
-        } else {
-            mapped
-        })
-    }
-
-    pub fn rewrite(&self, value: &mut Value, direction: Direction) {
-        rewrite_strings(value, &|s| self.map(s, direction));
-    }
-}
-
-/// Rewrites strings and object keys (WorkspaceEdit.changes uses URIs as keys).
-/// Resolve tokens and command arguments remain opaque; source text is never a path.
-pub fn rewrite_strings(value: &mut Value, map: &dyn Fn(&str) -> Option<String>) {
-    match value {
-        Value::String(s) => {
-            if let Some(mapped) = map(s) {
-                *s = mapped;
-            }
-        }
-        Value::Array(items) => items.iter_mut().for_each(|v| rewrite_strings(v, map)),
-        Value::Object(fields) => {
-            let old = std::mem::take(fields);
-            for (key, mut value) in old {
-                if !matches!(key.as_str(), "data" | "arguments" | "text" | "newText" | "insertText") {
-                    rewrite_strings(&mut value, map);
-                }
-                fields.insert(map(&key).unwrap_or(key), value);
-            }
-        }
-        _ => {}
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-
-    #[test]
-    fn roots_encoding_boundaries_and_windows() {
-        for host in ["C:/Users/me/项目", r"C:\Users\me\项目", r"\\?\C:\Users\me\项目"] {
-            let m = PathMapping::new(host, "/app");
-            assert_eq!(m.map(r"\\?\c:\Users\me\项目\a b#%.php", Direction::ToTarget).unwrap(), "/app/a b#%.php");
-            assert_eq!(
-                m.map("file:///C:/Users/me/%E9%A1%B9%E7%9B%AE/a%20b%23%25.php", Direction::ToTarget).unwrap(),
-                "file:///app/a%20b%23%25.php"
-            );
-            assert_eq!(
-                m.map("file:///app/a%20b%23%25.php", Direction::ToHost).unwrap(),
-                "file:///C:/Users/me/%E9%A1%B9%E7%9B%AE/a%20b%23%25.php"
-            );
-            assert_eq!(m.map("/app/a.php", Direction::ToHost).unwrap(), r"C:\Users\me\项目\a.php");
-            for outside in ["/app2/a", "/vendor/a", "/app/../outside", "jdt://app/a"] {
-                assert!(m.map(outside, Direction::ToHost).is_none());
-            }
-        }
-        let unc = PathMapping::new(r"\\?\UNC\server\share\project", "/app");
-        assert_eq!(unc.map("file://server/share/project/a.php", Direction::ToTarget).unwrap(), "file:///app/a.php");
-        assert_eq!(unc.map("/app/a.php", Direction::ToHost).unwrap(), r"\\server\share\project\a.php");
-        let m = PathMapping::new("/home/me/project", "/app");
-        assert_eq!(m.map("/home/me/project", Direction::ToTarget).unwrap(), "/app");
-        assert_eq!(m.map("file://localhost/app/a", Direction::ToHost).unwrap(), "file:///home/me/project/a");
-        assert!(m.map("/home/me/project2/a", Direction::ToTarget).is_none());
-        assert_eq!(
-            m.map("file:///app/a%23b?query#fragment", Direction::ToHost).unwrap(),
-            "file:///home/me/project/a%23b?query#fragment"
-        );
-    }
-
-    #[test]
-    fn nested_messages_resource_operations_and_opaque_payloads() {
-        let m = PathMapping::new("/host/project", "/app");
-        let mut v = json!({"rootUri":"file:///host/project", "rootPath":"/host/project", "workspaceFolders":[{"uri":"file:///host/project"}],
-            "edit":{"changes":{"file:///host/project/a":[]}, "documentChanges":[{"oldUri":"file:///host/project/a", "newUri":"file:///host/project/b"}]},
-            "relatedInformation":[{"location":{"uri":"file:///host/project/a"}}], "target":"file:///host/project/b",
-            "configuration":[{"includePath":"/host/project/vendor"}], "text":"/host/project/a", "newText":"/host/project/b", "data":{"uri":"file:///host/project/a"}, "command":{"arguments":["/host/project/a"]}});
-        let original = v.clone();
-        m.rewrite(&mut v, Direction::ToTarget);
-        assert_eq!(v["rootUri"], "file:///app");
-        assert_eq!(v["rootPath"], "/app");
-        assert!(v["edit"]["changes"].get("file:///app/a").is_some());
-        assert_eq!(v["edit"]["documentChanges"][0]["newUri"], "file:///app/b");
-        assert_eq!(v["relatedInformation"][0]["location"]["uri"], "file:///app/a");
-        assert_eq!(v["configuration"][0]["includePath"], "/app/vendor");
-        assert_eq!(v["data"], original["data"]);
-        assert_eq!(v["command"], original["command"]);
-        m.rewrite(&mut v, Direction::ToHost);
-        assert_eq!(v, original);
-    }
-}
@@ -104,6 +104,11 @@ 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.
@@ -136,13 +141,48 @@ mod windows_tree {
        CreateToolhelp32Snapshot, PROCESSENTRY32W, Process32FirstW, Process32NextW, TH32CS_SNAPPROCESS,
    };
    use windows_sys::Win32::System::Threading::{
-        GetProcessTimes, OpenProcess, PROCESS_QUERY_LIMITED_INFORMATION, PROCESS_SYNCHRONIZE, WaitForSingleObject,
+        GetProcessTimes, OpenProcess, PROCESS_QUERY_LIMITED_INFORMATION, PROCESS_SYNCHRONIZE, PROCESS_TERMINATE,
+        TerminateProcess, 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]);
@@ -153,7 +193,7 @@ mod windows_tree {
                if ppid != parent || !seen.insert(pid) {
                    continue;
                }
-                let Some(handle) = open(pid) else { continue };
+                let Some(handle) = open_with(pid, access) else { continue };
                if let Some(at) = started(&handle).filter(|&at| at >= parent_started) {
                    parents.push((pid, at));
                    found.push(handle);
@@ -193,8 +233,12 @@ 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, 0, pid) };
+        let handle = unsafe { OpenProcess(PROCESS_SYNCHRONIZE | PROCESS_QUERY_LIMITED_INFORMATION | access, 0, pid) };
        // SAFETY: as above.
        (!handle.is_null()).then(|| unsafe { OwnedHandle::from_raw_handle(handle) })
    }
@@ -209,6 +253,167 @@ 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
@@ -914,3 +1119,66 @@ 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());
+    }
+}
@@ -201,7 +201,18 @@ pub struct PluginRunTarget {
    pub args: Vec<String>,
    pub workdir_args: Vec<String>,
    pub container_root: Option<String>,
-    pub commands: Vec<(String, Vec<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)]
@@ -48,8 +48,6 @@ pub struct Settings {
    /// Per language server, by name (`rust-analyzer`): launch and protocol
    /// options on top of the language definition, or a server defined here.
    pub language_servers: BTreeMap<String, LanguageServerSettings>,
-    /// Project language id → server and plugin target. Empty target uses the host.
-    pub language_server_targets: BTreeMap<String, LanguageServerTarget>,
    /// Editor › Inspections profiles.
    pub inspections: InspectionSettings,
    /// Editor › Natural Languages › Spelling.
@@ -61,16 +59,16 @@ pub struct Settings {
    /// Build, Execution, Deployment › Run Targets.
    pub run_targets: Vec<RunTarget>,
    pub cmake: CMakeSettings,
-    /// Tools › Agents › Chat.
+    /// Settings › Agents.
    pub agents: AgentSettings,
-    /// Tools › MCP Server (global only).
+    /// Agents › MCP Server (global only).
    pub mcp_server: McpServerSettings,
    /// Plugin settings (`[contributes.settings]`): plugin id → its values by key.
    #[specta(type = BTreeMap<String, BTreeMap<String, specta_typescript::Unknown>>)]
    pub plugins: BTreeMap<String, serde_json::Map<String, serde_json::Value>>,
 }

-/// What the meters in an agent task's header show.
+/// Settings › Agents: what the conversation shows and how messages are sent.
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct AgentSettings {
@@ -82,15 +80,182 @@ pub struct AgentSettings {
    pub show_usage_limits: bool,
    /// What the session has cost so far, as the agent reports it.
    pub show_cost: bool,
+    /// A finished turn's work folds into one line under its message, leaving the reply.
+    pub fold_turns: bool,
+    /// Streaming text is revealed at a steady pace rather than chunk by chunk.
+    pub smooth_text: bool,
+    #[serde(deserialize_with = "or_default")]
+    #[specta(type = ThinkingDisplay)]
+    pub thinking: ThinkingDisplay,
+    #[serde(deserialize_with = "or_default")]
+    #[specta(type = ToolCallDisplay)]
+    pub tool_calls: ToolCallDisplay,
+    /// A tool call's output (a command's, a diff) is shown without opening it.
+    pub expand_tool_output: bool,
+    #[serde(deserialize_with = "or_default")]
+    #[specta(type = SendKey)]
+    pub send_with: SendKey,
+    /// What sending does while the agent works: queue the message for after the turn, or
+    /// send it into the turn.
+    #[serde(deserialize_with = "or_default")]
+    #[specta(type = WhileRunning)]
+    pub while_running: WhileRunning,
+    /// Settings new tasks of an agent start with: agent id → option id → value.
+    #[serde(deserialize_with = "agent_defaults")]
+    #[specta(type = BTreeMap<String, BTreeMap<String, String>>)]
+    pub defaults: BTreeMap<String, BTreeMap<String, String>>,
+    /// MCP servers passed to coding agents in `session/new`, `session/load` and `session/fork`,
+    /// keyed by server name (`[agents.mcpServers.<name>]`).
+    #[serde(deserialize_with = "or_default")]
+    #[specta(type = BTreeMap<String, AgentMcpServer>)]
+    pub mcp_servers: BTreeMap<String, AgentMcpServer>,
 }

 impl Default for AgentSettings {
    fn default() -> Self {
-        Self { show_context_usage: true, show_work_time: true, show_usage_limits: true, show_cost: false }
+        Self {
+            show_context_usage: true,
+            show_work_time: true,
+            show_usage_limits: true,
+            show_cost: false,
+            fold_turns: true,
+            smooth_text: true,
+            thinking: ThinkingDisplay::Auto,
+            tool_calls: ToolCallDisplay::Grouped,
+            expand_tool_output: false,
+            send_with: SendKey::Enter,
+            while_running: WhileRunning::Queue,
+            defaults: BTreeMap::new(),
+            mcp_servers: BTreeMap::new(),
+        }
    }
 }

-/// Tools › MCP Server: agents use the IDE's built-in tools.
+/// Transport of an MCP server configured in Settings › Agents › MCP Servers.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub enum McpTransport {
+    #[default]
+    Stdio,
+    Http,
+    Sse,
+}
+
+/// An MCP server passed to coding agents in `session/new`, `session/load` and `session/fork`.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(default, rename_all = "camelCase")]
+pub struct AgentMcpServer {
+    #[serde(deserialize_with = "or_default")]
+    #[specta(type = McpTransport)]
+    pub transport: McpTransport,
+    pub enabled: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[specta(optional)]
+    pub command: Option<String>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub args: Vec<String>,
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
+    pub env: BTreeMap<String, String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[specta(optional)]
+    pub url: Option<String>,
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
+    pub headers: BTreeMap<String, String>,
+    /// Agent provider ids this server is enabled for (e.g. `["claude", "codex"]`);
+    /// empty means enabled for all agents.
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub agents: Vec<String>,
+}
+
+impl Default for AgentMcpServer {
+    fn default() -> Self {
+        Self {
+            transport: McpTransport::Stdio,
+            enabled: true,
+            command: None,
+            args: Vec::new(),
+            env: BTreeMap::new(),
+            url: None,
+            headers: BTreeMap::new(),
+            agents: Vec::new(),
+        }
+    }
+}
+
+/// A hand-edited value these settings don't know reads as the default, rather than
+/// failing the whole settings file.
+fn or_default<'de, D, T>(d: D) -> Result<T, D::Error>
+where
+    D: serde::Deserializer<'de>,
+    T: serde::de::DeserializeOwned + Default,
+{
+    Ok(serde_json::from_value(serde_json::Value::deserialize(d)?).unwrap_or_default())
+}
+
+/// [`AgentSettings::defaults`], keeping only the text values of each agent's table.
+fn agent_defaults<'de, D>(d: D) -> Result<BTreeMap<String, BTreeMap<String, String>>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let serde_json::Value::Object(agents) = serde_json::Value::deserialize(d)? else { return Ok(BTreeMap::new()) };
+    Ok(agents
+        .into_iter()
+        .filter_map(|(agent, options)| match options {
+            serde_json::Value::Object(options) => Some((
+                agent,
+                options
+                    .into_iter()
+                    .filter_map(|(k, v)| match v {
+                        serde_json::Value::String(v) => Some((k, v)),
+                        _ => None,
+                    })
+                    .collect(),
+            )),
+            _ => None,
+        })
+        .collect())
+}
+
+/// How the agent's reasoning shows.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub enum ThinkingDisplay {
+    /// Open while it streams, folded once it ends.
+    #[default]
+    Auto,
+    Expanded,
+    Collapsed,
+}
+
+/// How tool calls between messages show.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub enum ToolCallDisplay {
+    /// A run of calls is one line saying what they did ("Read 4 files · Edited 2 files").
+    #[default]
+    Grouped,
+    /// Each call on its own line.
+    Each,
+}
+
+/// The key that sends a message; the other one starts a new line.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub enum SendKey {
+    #[default]
+    Enter,
+    ModEnter,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub enum WhileRunning {
+    #[default]
+    Queue,
+    Steer,
+}
+
+/// Agents › MCP Server: agents use the IDE's built-in tools.
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct McpServerSettings {
@@ -141,14 +306,6 @@ pub struct ToolSettings {
    pub path: String,
 }

-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
-#[serde(default, rename_all = "camelCase")]
-pub struct LanguageServerTarget {
-    pub target: String,
-    /// Empty selects the first configured server for the language.
-    pub server: String,
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct LanguageServerSettings {
@@ -243,7 +400,6 @@ impl Default for Settings {
            external_tools: Vec::new(),
            tools: BTreeMap::new(),
            language_servers: BTreeMap::new(),
-            language_server_targets: BTreeMap::new(),
            inspections: InspectionSettings::default(),
            spelling: SpellingSettings::default(),
            ssh: SshSettings::default(),
@@ -277,6 +433,10 @@ pub struct CustomKeymap {
 pub struct GeneralSettings {
    pub reopen_last_project: bool,
    pub confirm_exit: bool,
+    /// When on, the last window closes instead of showing the Welcome screen.
+    pub close_without_welcome: bool,
+    /// When on, closing a window drops its saved editor tabs, so they are not restored next time.
+    pub close_tabs_with_window: bool,
    /// Where Open… puts a project while one is open: `ask` | `new` | `same` | `attach`.
    pub open_project_in: String,
    /// Initial folder of the Open / Clone dialogs; empty = the OS default.
@@ -292,6 +452,7 @@ pub struct GeneralSettings {
    pub project_name: String,
    /// Where updates come from: `auto` (the CNB mirror for the Chinese UI, else GitHub) | `github` | `cnb`.
    pub update_source: String,
+    pub auto_check_updates: bool,
 }

 impl Default for GeneralSettings {
@@ -299,6 +460,8 @@ impl Default for GeneralSettings {
        Self {
            reopen_last_project: true,
            confirm_exit: true,
+            close_without_welcome: false,
+            close_tabs_with_window: false,
            open_project_in: "ask".into(),
            default_project_directory: String::new(),
            save_on_idle: false,
@@ -307,6 +470,7 @@ impl Default for GeneralSettings {
            power_save_mode: false,
            project_name: String::new(),
            update_source: "auto".into(),
+            auto_check_updates: true,
        }
    }
 }
@@ -361,6 +525,21 @@ impl Default for NotificationGroupSettings {
    }
 }

+/// Where the Navigation Bar (the file path breadcrumbs) is shown. Mirrors
+/// IDEA's `View | Appearance | Navigation Bar` (Top / Status Bar / Don't show).
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub enum NavigationBarPosition {
+    /// Above the editor, below the main menu / toolbar.
+    Top,
+    /// In the footer, next to the status bar widgets — the default, matching
+    /// where the bar lived before the three-state choice existed.
+    #[default]
+    StatusBar,
+    /// Not shown at all.
+    Hidden,
+}
+
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct AppearanceSettings {
@@ -409,6 +588,9 @@ pub struct AppearanceSettings {
    /// View › Appearance › Toolbar; hidden leaves IDEA's compact window header.
    pub show_main_toolbar: bool,
    pub show_status_bar: bool,
+    /// View › Appearance › Navigation Bar: the file path breadcrumbs, shown in
+    /// the status bar by default, above the editor, or not at all.
+    pub navigation_bar: NavigationBarPosition,
    /// Status bar widgets shown (`true`) or hidden (`false`) by the user
    /// (status bar context menu); widgets not listed use their default.
    pub status_bar_widgets: BTreeMap<String, bool>,
@@ -481,6 +663,7 @@ impl Default for AppearanceSettings {
            widescreen_tool_windows: false,
            show_main_toolbar: true,
            show_status_bar: true,
+            navigation_bar: NavigationBarPosition::StatusBar,
            status_bar_widgets: BTreeMap::new(),
            main_toolbar: None,
        }
@@ -518,6 +701,9 @@ pub struct EditorSettings {
    /// Color Scheme › Language Defaults › Semantic highlighting: local variables and
    /// parameters get a colour derived from their name (IDEA's rainbow identifiers).
    pub semantic_highlighting: bool,
+    /// Docstring markup format whose tags and keywords the Python editor highlights
+    /// (`plain`, `rest`, `epytext`, `google`, `numpy`).
+    pub docstring_format: String,
    /// Color Scheme › Language Defaults › Rainbow brackets: `()`, `[]`, `{}` coloured by depth.
    pub rainbow_brackets: bool,
    pub ligatures: bool,
@@ -562,6 +748,7 @@ impl Default for EditorSettings {
            color_overrides: BTreeMap::new(),
            custom_schemes: BTreeMap::new(),
            semantic_highlighting: false,
+            docstring_format: "rest".into(),
            rainbow_brackets: false,
            ligatures: false,
            fallback_font: String::new(),
@@ -606,6 +793,15 @@ pub struct FileSettings {
    pub file_types: BTreeMap<String, FileTypeAssociation>,
    /// Override File Type: file (project-relative and `/`-separated, or absolute) → language id.
    pub file_type_overrides: BTreeMap<String, String>,
+    /// Compose detection choices, keyed by project-relative file path.
+    pub compose_file_overrides: BTreeMap<String, ComposeFileOverride>,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub enum ComposeFileOverride {
+    Kept,
+    Excluded,
 }

 /// One language's file name and hashbang patterns on top of its definition.
@@ -633,6 +829,7 @@ impl Default for FileSettings {
            local_history_max_mb: 512,
            file_types: BTreeMap::new(),
            file_type_overrides: BTreeMap::new(),
+            compose_file_overrides: BTreeMap::new(),
        }
    }
 }
@@ -654,6 +851,7 @@ pub struct LanguagesSettings {
    pub java: JavaSettings,
    pub ruby: RubySettings,
    pub markdown: MarkdownSettings,
+    pub arduino: ArduinoSettings,
 }

 impl Default for LanguagesSettings {
@@ -675,10 +873,22 @@ impl Default for LanguagesSettings {
            java: JavaSettings::default(),
            ruby: RubySettings::default(),
            markdown: MarkdownSettings::default(),
+            arduino: ArduinoSettings::default(),
        }
    }
 }

+/// Arduino tool discovery paths and default board FQBN, configured in `settings.toml`.
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(default, rename_all = "camelCase")]
+pub struct ArduinoSettings {
+    pub cli: String,
+    pub clangd: String,
+    pub language_server: String,
+    pub cli_config: String,
+    pub fqbn: String,
+}
+
 /// Languages & Frameworks › Markdown. Like IDEA's, it is application-level only.
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
@@ -896,6 +1106,8 @@ pub struct JavaSettings {
    /// Extra JVM options for the Java language server (jdtls), space-separated
    /// (VS Code's `java.jdt.ls.vmargs`).
    pub jdtls_vm_args: String,
+    /// Share one JDT LS across builds in an ordinary project window; other windows remain separate.
+    pub jdtls_shared: bool,
    /// Build Tools › Maven.
    pub maven: MavenSettings,
    /// Build Tools › Gradle.
@@ -1118,6 +1330,11 @@ pub struct ProjectStructureSettings {
    pub unmarked: Vec<String>,
    /// Content roots besides the project folder (absolute paths), shown and searched with it.
    pub content_roots: Vec<String>,
+    /// Other projects (absolute paths) this project depends on; indexed and navigable like content roots.
+    pub dependencies: Vec<String>,
+    /// Per-workspace-member dependencies: member root (IPC path) → the roots it depends on.
+    /// A member not listed here (or with an empty list) navigates only into itself.
+    pub member_dependencies: BTreeMap<String, Vec<String>>,
    /// "Exclude files": `;`-separated name patterns (`*.log;tmp*`) excluded at any depth.
    pub exclude_files: String,
    /// Project compiler output directory (relative to project root or absolute; empty = default).
@@ -1179,6 +1396,26 @@ impl Settings {
 mod tests {
    use super::*;

+    #[test]
+    fn window_close_settings_default_off_and_round_trip() {
+        for old in [r#"{}"#, r#"{"general":{"confirmExit":false}}"#] {
+            let settings: Settings = serde_json::from_str(old).unwrap();
+            assert!(!settings.general.close_without_welcome);
+            assert!(!settings.general.close_tabs_with_window);
+        }
+        for close_window in [false, true] {
+            for close_tabs in [false, true] {
+                let mut settings = Settings::default();
+                settings.general.close_without_welcome = close_window;
+                settings.general.close_tabs_with_window = close_tabs;
+                let json = serde_json::to_value(&settings).unwrap();
+                assert_eq!(json["general"]["closeWithoutWelcome"], close_window);
+                assert_eq!(json["general"]["closeTabsWithWindow"], close_tabs);
+                assert_eq!(serde_json::from_value::<Settings>(json).unwrap().general, settings.general);
+            }
+        }
+    }
+
    #[test]
    fn cmake_profile_argument_arrays_round_trip() {
        let mut settings = Settings::default();
@@ -1241,6 +1478,21 @@ mod tests {
        }
    }

+    #[test]
+    fn docstring_format_defaults_and_round_trips() {
+        let old: Settings = serde_json::from_str(r#"{"editor":{"semanticHighlighting":true}}"#).unwrap();
+        assert_eq!(old.editor.docstring_format, "rest");
+        assert_eq!(Settings::default().editor.docstring_format, "rest");
+        for format in ["plain", "rest", "epytext", "google", "numpy"] {
+            let mut settings = Settings::default();
+            settings.editor.docstring_format = format.into();
+            let json = serde_json::to_value(&settings).unwrap();
+            assert_eq!(json["editor"]["docstringFormat"], format);
+            let restored: Settings = serde_json::from_value(json).unwrap();
+            assert_eq!(restored.editor.docstring_format, format);
+        }
+    }
+
    #[test]
    fn tool_window_badges_default_on_and_round_trip() {
        let old: Settings = serde_json::from_str(r#"{"appearance":{"showToolWindowNames":true}}"#).unwrap();
@@ -1256,6 +1508,27 @@ mod tests {
        }
    }

+    #[test]
+    fn double_click_opens_diff_is_unset_by_default_and_round_trips() {
+        let old: Settings = serde_json::from_str(r#"{"vcs":{"commit":{"nonModal":true}}}"#).unwrap();
+        assert_eq!(old.vcs.commit.double_click_opens_diff, None);
+        // The unset value shows up as `null` in the defaults: `SettingsStore::set` only
+        // accepts a key path it finds there.
+        let json = serde_json::to_value(Settings::default()).unwrap();
+        assert_eq!(json["vcs"]["commit"]["doubleClickOpensDiff"], serde_json::Value::Null);
+        for on in [true, false] {
+            let mut settings = Settings::default();
+            settings.vcs.commit.double_click_opens_diff = Some(on);
+            let json = serde_json::to_value(&settings).unwrap();
+            assert_eq!(json["vcs"]["commit"]["doubleClickOpensDiff"], on);
+            let restored: Settings = serde_json::from_value(json).unwrap();
+            assert_eq!(restored.vcs.commit.double_click_opens_diff, Some(on));
+        }
+        // Explicit `null` reads back as unset.
+        let cleared: Settings = serde_json::from_str(r#"{"vcs":{"commit":{"doubleClickOpensDiff":null}}}"#).unwrap();
+        assert_eq!(cleared.vcs.commit.double_click_opens_diff, None);
+    }
+
    #[test]
    fn agent_meters_default_and_round_trip() {
        let old: Settings = serde_json::from_str(r#"{"agents":{"showCost":true}}"#).unwrap();
@@ -1270,6 +1543,22 @@ mod tests {
        assert_eq!(restored.agents, settings.agents);
    }

+    #[test]
+    fn hand_edited_agent_values_it_does_not_know_keep_the_rest() {
+        let settings: Settings = serde_json::from_str(
+            r#"{"editor":{"fontSize":17},"agents":{"thinking":"open","sendWith":"modEnter",
+                "defaults":{"claude":{"model":"opus","effort":3},"codex":"x"}}}"#,
+        )
+        .unwrap();
+        assert_eq!(settings.editor.font_size, 17.0);
+        assert_eq!(settings.agents.thinking, ThinkingDisplay::Auto);
+        assert_eq!(settings.agents.send_with, SendKey::ModEnter);
+        assert_eq!(
+            settings.agents.defaults,
+            BTreeMap::from([("claude".into(), BTreeMap::from([("model".into(), "opus".into())]))])
+        );
+    }
+
    #[test]
    fn main_menu_style_defaults_and_round_trips() {
        let old: Settings = serde_json::from_str(r#"{"appearance":{"compactMode":true}}"#).unwrap();
@@ -1477,6 +1766,26 @@ mod maven_linkage_tests {
    }
 }

+#[cfg(test)]
+mod java_settings_tests {
+    use super::*;
+
+    #[test]
+    fn shared_jdtls_defaults_off_and_round_trips() {
+        for old in [r#"{}"#, r#"{"jdk":"/jdk"}"#] {
+            let java: JavaSettings = serde_json::from_str(old).unwrap();
+            assert!(!java.jdtls_shared);
+        }
+        for shared in [false, true] {
+            let java = JavaSettings { jdtls_shared: shared, ..JavaSettings::default() };
+            let json = serde_json::to_value(&java).unwrap();
+            assert_eq!(json["jdtlsShared"], serde_json::json!(shared));
+            assert_eq!(serde_json::from_value::<JavaSettings>(json).unwrap(), java);
+        }
+        assert!(serde_json::from_str::<JavaSettings>(r#"{"jdtlsShared":"true"}"#).is_err());
+    }
+}
+
 #[cfg(test)]
 mod gradle_settings_tests {
    use super::*;
@@ -0,0 +1,151 @@
+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,6 +43,7 @@ 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`.
@@ -74,6 +75,7 @@ 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,
@@ -115,6 +117,13 @@ 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 {
@@ -135,6 +144,7 @@ impl Default for CommitSettings {
            show_right_margin: true,
            wrap_at_margin: false,
            disabled_plugin_checks: Vec::new(),
+            double_click_opens_diff: None,
        }
    }
 }
@@ -24,7 +24,5 @@ tracing.workspace = true
 libc = "0.2"

 [dev-dependencies]
-ide-remote.workspace = true
-ide-run.workspace = true
 tracing-subscriber.workspace = true
 tokio = { workspace = true, features = ["net", "rt-multi-thread", "macros", "test-util"] }
@@ -31,7 +31,6 @@ pub enum Transport {
 /// A fully resolved adapter command line.
 #[derive(Clone, Debug)]
 pub struct AdapterSpec {
-    pub target: Option<crate::target::TargetMapping>,
    pub adapter: String,
    pub command: String,
    pub args: Vec<String>,
@@ -52,7 +51,6 @@ pub struct AdapterSpec {
 /// Built-in adapters used when no language definition names `adapter`.
 fn builtin(adapter: &str) -> Option<DebuggerConfig> {
    let cfg = |command: &str, args: &[&str], transport: &str, hint: &str| DebuggerConfig {
-        target_placement: None,
        adapter: adapter.to_owned(),
        command: command.to_owned(),
        args: args.iter().map(|a| (*a).to_owned()).collect(),
@@ -103,6 +101,14 @@ fn builtin(adapter: &str) -> Option<DebuggerConfig> {
        "lldb-dap" => {
            cfg("lldb-dap", &[], "stdio", "Install LLVM's lldb-dap (brew install llvm; on macOS `xcrun -f lldb-dap`)")
        }
+        // GDB's own DAP interpreter, stdio transport. The DAP support it needs shipped in GDB 14
+        // (`prepare_gdb` refuses older ones with the required version in the message).
+        "gdb" => cfg(
+            "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"),
        // A jdtls bundle: the session is started through jdtls and reached via `debugServer`.
        "java-debug" => cfg(
@@ -129,6 +135,7 @@ pub fn default_type(adapter: &str) -> Option<&'static str> {
        "delve" => "go",
        "netcoredbg" => "coreclr",
        "lldb-dap" => "lldb-dap",
+        "gdb" => "gdb",
        "java-debug" => "java",
        _ => return None,
    })
@@ -136,7 +143,6 @@ pub fn default_type(adapter: &str) -> Option<&'static str> {

 pub fn resolve(config: &DebuggerConfig, cwd: PathBuf) -> AdapterSpec {
    AdapterSpec {
-        target: None,
        adapter: config.adapter.clone(),
        command: config.command.clone(),
        args: config.args.clone(),
@@ -335,6 +341,89 @@ 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 {
@@ -368,6 +457,8 @@ 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>,
@@ -419,6 +510,7 @@ 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,
@@ -442,6 +534,7 @@ 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,
@@ -450,7 +543,7 @@ impl AdapterLauncher for ProcessLauncher {
                    program_output: None,
                });
            }
-            if spec.adapter == DEBUGPY_TOOL && spec.target.is_none() {
+            if spec.adapter == DEBUGPY_TOOL {
                prepare_debugpy(&mut spec).await?;
            }
            if is_plugin_bundle(&spec.command) {
@@ -470,9 +563,15 @@ 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 => spawn_adapter(&spec, &binary, &base_args, None, CONNECT_TIMEOUT).await,
+                Transport::Stdio => {
+                    let mut io = spawn_adapter(&spec, &binary, &base_args, None, CONNECT_TIMEOUT).await?;
+                    io.launch_after_configuration = launch_after_configuration;
+                    Ok(io)
+                }
                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
@@ -489,7 +588,10 @@ impl AdapterLauncher for ProcessLauncher {
                        };
                        let args = substitute_port(&base_args, port);
                        match spawn_adapter(&spec, &binary, &args, Some(port), start_timeout).await {
-                            Ok(io) => return Ok(io),
+                            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!(
@@ -525,9 +627,10 @@ async fn spawn_adapter(
        cmd.env("PATH", path);
    }
    ide_core::process::prepare(cmd.as_std_mut());
-    if spec.adapter == "rdbg" {
-        ide_core::process::own_group(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)
@@ -551,6 +654,7 @@ async fn spawn_adapter(
            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),
@@ -582,6 +686,7 @@ async fn spawn_adapter(
            };
            let (r, w) = stream.into_split();
            Ok(AdapterIo {
+                launch_after_configuration: false,
                reader: Box::new(r),
                writer: Box::new(w),
                child: Some(child),
@@ -739,15 +844,102 @@ mod tests {

    #[test]
    fn builtins_cover_common_adapters() {
-        for name in ["codelldb", "debugpy", "js-debug", "delve", "netcoredbg", "java-debug"] {
+        for name in ["codelldb", "debugpy", "js-debug", "delve", "netcoredbg", "java-debug", "gdb"] {
            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);
@@ -71,7 +71,6 @@ pub enum Incoming {
 type Pending = HashMap<i64, (String, oneshot::Sender<Result<Value, DapError>>)>;

 struct Inner {
-    mapping: Option<crate::target::TargetMapping>,
    out: mpsc::UnboundedSender<Vec<u8>>,
    pending: Mutex<Pending>,
    seq: AtomicI64,
@@ -107,22 +106,9 @@ impl Connection {
    /// [`start`](Self::start) that hands lines outside the protocol (an adapter's
    /// own output on stdout, decoded) to `on_output`.
    pub fn start_with_output<R, W>(
-        reader: R,
-        writer: W,
-        on_output: Box<dyn Fn(String) + Send + Sync>,
-    ) -> (Self, mpsc::UnboundedReceiver<Incoming>)
-    where
-        R: AsyncRead + Unpin + Send + 'static,
-        W: AsyncWrite + Unpin + Send + 'static,
-    {
-        Self::start_with_target(reader, writer, on_output, None)
-    }
-
-    pub fn start_with_target<R, W>(
        reader: R,
        mut writer: W,
        on_output: Box<dyn Fn(String) + Send + Sync>,
-        target: Option<crate::target::TargetMapping>,
    ) -> (Self, mpsc::UnboundedReceiver<Incoming>)
    where
        R: AsyncRead + Unpin + Send + 'static,
@@ -131,7 +117,6 @@ impl Connection {
        let (out_tx, mut out_rx) = mpsc::unbounded_channel::<Vec<u8>>();
        let (in_tx, in_rx) = mpsc::unbounded_channel();
        let inner = Arc::new(Inner {
-            mapping: target,
            out: out_tx,
            pending: Mutex::new(HashMap::new()),
            seq: AtomicI64::new(1),
@@ -202,11 +187,7 @@ impl Connection {
        if self.is_closed() {
            return Err(DapError::Closed);
        }
-        let mut value = value.clone();
-        if let Some(mapping) = self.inner.mapping.as_ref() {
-            mapping.rewrite(&mut value, ide_core::path_mapping::Direction::ToTarget);
-        }
-        let body = serde_json::to_vec(&value).map_err(|e| DapError::Protocol(e.to_string()))?;
+        let body = serde_json::to_vec(value).map_err(|e| DapError::Protocol(e.to_string()))?;
        tracing::trace!(target: "ide_dap::wire", "--> {}", String::from_utf8_lossy(&body));
        self.inner.out.send(body).map_err(|_| DapError::Closed)
    }
@@ -265,16 +246,7 @@ impl Connection {

 fn dispatch(inner: &Inner, incoming: &mpsc::UnboundedSender<Incoming>, body: &[u8]) {
    tracing::trace!(target: "ide_dap::wire", "<-- {}", String::from_utf8_lossy(body));
-    let mut msg: Value = match serde_json::from_slice(body) {
-        Ok(v) => v,
-        Err(e) => {
-            tracing::warn!("dap: unparsable message: {e}");
-            return;
-        }
-    };
-    if let Some(mapping) = inner.mapping.as_ref() {
-        mapping.rewrite(&mut msg, ide_core::path_mapping::Direction::ToHost);
-    }
+    let Some(msg) = parse_message(body) else { 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 {
@@ -307,6 +279,25 @@ 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")
@@ -328,6 +319,22 @@ 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 =
@@ -16,7 +16,6 @@ pub mod jdwp;
 pub mod kotlin;
 mod kotlin_jdwp;
 mod session;
-pub mod target;

 use adapter::{AdapterLauncher, AdapterSpec, ProcessLauncher};
 use connection::{Connection, DapError};
@@ -697,17 +696,6 @@ impl DebugManager {
        config: LaunchConfig,
        owner: SessionOwner,
        custom_command: impl FnOnce(&str) -> Option<String>,
-    ) -> IdeResult<DebugSessionId> {
-        self.start_prepared(config, owner, custom_command, |_, _| Ok(())).await
-    }
-
-    /// Configure a target adapter before any host tool resolution or launch.
-    pub async fn start_prepared(
-        &self,
-        config: LaunchConfig,
-        owner: SessionOwner,
-        custom_command: impl FnOnce(&str) -> Option<String>,
-        prepare: impl FnOnce(&mut AdapterSpec, &mut Value) -> IdeResult<()>,
    ) -> IdeResult<DebugSessionId> {
        let mut arguments = launch_arguments(&config)?;
        // An IDE-side marker (never sent to the adapter): the session is a Flutter
@@ -722,22 +710,6 @@ impl DebugManager {
        let dbg = adapter::find_config(&self.languages, &config.adapter)
            .ok_or_else(|| IdeError::unavailable(format!("unknown debug adapter `{}`", config.adapter)))?;
        let mut spec = adapter::resolve(&dbg, cwd.clone());
-        prepare(&mut spec, &mut arguments)?;
-        if spec.target.is_some() {
-            return self
-                .start_session(
-                    DebugSessionId::next(),
-                    owner,
-                    config.name,
-                    config.adapter,
-                    None,
-                    config.request,
-                    arguments,
-                    spec,
-                    None,
-                )
-                .await;
-        }
        if config.adapter == kotlin::ADAPTER
            && let Some(home) = arguments
                .as_object_mut()
@@ -746,6 +718,10 @@ impl DebugManager {
        {
            spec.env.push(("JAVA_HOME".into(), home));
        }
+        // Delve looks up Go before applying the debuggee's launch environment.
+        if config.adapter == "delve" {
+            spec.env.extend(config.env.iter().map(|(key, value)| (key.clone(), value.clone())));
+        }
        if config.adapter == "rdbg" {
            rdbg_command_line(&mut spec, &config, &cwd)?;
        }
@@ -778,6 +754,18 @@ impl DebugManager {
        if let Some(server) = &debug_server {
            spec.server_host = server.host.clone();
        }
+        if config.adapter == "gdb" && config.request == "launch" && debug_server.is_none() {
+            // GDB's DAP env replaces the entire inferior environment. Ordinary run overrides
+            // instead belong on the adapter process, which the inferior inherits. Explicit
+            // launch JSON keeps GDB's replacement semantics.
+            let explicit_env = config.extra_json.as_deref().is_some_and(|extra| {
+                serde_json::from_str::<Value>(extra).is_ok_and(|extra| extra.get("env").is_some())
+            });
+            if !explicit_env {
+                spec.env.extend(config.env.iter().map(|(k, v)| (k.clone(), v.clone())));
+                arguments.as_object_mut().unwrap().remove("env");
+            }
+        }
        if let Some(cargo) = arguments.as_object_mut().and_then(|o| o.remove("cargo")) {
            let cargo_args: Vec<String> = cargo
                .get("args")
@@ -886,22 +874,12 @@ impl DebugManager {
        if request != "launch" && request != "attach" {
            return Err(IdeError::invalid(format!("request must be `launch` or `attach`, got `{request}`")));
        }
-        let io = self.launcher.launch(spec.clone(), reuse_port).await.map_err(|e| {
-            if spec.target.is_some() {
-                IdeError::new(e.kind, format!("{}\nargv: {:?} {:?}", e.message, spec.command, spec.args))
-            } else {
-                e
-            }
-        })?;
+        let io = self.launcher.launch(spec.clone(), reuse_port).await?;
+        let launch_after_configuration = io.launch_after_configuration && request == "launch";
        let stderr = io.stderr.clone();
        let (conn, incoming) = {
            let stderr = stderr.clone();
-            Connection::start_with_target(
-                io.reader,
-                io.writer,
-                Box::new(move |line| adapter::push_line(&stderr, line)),
-                spec.target.clone(),
-            )
+            Connection::start_with_output(io.reader, io.writer, Box::new(move |line| adapter::push_line(&stderr, line)))
        };
        let rdbg_pid = (adapter_name == "rdbg" && request == "launch")
            .then(|| io.child.as_ref().and_then(tokio::process::Child::id))
@@ -935,16 +913,13 @@ impl DebugManager {
        let configured = tokio::select! {
            biased;
            _ = session.startup_cancel.cancelled() => return Err(IdeError::cancelled()),
-            result = self.configure(&session, arguments) => result,
+            result = self.configure(&session, arguments, launch_after_configuration) => result,
        };
        match configured {
            Ok(()) => Ok(id),
            Err(e) => {
                let e = if session.conn.is_closed() {
                    let mut msg = format!("debug adapter `{}` exited during startup", session.adapter);
-                    if session.spec.target.is_some() {
-                        msg.push_str(&format!("\nargv: {:?} {:?}", session.spec.command, session.spec.args));
-                    }
                    let tail = stderr.lock().join("\n");
                    if !tail.is_empty() {
                        msg.push_str(":\n");
@@ -955,17 +930,6 @@ impl DebugManager {
                        msg.push_str(hint);
                    }
                    IdeError::unavailable(msg)
-                } else if session.spec.target.is_some() {
-                    IdeError::new(
-                        e.kind,
-                        format!(
-                            "{}\nargv: {:?} {:?}\n{}",
-                            e.message,
-                            session.spec.command,
-                            session.spec.args,
-                            stderr.lock().join("\n")
-                        ),
-                    )
                } else {
                    e
                };
@@ -976,7 +940,7 @@ impl DebugManager {
        }
    }

-    async fn configure(&self, s: &Arc<Session>, mut arguments: Value) -> IdeResult<()> {
+    async fn configure(&self, s: &Arc<Session>, mut arguments: Value, launch_in_config: bool) -> IdeResult<()> {
        if s.adapter == kotlin::ADAPTER {
            let project = arguments
                .get("projectRoot")
@@ -1003,8 +967,8 @@ impl DebugManager {
                    "pathFormat": "path",
                    "supportsVariableType": true,
                    "supportsVariablePaging": false,
-                    "supportsRunInTerminalRequest": s.spec.target.is_none(),
-                    "supportsStartDebuggingRequest": s.spec.target.is_none(),
+                    "supportsRunInTerminalRequest": true,
+                    "supportsStartDebuggingRequest": true,
                    "supportsProgressReporting": true,
                    "supportsInvalidatedEvent": false,
                    "supportsMemoryReferences": false,
@@ -1042,16 +1006,28 @@ impl DebugManager {
        // Launch/attach may wait for a slow runtime or a remote target. Let the adapter report
        // failure; Stop cancels configuration and a closed connection fails the pending reply.
        // Many adapters answer only after `configurationDone`, so don't wait for the reply yet.
-        let launch = s.conn.send_request(request, arguments)?;
-        let mut launch = Box::pin(async move { launch.await.unwrap_or(Err(DapError::Closed)) });
+        // GDB 15 is the exception: its `launch` starts the program itself (14 runs at
+        // `configurationDone`, 16+ defers the launch there), so its launch waits below.
+        let mut launch = if launch_in_config {
+            None
+        } else {
+            let reply = s.conn.send_request(request, arguments.clone())?;
+            Some(Box::pin(async move { reply.await.unwrap_or(Err(DapError::Closed)) }))
+        };
        let mut initialized = s.initialized.subscribe();
        let mut launch_result = None;
-        let got_initialized = tokio::select! {
-            r = initialized.wait_for(|v| *v) => { r.map_err(|_| DapError::Closed)?; true }
-            r = &mut launch => {
-                r?;
-                launch_result = Some(());
-                false
+        let got_initialized = match launch.as_mut() {
+            Some(launch) => tokio::select! {
+                r = initialized.wait_for(|v| *v) => { r.map_err(|_| DapError::Closed)?; true }
+                r = launch => {
+                    r?;
+                    launch_result = Some(());
+                    false
+                }
+            },
+            None => {
+                initialized.wait_for(|v| *v).await.map_err(|_| DapError::Closed)?;
+                true
            }
        };
        if !got_initialized {
@@ -1109,8 +1085,17 @@ impl DebugManager {
            }
        }
        s.configured.store(true, Ordering::Release);
-        if launch_result.is_none() {
-            launch.await?;
+        match launch.as_mut() {
+            Some(launch) => {
+                if launch_result.is_none() {
+                    launch.await?;
+                }
+            }
+            None => {
+                // GDB 15: the breakpoints are in, so its `run` cannot miss them.
+                let reply = s.conn.send_request(request, arguments)?;
+                reply.await.unwrap_or(Err(DapError::Closed))?;
+            }
        }
        if let Some(relay) = s.kotlin_relay.lock().as_mut() {
            relay.release();
@@ -1130,6 +1115,9 @@ impl DebugManager {

    /// Ends a session: `terminate` (when asked and supported) → `disconnect` → kill.
    pub(crate) async fn shutdown(&self, s: &Arc<Session>, terminate: bool) {
+        if terminate {
+            crate::session::remember_debuggee(s).await;
+        }
        // java-debug runs the program itself and pipes its stdout over DAP. A `disconnect`
        // ends that DAP session, so every line the program writes while shutting down is lost.
        // Ask the program to exit ourselves and keep the adapter attached until it has drained
@@ -1157,7 +1145,7 @@ impl DebugManager {
        if own_terminate && !graceful {
            // Signal before anything else: waiting on a request the adapter may not answer
            // would delay the shutdown the console is supposed to show.
-            crate::session::signal_debuggee(s, false);
+            crate::session::signal_debuggee(s, false).await;
        }
        if graceful {
            // java-debug sends `terminated` only after it has drained the program's console
@@ -45,6 +45,13 @@ pub(crate) struct Session {
    pub debuggees: Mutex<Vec<Child>>,
    /// The terminal a `runInTerminal` program runs in: typed input goes to it.
    pub program: Mutex<Option<ProgramTerminal>>,
+    /// The job object over the adapter and everything it started: the program an adapter
+    /// like java-debug launches is its child, so a forced stop (and the session's
+    /// cleanup) ends the whole tree even when the adapter exited first and the reported
+    /// pid no longer names it. `None` when the assignment failed; the kill then falls
+    /// back to the captured process tree.
+    #[cfg(windows)]
+    pub job: Mutex<Option<ide_core::process::Job>>,
    /// Set once `configurationDone` was sent; breakpoint updates go out live after that.
    pub configured: AtomicBool,
    pub initialized: watch::Sender<bool>,
@@ -59,6 +66,8 @@ pub(crate) struct Session {
    /// adapter may report the launcher shell, whose child is the program).
    #[cfg_attr(not(unix), allow(dead_code))]
    pub stop_pids: parking_lot::Mutex<Vec<i32>>,
+    #[cfg(windows)]
+    pub stop_tree: Mutex<Option<ide_core::process::ProcessTree>>,
    /// Breakpoints replaced for run to cursor / force stepping, restored on the next stop.
    pub pending_restore: Mutex<PendingRestore>,
    /// Adapter breakpoint id → (file, index in the stored list).
@@ -89,6 +98,10 @@ impl Session {
        port: Option<u16>,
        child: Option<Child>,
    ) -> Self {
+        // Before `child` moves into the session: the adapter is the root of the job, so
+        // everything it starts (java-debug's JVM) is in there by inheritance.
+        #[cfg(windows)]
+        let job = child.as_ref().and_then(tokio::process::Child::id).and_then(ide_core::process::Job::for_pid);
        Self {
            id,
            owner,
@@ -103,6 +116,8 @@ impl Session {
            adapter_process: Mutex::new(child),
            debuggees: Mutex::new(Vec::new()),
            program: Mutex::new(None),
+            #[cfg(windows)]
+            job: Mutex::new(job),
            configured: AtomicBool::new(false),
            initialized: watch::channel(false).0,
            startup_cancel: ide_core::CancellationToken::new(),
@@ -111,6 +126,8 @@ impl Session {
            stop_force: AtomicBool::new(false),
            debuggee_pid: AtomicI64::new(0),
            stop_pids: parking_lot::Mutex::new(Vec::new()),
+            #[cfg(windows)]
+            stop_tree: Mutex::new(None),
            pending_restore: Mutex::default(),
            breakpoint_ids: Mutex::new(HashMap::new()),
            resolved_paths: Mutex::new(HashMap::new()),
@@ -278,6 +295,24 @@ impl Session {
    /// Kills the adapter and every debuggee we started.
    pub fn kill_processes(&self) {
        self.kotlin_relay.lock().take();
+        #[cfg(unix)]
+        if self.request == "launch" {
+            for group in launch_groups(self) {
+                ide_core::process::kill_tree_of(group as u32);
+            }
+        }
+        // The job first: it ends the adapter and everything it started (the program
+        // java-debug launched is its child), members included that the stop's captured
+        // tree never saw. An empty job is unaffected, and whatever survives this session
+        // dies when the handle closes (`KILL_ON_JOB_CLOSE`).
+        #[cfg(windows)]
+        if let Some(job) = self.job.lock().as_ref() {
+            job.terminate();
+        }
+        #[cfg(windows)]
+        if let Some(tree) = self.stop_tree.lock().as_ref() {
+            tree.terminate();
+        }
        if let Some(mut c) = self.adapter_process.lock().take() {
            if self.adapter == "rdbg"
                && let Some(pid) = c.id()
@@ -291,6 +326,9 @@ impl Session {
        }
        if let Some(mut program) = self.program.lock().take() {
            let _ = program.child.kill();
+            let _ = std::thread::Builder::new().name("openidea-debug-reap".into()).spawn(move || {
+                let _ = program.child.wait();
+            });
        }
    }
 }
@@ -298,6 +336,21 @@ impl Session {
 /// How long Stop waits for a launched program to exit before reporting the session ended.
 pub(crate) const DEBUGGEE_EXIT_WAIT: Duration = Duration::from_secs(10);

+pub(crate) async fn remember_debuggee(s: &Arc<Session>) {
+    #[cfg(windows)]
+    {
+        let Ok(pid) = u32::try_from(s.debuggee_pid.load(Ordering::Acquire)) else { return };
+        if s.request != "launch" || pid == 0 || s.stop_tree.lock().is_some() {
+            return;
+        }
+        if let Ok(tree) = tokio::task::spawn_blocking(move || ide_core::process::ProcessTree::capture(pid)).await {
+            s.stop_tree.lock().get_or_insert(tree);
+        }
+    }
+    #[cfg(not(windows))]
+    let _ = s;
+}
+
 /// 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)]
@@ -327,18 +380,36 @@ fn process_tree(pid: i32) -> Vec<i32> {
 /// Asks the program itself to exit (`force` = SIGKILL) without ending the adapter session:
 /// its output keeps flowing over DAP while it shuts down. The first call remembers the pid
 /// tree, because the reported pid may die before its program does.
-pub(crate) fn signal_debuggee(s: &Arc<Session>, force: bool) {
-    let pid = s.debuggee_pid.load(Ordering::Acquire);
-    if pid <= 0 {
+pub(crate) async fn signal_debuggee(s: &Arc<Session>, force: bool) {
+    if s.request != "launch" {
        return;
    }
+    #[cfg(not(windows))]
+    let pid = s.debuggee_pid.load(Ordering::Acquire);
    #[cfg(unix)]
    {
-        let mut known = s.stop_pids.lock();
-        if known.is_empty() {
-            *known = process_tree(pid as i32);
+        let needs_tree = pid > 0 && s.stop_pids.lock().is_empty();
+        if needs_tree {
+            let tree = tokio::task::spawn_blocking(move || process_tree(pid as i32)).await.unwrap_or_default();
+            *s.stop_pids.lock() = tree;
        }
+        let known = s.stop_pids.lock();
        let signal = if force { libc::SIGKILL } else { libc::SIGTERM };
+        if force {
+            // A forced stop kills the launch: every root the session spawned leads its own
+            // process group (`own_group` at spawn), so one signal reaches the program and
+            // everything it started, even processes born after the snapshot below was
+            // taken — the adapter's program is in the adapter's group. The session's own
+            // JVM roots (Kotlin) and `runInTerminal` programs lead groups of their own.
+            // The roots are unreaped until the session drops them, so their ids (and the
+            // groups named by them) cannot have been reused yet.
+            for group in launch_groups(s) {
+                // SAFETY: plain syscalls on the processes this session started.
+                if unsafe { libc::kill(-group, libc::SIGKILL) } != 0 {
+                    unsafe { libc::kill(group, libc::SIGKILL) };
+                }
+            }
+        }
        // Children first: the shell that started the program would otherwise reparent it.
        for p in known.iter().rev() {
            // SAFETY: plain syscall on the processes this session started.
@@ -349,17 +420,53 @@ pub(crate) fn signal_debuggee(s: &Arc<Session>, force: bool) {
    }
    #[cfg(windows)]
    {
-        let mut cmd = std::process::Command::new("taskkill");
-        cmd.args(["/PID", &pid.to_string(), "/T"]);
+        // Console programs have no external graceful signal; the adapter gets its chance
+        // first. The job ends the program and everything it started, members included
+        // that the captured tree never saw.
        if force {
-            cmd.arg("/F");
+            if let Some(job) = s.job.lock().as_ref() {
+                job.terminate();
+            }
+            // A separately spawned program may have rejected assignment to the adapter's job.
+            if let Some(tree) = s.stop_tree.lock().as_ref() {
+                tree.terminate();
+            }
        }
-        let _ = cmd.status();
    }
    #[cfg(not(any(unix, windows)))]
    let _ = (pid, force);
 }

+/// The process groups the session spawned roots for: the adapter's (the program it
+/// launched is in it), the JVMs the session started itself, the `runInTerminal` program.
+#[cfg(unix)]
+fn launch_groups(s: &Session) -> Vec<libc::pid_t> {
+    let mut groups = Vec::new();
+    let mut push = |id: Option<u32>| {
+        if let Ok(pid) = libc::pid_t::try_from(id.unwrap_or(0)) {
+            groups.push(pid);
+        }
+    };
+    push(s.adapter_process.lock().as_ref().and_then(tokio::process::Child::id));
+    for child in s.debuggees.lock().iter() {
+        push(child.id());
+    }
+    push(s.program.lock().as_ref().and_then(|p| p.child.process_id()));
+    groups.retain(|g| *g > 0);
+    groups
+}
+
+/// Whether the launch is still running: the stop's captured tree when there is one,
+/// otherwise the session's job (the adapter and everything it started).
+#[cfg(windows)]
+fn launch_running(s: &Arc<Session>) -> bool {
+    if let Some(tree) = s.stop_tree.lock().as_ref() {
+        tree.is_running()
+    } else {
+        s.job.lock().as_ref().is_some_and(|job| job.is_running())
+    }
+}
+
 /// Waits until the program a `launch` session started is gone; a second Stop kills it.
 pub(crate) async fn wait_for_debuggee(s: &Arc<Session>, terminate: bool) {
    if !terminate || s.request != "launch" {
@@ -373,25 +480,39 @@ pub(crate) async fn wait_for_debuggee(s: &Arc<Session>, terminate: bool) {
    #[cfg(unix)]
    {
        use std::time::Instant;
-        let targets = {
-            let known = s.stop_pids.lock();
-            if known.is_empty() { process_tree(pid as i32) } else { known.clone() }
-        };
+        let mut targets = s.stop_pids.lock().clone();
+        if targets.is_empty() {
+            targets = tokio::task::spawn_blocking(move || process_tree(pid as i32)).await.unwrap_or_default();
+        }
        let alive = || targets.iter().any(|p| unsafe { libc::kill(*p, 0) } == 0);
        let deadline = Instant::now() + DEBUGGEE_EXIT_WAIT;
        while alive() {
            if s.stop_force.swap(false, Ordering::AcqRel) {
-                signal_debuggee(s, true);
+                signal_debuggee(s, true).await;
            }
            if Instant::now() >= deadline {
                // The program ignored the terminate: do not leave it running.
-                signal_debuggee(s, true);
+                signal_debuggee(s, true).await;
                break;
            }
            tokio::time::sleep(Duration::from_millis(50)).await;
        }
    }
-    #[cfg(not(unix))]
+    #[cfg(windows)]
+    {
+        remember_debuggee(s).await;
+        let deadline = std::time::Instant::now() + DEBUGGEE_EXIT_WAIT;
+        // The captured tree is the oracle when it was captured; otherwise the job (every
+        // process the launch started) is, so a failed capture can no longer end the wait
+        // while the program still holds its port.
+        while launch_running(s) {
+            if s.stop_force.swap(false, Ordering::AcqRel) || std::time::Instant::now() >= deadline {
+                signal_debuggee(s, true).await;
+            }
+            tokio::time::sleep(Duration::from_millis(50)).await;
+        }
+    }
+    #[cfg(not(any(unix, windows)))]
    {
        let _ = pid;
    }
@@ -579,10 +700,6 @@ async fn on_event(mgr: &Arc<DebugManager>, s: &Arc<Session>, event: &str, mut bo
 }

 fn on_reverse_request(mgr: &Arc<DebugManager>, s: &Arc<Session>, seq: i64, command: &str, args: Value) {
-    if s.spec.target.is_some() {
-        let _ = s.conn.respond(seq, command, Err("This debugger does not support plugin run targets".into()));
-        return;
-    }
    match command {
        "runInTerminal" => {
            let result = run_in_terminal(s, &args);
@@ -669,6 +786,14 @@ pub(crate) fn run_in_terminal(s: &Arc<Session>, args: &Value) -> Result<Value, S
        }
    }
    let mut child = pair.slave.spawn_command(cmd).map_err(|e| format!("failed to start {program}: {e}"))?;
+    // The program joins the session's job, so Stop reaches what it starts (its children),
+    // though only the program itself is the session's child.
+    #[cfg(windows)]
+    if let Some(pid) = child.process_id()
+        && let Some(job) = s.job.lock().as_ref()
+    {
+        job.assign_pid(pid);
+    }
    drop(pair.slave);
    let reader = pair.master.try_clone_reader().map_err(|e| format!("terminal of {program}: {e}"))?;
    let writer = pair.master.take_writer().map_err(|e| format!("terminal of {program}: {e}"))?;
@@ -836,7 +961,16 @@ pub(crate) async fn start_kotlin_debuggee(s: &Arc<Session>, args: &mut Value) ->
            }
        }
    }
+    // A root the session spawns itself: its own process group on Unix (`kill(-pgid)` in a
+    // forced stop), the session's job on Windows, so a stop reaches what it forks.
+    ide_core::process::own_group(cmd.as_std_mut());
    let mut child = cmd.spawn()?;
+    #[cfg(windows)]
+    if let Some(pid) = child.id()
+        && let Some(job) = s.job.lock().as_ref()
+    {
+        job.assign_pid(pid);
+    }
    if let Some(err) = child.stderr.take() {
        forward_output(s, err, "stderr");
    }
@@ -1,72 +0,0 @@
-//! DAP path fields only: output, expressions, environment and program arguments are opaque.
-use ide_core::path_mapping::{Direction, PathMapping, file_path, file_uri};
-use serde_json::Value;
-
-#[derive(Clone, Debug)]
-pub struct TargetMapping {
-    pub paths: PathMapping,
-    pub external_prefix: String,
-}
-
-impl TargetMapping {
-    pub fn rewrite(&self, value: &mut Value, direction: Direction) {
-        match value {
-            Value::Array(items) => items.iter_mut().for_each(|v| self.rewrite(v, direction)),
-            Value::Object(fields) => {
-                for (key, value) in fields {
-                    if key == "pathMappings" {
-                        continue;
-                    }
-                    if matches!(key.as_str(), "path" | "program" | "cwd" | "localRoot" | "remoteRoot") {
-                        if let Some(path) = value.as_str() {
-                            if matches!(direction, Direction::ToTarget) && path.starts_with(&self.external_prefix) {
-                                if let Some(decoded) =
-                                    file_path(&format!("file:///{}", path.trim_start_matches(&self.external_prefix)))
-                                {
-                                    *value = decoded.into();
-                                }
-                            } else if let Some(mapped) = self.paths.map(path, direction) {
-                                *value = mapped.into();
-                            } else if matches!(direction, Direction::ToHost) && key == "path" && path.starts_with('/') {
-                                *value = format!(
-                                    "{}{}",
-                                    self.external_prefix,
-                                    file_uri(path).trim_start_matches("file:///")
-                                )
-                                .into();
-                            }
-                        }
-                    } else if !matches!(key.as_str(), "args" | "env" | "output" | "expression" | "value") {
-                        self.rewrite(value, direction);
-                    }
-                }
-            }
-            _ => {}
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-    #[test]
-    fn maps_protocol_paths_without_changing_user_data_or_adapter_mappings() {
-        let m = TargetMapping {
-            paths: PathMapping::new("C:/project", "/app"),
-            external_prefix: "openidea-target://test/0/".into(),
-        };
-        let mut request = json!({"arguments":{"source":{"path":"C:/project/a.py"},"program":"C:/project/a.py","cwd":"C:/project", "args":["C:/project/text"],"env":{"path":"C:/project/text"},"pathMappings":[{"localRoot":"/app","remoteRoot":"/app"}]}});
-        m.rewrite(&mut request, Direction::ToTarget);
-        assert_eq!(request["arguments"]["source"]["path"], "/app/a.py");
-        assert_eq!(request["arguments"]["cwd"], "/app");
-        assert_eq!(request["arguments"]["args"][0], "C:/project/text");
-        assert_eq!(request["arguments"]["env"]["path"], "C:/project/text");
-        let mut response = json!({"body":{"stackFrames":[{"source":{"path":"/app/a.py"}},{"source":{"path":"/usr/lib/a.py"}}],"sources":[{"path":"/app/b.py"}],"output":"/app/a.py"}});
-        m.rewrite(&mut response, Direction::ToHost);
-        assert_eq!(response["body"]["stackFrames"][0]["source"]["path"], "C:\\project\\a.py");
-        assert_eq!(response["body"]["sources"][0]["path"], "C:\\project\\b.py");
-        assert_eq!(response["body"]["stackFrames"][1]["source"]["path"], "openidea-target://test/0/usr/lib/a.py");
-        assert_eq!(response["body"]["output"], "/app/a.py");
-    }
-}
@@ -14,6 +14,93 @@ use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt, BufReader};

 type Log = Arc<Mutex<Vec<Value>>>;

+#[cfg(windows)]
+#[test]
+#[ignore = "child process for Windows stop tests"]
+fn windows_debuggee_process() {
+    if std::env::var_os("OPENIDEA_TEST_DEBUGGEE").is_none() {
+        return;
+    }
+    if std::env::var("OPENIDEA_TEST_DEBUGGEE").unwrap() == "wrapper" {
+        let mut command = std::process::Command::new(std::env::current_exe().unwrap());
+        let mut child = ide_core::process::prepare(&mut command)
+            .args(["--exact", "tests::windows_debuggee_process", "--ignored", "--nocapture"])
+            .env("OPENIDEA_TEST_DEBUGGEE", "leaf")
+            .spawn()
+            .unwrap();
+        let _ = child.wait();
+        return;
+    }
+    let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
+    println!("LISTENING {}", listener.local_addr().unwrap().port());
+    std::thread::sleep(Duration::from_secs(60));
+}
+
+#[cfg(windows)]
+#[tokio::test]
+async fn windows_stop_releases_the_debuggees_port_before_returning() {
+    use std::io::BufRead;
+    use std::sync::atomic::Ordering;
+
+    struct Child(std::process::Child, Option<ide_core::process::ProcessTree>);
+    impl Drop for Child {
+        fn drop(&mut self) {
+            if let Some(tree) = &self.1 {
+                tree.terminate();
+            }
+            let _ = self.0.kill();
+            let _ = self.0.wait();
+        }
+    }
+
+    for (second_stop, wrapper, supports_terminate) in
+        [(false, false, false), (true, false, false), (true, true, false), (true, true, true)]
+    {
+        let mut command = std::process::Command::new(std::env::current_exe().unwrap());
+        ide_core::process::prepare(&mut command)
+            .args(["--exact", "tests::windows_debuggee_process", "--ignored", "--nocapture"])
+            .env("OPENIDEA_TEST_DEBUGGEE", if wrapper { "wrapper" } else { "leaf" })
+            .stdout(std::process::Stdio::piped());
+        let mut child = Child(command.spawn().unwrap(), None);
+        let port: u16 = std::io::BufReader::new(child.0.stdout.take().unwrap())
+            .lines()
+            .map(Result::unwrap)
+            .find_map(|line| line.split("LISTENING ").nth(1).and_then(|p| p.parse().ok()))
+            .unwrap();
+        let pid = child.0.id();
+        child.1 = Some(ide_core::process::ProcessTree::capture(pid));
+        let h = harness(Script { debuggee_pid: Some(pid), supports_terminate, ..Default::default() });
+        let id = h.start(config()).await.unwrap();
+        let session = h.manager.session(id).unwrap();
+        while session.debuggee_pid.load(Ordering::Acquire) != i64::from(pid) {
+            tokio::time::sleep(Duration::from_millis(10)).await;
+        }
+        let stop = tokio::spawn({
+            let manager = h.manager.clone();
+            async move { manager.stop(id).await }
+        });
+        let deadline = std::time::Instant::now() + Duration::from_secs(5);
+        while session.stop_tree.lock().is_none() && !stop.is_finished() {
+            assert!(std::time::Instant::now() < deadline, "Stop did not capture the program tree");
+            tokio::time::sleep(Duration::from_millis(10)).await;
+        }
+        assert!(!stop.is_finished(), "Stop must wait for the live program");
+        if wrapper {
+            assert!(session.stop_tree.lock().is_some());
+            child.0.kill().unwrap();
+            child.0.wait().unwrap();
+            assert!(std::net::TcpListener::bind(("127.0.0.1", port)).is_err(), "the child still owns its port");
+        }
+        if second_stop {
+            h.manager.stop(id).await.unwrap();
+        }
+        let limit = if second_stop { 10 } else { 25 };
+        tokio::time::timeout(Duration::from_secs(limit), stop).await.unwrap().unwrap().unwrap();
+        assert!(child.0.try_wait().unwrap().is_some(), "Stop returned with the program alive");
+        let _listener = std::net::TcpListener::bind(("127.0.0.1", port)).expect("Stop returned with its port occupied");
+    }
+}
+
 #[derive(Clone)]
 struct Script {
    /// Send a `runInTerminal` reverse request when `launch` arrives.
@@ -39,6 +126,10 @@ struct Script {
    pending_startup: Option<bool>,
    startup_error: Option<&'static str>,
    close_during_startup: bool,
+    /// GDB 15 semantics: `initialized` right after `initialize`, the program starts at
+    /// `launch`, and a `configurationDone` sent while it runs is refused with `notStopped`.
+    gdb15_starts_at_launch: bool,
+    launch_after_configuration: bool,
 }

 impl Default for Script {
@@ -58,6 +149,8 @@ impl Default for Script {
            pending_startup: None,
            startup_error: None,
            close_during_startup: false,
+            gdb15_starts_at_launch: false,
+            launch_after_configuration: false,
        }
    }
 }
@@ -72,10 +165,12 @@ impl AdapterLauncher for FakeLauncher {
        let (client, server) = tokio::io::duplex(1 << 16);
        let log = self.log.clone();
        let script = self.script.clone();
+        let launch_after_configuration = script.launch_after_configuration;
        tokio::spawn(fake_adapter(server, log, script));
        let (r, w) = tokio::io::split(client);
        Box::pin(async move {
            Ok(AdapterIo {
+                launch_after_configuration,
                reader: Box::new(r),
                writer: Box::new(w),
                child: None,
@@ -93,6 +188,7 @@ async fn fake_adapter<S: AsyncRead + AsyncWrite + Unpin + Send + 'static>(stream
    let mut seq = 1000;
    let mut pending_launch: Option<i64> = None;
    let mut held: Vec<Value> = Vec::new();
+    let mut running = false;
    macro_rules! send {
        ($v:expr) => {{
            let mut v: Value = $v;
@@ -113,24 +209,37 @@ async fn fake_adapter<S: AsyncRead + AsyncWrite + Unpin + Send + 'static>(stream
            continue;
        }
        match msg["command"].as_str().unwrap_or_default() {
-            "initialize" => ok!(
-                msg,
-                json!({
-                    "supportsConfigurationDoneRequest": true,
-                    "supportsCompletionsRequest": true,
-                    "supportsTerminateRequest": script.supports_terminate,
-                    "supportsSetVariable": true,
-                    "supportsFunctionBreakpoints": true,
-                    "supportsDataBreakpoints": true,
-                    "supportsStepInTargetsRequest": true,
-                    "supportsRestartFrame": true,
-                    "exceptionBreakpointFilters": [
-                        {"filter": "raised", "label": "Raised"},
-                        {"filter": "uncaught", "label": "Uncaught", "default": true, "description": "Uncaught exceptions"},
-                    ],
-                })
-            ),
+            "initialize" => {
+                ok!(
+                    msg,
+                    json!({
+                        "supportsConfigurationDoneRequest": true,
+                        "supportsCompletionsRequest": true,
+                        "supportsTerminateRequest": script.supports_terminate,
+                        "supportsSetVariable": true,
+                        "supportsFunctionBreakpoints": true,
+                        "supportsDataBreakpoints": true,
+                        "supportsStepInTargetsRequest": true,
+                        "supportsRestartFrame": true,
+                        "exceptionBreakpointFilters": [
+                            {"filter": "raised", "label": "Raised"},
+                            {"filter": "uncaught", "label": "Uncaught", "default": true, "description": "Uncaught exceptions"},
+                        ],
+                    })
+                );
+                if script.gdb15_starts_at_launch {
+                    // GDB 15 announces itself before it sees `launch` (which a client that
+                    // defers it sends late).
+                    send!(json!({"type": "event", "event": "initialized"}));
+                }
+            }
            "launch" | "attach" => {
+                if script.gdb15_starts_at_launch {
+                    // GDB 15 starts the program here and answers `launch` right away.
+                    running = true;
+                    ok!(msg, Value::Null);
+                    continue;
+                }
                if script.close_during_startup {
                    return;
                }
@@ -202,6 +311,14 @@ async fn fake_adapter<S: AsyncRead + AsyncWrite + Unpin + Send + 'static>(stream
                ok!(msg, json!({"value": format!("{}!", msg["arguments"]["value"].as_str().unwrap()), "type": "int"}))
            }
            "configurationDone" => {
+                if script.gdb15_starts_at_launch && running {
+                    // GDB 15 answers `configurationDone` with `notStopped` while the program
+                    // it started at `launch` is still running.
+                    send!(
+                        json!({"type": "response", "request_seq": msg["seq"], "command": "configurationDone", "success": false, "message": "notStopped"})
+                    );
+                    continue;
+                }
                if !script.ignore_configuration_done {
                    ok!(msg, Value::Null);
                }
@@ -423,6 +540,60 @@ async fn stop_cancels_pending_launch_and_attach() {
    }
 }

+/// GDB 15 must receive breakpoints and configurationDone before launch.
+#[tokio::test(start_paused = true)]
+async fn gdb_15_launch_waits_for_the_configuration() {
+    for deferred in [false, true] {
+        let h =
+            harness(Script { gdb15_starts_at_launch: true, launch_after_configuration: deferred, ..Script::default() });
+        let result = h.start(LaunchConfig { adapter: "gdb".into(), ..config() }).await;
+        if deferred {
+            let id = result.expect("GDB 15 defers its launch past the configuration");
+            let commands = h.commands();
+            let pos = |c: &str| commands.iter().position(|x| x == c).unwrap();
+            assert!(pos("launch") > pos("configurationDone"), "{commands:?}");
+            h.manager.stop(id).await.unwrap();
+        } else {
+            let error = result.unwrap_err();
+            assert!(error.message.contains("configurationDone failed: notStopped"), "{}", error.message);
+        }
+    }
+}
+
+#[tokio::test(start_paused = true)]
+async fn gdb_attach_keeps_the_normal_configuration_order() {
+    let h = harness(Script { launch_after_configuration: true, ..Script::default() });
+    let id = h.start(LaunchConfig { adapter: "gdb".into(), request: "attach".into(), ..config() }).await.unwrap();
+    let commands = h.commands();
+    let pos = |c: &str| commands.iter().position(|x| x == c).unwrap();
+    assert!(pos("attach") < pos("configurationDone"), "{commands:?}");
+    h.manager.stop(id).await.unwrap();
+}
+
+#[tokio::test(start_paused = true)]
+async fn gdb_run_environment_overrides_preserve_inheritance() {
+    for explicit in [None, Some(r#"{"env":{"ONLY":"explicit"}}"#)] {
+        let h = harness(Script::default());
+        let id = h
+            .start(LaunchConfig { adapter: "gdb".into(), extra_json: explicit.map(str::to_owned), ..config() })
+            .await
+            .unwrap();
+        let session = h.manager.session(id).unwrap();
+        {
+            let log = h.log.lock();
+            let args = &log.iter().find(|m| m["command"] == "launch").unwrap()["arguments"];
+            if explicit.is_some() {
+                assert_eq!(args["env"], json!({"ONLY": "explicit"}));
+                assert!(session.spec.env.is_empty());
+            } else {
+                assert!(args.get("env").is_none(), "GDB must inherit its process environment");
+                assert!(session.spec.env.contains(&("A".into(), "1".into())));
+            }
+        }
+        h.manager.stop(id).await.unwrap();
+    }
+}
+
 #[tokio::test(start_paused = true)]
 async fn startup_still_reports_adapter_failure_and_connection_closure() {
    for request in ["launch", "attach"] {
@@ -430,7 +601,6 @@ async fn startup_still_reports_adapter_failure_and_connection_closure() {
        let error = h.start(LaunchConfig { request: request.into(), ..config() }).await.unwrap_err();
        assert_eq!(error.message, format!("{request} failed: interpreter could not start"));
        assert!(h.manager.sessions(None).is_empty());
-
        let h = harness(Script { close_during_startup: true, ..Script::default() });
        let error = h.start(LaunchConfig { request: request.into(), ..config() }).await.unwrap_err();
        assert!(error.message.contains("debug adapter `debugpy` exited during startup"), "{error}");
@@ -953,6 +1123,39 @@ async fn connects_to_running_debug_server_over_tcp() {
    assert!(events.lock().iter().any(|e| matches!(e, IdeEvent::Debug { event: DebugEvent::Started { .. }, .. })));
 }

+#[tokio::test]
+async fn delve_adapter_inherits_the_selected_go_environment() {
+    struct CaptureLauncher {
+        inner: FakeLauncher,
+        env: Arc<Mutex<Vec<(String, String)>>>,
+    }
+    impl AdapterLauncher for CaptureLauncher {
+        fn launch(&self, spec: AdapterSpec, reuse: Option<u16>) -> LaunchFuture {
+            *self.env.lock() = spec.env.clone();
+            self.inner.launch(spec, reuse)
+        }
+    }
+    let env = Arc::new(Mutex::new(Vec::new()));
+    let launcher =
+        CaptureLauncher { inner: FakeLauncher { log: Arc::default(), script: Script::default() }, env: env.clone() };
+    let manager = DebugManager::with_launcher(Arc::new(LanguageRegistry::from_configs(Vec::new())), Arc::new(launcher));
+    let (owner, _) = recording_owner("main");
+    let config = LaunchConfig {
+        name: "Go".into(),
+        adapter: "delve".into(),
+        request: "launch".into(),
+        program: Some("/project".into()),
+        args: vec![],
+        cwd: None,
+        env: BTreeMap::from([("PATH".into(), "/chosen/go/bin".into()), ("GOROOT".into(), "/chosen/go".into())]),
+        extra_json: Some(json!({"mode":"debug"}).to_string()),
+    };
+    let id = manager.start(config, owner).await.unwrap();
+    assert!(env.lock().contains(&("PATH".into(), "/chosen/go/bin".into())));
+    assert!(env.lock().contains(&("GOROOT".into(), "/chosen/go".into())));
+    manager.stop(id).await.unwrap();
+}
+
 /// Go Remote / Python remote: the adapter runs on another machine (`dlv --headless`,
 /// `debugpy --listen`); `debugServer: "host:port"` connects there instead of spawning one.
 #[tokio::test]
@@ -1166,7 +1369,6 @@ fn godot_registry(port: u16, command: &str, args: &[&str]) -> Arc<LanguageRegist
        tree_sitter: None,
        language_servers: vec![],
        debugger: Some(ide_language::DebuggerConfig {
-            target_placement: None,
            adapter: "godot".into(),
            command: command.into(),
            args: args.iter().map(|a| (*a).to_owned()).collect(),
@@ -1842,6 +2044,7 @@ async fn rdbg_drains_test_output_after_dap_closes_before_killing_the_process() {
                });
                let (reader, writer) = tokio::io::split(client);
                Ok(AdapterIo {
+                    launch_after_configuration: false,
                    reader: Box::new(reader),
                    writer: Box::new(writer),
                    child: Some(child),
@@ -1876,3 +2079,55 @@ async fn rdbg_drains_test_output_after_dap_closes_before_killing_the_process() {
        IdeEvent::Debug { event: DebugEvent::Output { output, .. }, .. } if output == "test summary\n"
    )));
 }
+
+#[cfg(unix)]
+#[tokio::test]
+async fn cleanup_ends_the_adapter_tree_without_a_process_event() {
+    use tokio::io::AsyncBufReadExt;
+
+    let h = harness(Script::default());
+    let id = h.start(config()).await.unwrap();
+    let session = h.manager.session(id).unwrap();
+    let mut command = tokio::process::Command::new("python3");
+    ide_core::process::own_group(command.as_std_mut());
+    command
+        .args([
+            "-u",
+            "-c",
+            "import subprocess,sys,time; subprocess.Popen([sys.executable, '-u', '-c', \
+             \"import socket,time; s=socket.socket(); s.bind(('127.0.0.1',0)); s.listen(); \
+             print(s.getsockname()[1],flush=True); time.sleep(60)\"]); time.sleep(60)",
+        ])
+        .stdout(std::process::Stdio::piped());
+    let mut child = command.spawn().unwrap();
+    let mut lines = BufReader::new(child.stdout.take().unwrap()).lines();
+    let port: u16 = lines.next_line().await.unwrap().unwrap().parse().unwrap();
+    assert!(std::net::TcpListener::bind(("127.0.0.1", port)).is_err(), "the descendant holds the port");
+    let pid = child.id().unwrap();
+    *session.adapter_process.lock() = Some(child);
+    session.kill_processes();
+    let deadline = Instant::now() + Duration::from_secs(3);
+    while std::net::TcpListener::bind(("127.0.0.1", port)).is_err() {
+        if Instant::now() >= deadline {
+            ide_core::process::kill_tree_of(pid);
+            panic!("adapter cleanup left its descendant holding the port");
+        }
+        tokio::time::sleep(Duration::from_millis(20)).await;
+    }
+    h.manager.stop(id).await.unwrap();
+}
+
+#[cfg(unix)]
+#[tokio::test]
+async fn stop_detaches_from_an_attached_program() {
+    let mut child = std::process::Command::new("sleep").arg("60").spawn().unwrap();
+    let h = harness(Script { debuggee_pid: Some(child.id()), ..Default::default() });
+    let id = h.start(LaunchConfig { request: "attach".into(), ..config() }).await.unwrap();
+    h.manager.stop(id).await.unwrap();
+    let alive = child.try_wait().unwrap().is_none();
+    let _ = child.kill();
+    let _ = child.wait();
+    assert!(alive, "Stop killed the attached program");
+    assert!(!h.commands().contains(&"terminate".to_owned()));
+    assert_eq!(h.request("disconnect")["arguments"]["terminateDebuggee"], false);
+}
@@ -1,30 +0,0 @@
-import sys,json,os,socket
-root=os.environ.get("FAKE_ROOT","/app")
-r=sys.stdin.buffer; w=sys.stdout.buffer
-seq=0
-def send(v):
- global seq
- seq+=1; v['seq']=seq
- b=json.dumps(v).encode(); w.write(('Content-Length: %d\r\n\r\n'%len(b)).encode()+b); w.flush()
-while True:
- line=r.readline()
- if not line: break
- n=int(line.split(b':')[1]); assert r.readline()==b'\r\n'
- q=json.loads(r.read(n)); c=q['command']; a=q.get('arguments',{}); body={}
- if c=='initialize': body={'supportsConfigurationDoneRequest':True}
- if c=='launch':
-  if 'program' in a: assert a['program']==root+'/main.py',a
-  if os.environ.get('FAKE_CONNECT_BACK'):
-   listener=socket.socket(); listener.bind(('127.0.0.1',a['port'])); listener.listen()
-  assert a['cwd']==root,a
-  send({'type':'event','event':'initialized'})
- if c=='setBreakpoints':
-  assert a['source']['path']==root+'/main.py',a
-  body={'breakpoints':[{'verified':True,'line':3}]}
- if c=='threads': body={'threads':[{'id':1,'name':'target main'}]}
- if c=='configurationDone': send({'type':'event','event':'stopped','body':{'reason':'breakpoint','threadId':1,'allThreadsStopped':True}})
- if c=='stackTrace' and os.environ.get('FAKE_CONNECT_BACK'):
-  client,_=listener.accept(); assert client.recv(4096).decode()==root+'/main.py'; client.close()
- if c=='stackTrace': body={'stackFrames':[{'id':1,'name':'main','line':3,'column':1,'source':{'path':root+'/main.py'}}]}
- send({'type':'response','request_seq':q['seq'],'command':c,'success':True,'body':body})
- if c=='disconnect': break
@@ -93,23 +93,9 @@ async fn listens_for_xdebug_until_stopped_with_path_mappings() {
        .await
        .unwrap();
    let id = manager
-        .start_prepared(
-            listen_config(port, &served, &served),
-            SessionOwner::new("main", sink.clone()),
-            |_| None,
-            |spec, _| {
-                spec.command = adapter.clone();
-                spec.cwd = local.clone();
-                spec.target = Some(ide_dap::target::TargetMapping {
-                    paths: ide_core::path_mapping::PathMapping::new(
-                        &local.to_string_lossy(),
-                        &served.to_string_lossy(),
-                    ),
-                    external_prefix: "openidea-target://php/0/".into(),
-                });
-                Ok(())
-            },
-        )
+        .start_with(listen_config(port, &served, &local), SessionOwner::new("main", sink.clone()), |_| {
+            Some(adapter.clone())
+        })
        .await
        .unwrap_or_else(|e| panic!("start: {e:?}"));

@@ -151,6 +151,16 @@ fn cases(dir: &Path) -> Vec<Case> {
            field: None,
            config: launch("lldb-dap", &c.join("main"), &c, serde_json::json!({"env": ["OPENIDEA_FIXTURE=1"]})),
        },
+        // GDB's own DAP interpreter needs GDB 14+; older ones are skipped by `installed`.
+        Case {
+            adapter: "gdb",
+            source: c.join("main.c"),
+            loop_line: 13,
+            after_loop: 15,
+            function: "parse",
+            field: None,
+            config: launch("gdb", &c.join("main"), &c, serde_json::json!({})),
+        },
    ]);
    out
 }
@@ -230,6 +240,16 @@ fn installed(adapter: &str) -> bool {
        "js-debug" => "js-debug-adapter",
        "delve" => "dlv",
        "java-debug" => return true,
+        // Only a GDB with the DAP interpreter (14+) counts as installed.
+        "gdb" => {
+            return std::process::Command::new("gdb").arg("--version").output().is_ok_and(|out| {
+                String::from_utf8_lossy(&out.stdout)
+                    .lines()
+                    .next()
+                    .and_then(adapter::parse_gdb_version)
+                    .is_some_and(|(major, _)| major >= 14)
+            });
+        }
        other => other,
    };
    adapter::resolve_binary(cmd, Path::new("/")).is_some()
@@ -1,130 +0,0 @@
-//! Real stdio transport through a target wrapper, without Docker or installed adapters.
-#![cfg(unix)]
-use ide_core::{SharedSink, path_mapping::PathMapping};
-use ide_dap::{target::TargetMapping, *};
-use ide_language::LanguageRegistry;
-use std::{collections::BTreeMap, sync::Arc};
-
-const ADAPTER: &str = include_str!("fixtures/target_adapter.py");
-
-#[tokio::test]
-async fn stdio_adapter_through_target_maps_launch_breakpoints_and_frames() {
-    use std::os::unix::fs::PermissionsExt;
-    let tmp = tempfile::tempdir().unwrap();
-    let root = tmp.path().canonicalize().unwrap();
-    let adapter = root.join("adapter.py");
-    std::fs::write(&adapter, ADAPTER).unwrap();
-    let wrapper = root.join("wrapper");
-    std::fs::write(&wrapper, "#!/bin/sh\nprintf '%s\\n' \"$@\" > wrapper-argv\nexec \"$@\"\n").unwrap();
-    std::fs::set_permissions(&wrapper, std::fs::Permissions::from_mode(0o755)).unwrap();
-    let target = ide_core::remote_settings::PluginRunTarget {
-        id: "fake".into(),
-        name: "Fake".into(),
-        program: "wrapper".into(),
-        args: vec![],
-        workdir_args: vec![],
-        container_root: Some("/app".into()),
-        commands: vec![],
-    };
-    // Keep the fixture adapter outside mapped argv; this is the container's executable.
-    let run: ide_run::RunConfig = serde_json::from_value(serde_json::json!({"id":"adapter","name":"Adapter","kind":"shell","command":"/usr/bin/python3","args":["-u","-c",ADAPTER],"cwd":".","env":{},"detected":false,"isTest":false})).unwrap();
-    let run = ide_remote::plugin_target::prepare(&root, &target, &wrapper, &run).unwrap();
-    let manager = DebugManager::new(Arc::new(LanguageRegistry::load(None).unwrap()));
-    manager
-        .set_breakpoints(
-            root.join("main.py"),
-            vec![Breakpoint { line: 2, enabled: true, condition: None, hit_condition: None, log_message: None }],
-        )
-        .await
-        .unwrap();
-    let config = LaunchConfig {
-        name: "Target".into(),
-        adapter: "debugpy".into(),
-        request: "launch".into(),
-        program: Some(root.join("main.py").to_string_lossy().into_owned()),
-        args: vec![],
-        cwd: Some(root.clone().into()),
-        env: BTreeMap::new(),
-        extra_json: None,
-    };
-    let sink: SharedSink = Arc::new(|_| {});
-    let mapping = TargetMapping {
-        paths: PathMapping::new(&root.to_string_lossy(), "/app"),
-        external_prefix: "openidea-target://fake/0/".into(),
-    };
-    let id = manager
-        .start_prepared(
-            config,
-            SessionOwner::new("test", sink),
-            |_| None,
-            move |spec, _| {
-                spec.command = run.command;
-                spec.args = run.args;
-                spec.cwd = root;
-                spec.target = Some(mapping);
-                Ok(())
-            },
-        )
-        .await
-        .unwrap();
-    let frames = manager.stack_trace(id, 1).await.unwrap();
-    assert_eq!(
-        frames[0].path.as_ref().unwrap().to_string_lossy(),
-        tmp.path().canonicalize().unwrap().join("main.py").to_string_lossy()
-    );
-    assert_eq!(frames[0].line, 2);
-    assert!(std::fs::read_to_string(tmp.path().join("wrapper-argv")).unwrap().starts_with("python3\n-u\n-c\n"));
-    manager.stop(id).await.unwrap();
-}
-
-#[tokio::test]
-async fn host_adapter_accepts_connect_back_from_target_with_mapped_sources() {
-    let tmp = tempfile::tempdir().unwrap();
-    let root = tmp.path().canonicalize().unwrap();
-    let port = ide_dap::adapter::free_port().unwrap();
-    let manager = DebugManager::new(Arc::new(LanguageRegistry::load(None).unwrap()));
-    manager
-        .set_breakpoints(
-            root.join("main.py"),
-            vec![Breakpoint { line: 2, enabled: true, condition: None, hit_condition: None, log_message: None }],
-        )
-        .await
-        .unwrap();
-    let config = LaunchConfig {
-        name: "Connect back".into(),
-        adapter: "php-debug".into(),
-        request: "launch".into(),
-        program: None,
-        args: vec![],
-        cwd: Some(root.clone().into()),
-        env: BTreeMap::new(),
-        extra_json: Some(serde_json::json!({"port":port,"pathMappings":{"/app":"/app"}}).to_string()),
-    };
-    let sink: SharedSink = Arc::new(|_| {});
-    let mapping = TargetMapping {
-        paths: PathMapping::new(&root.to_string_lossy(), "/app"),
-        external_prefix: "openidea-target://fake/0/".into(),
-    };
-    let id = manager
-        .start_prepared(
-            config,
-            SessionOwner::new("test", sink),
-            |_| None,
-            move |spec, _| {
-                spec.command = "/usr/bin/python3".into();
-                spec.args = vec!["-u".into(), "-c".into(), ADAPTER.into()];
-                spec.env.push(("FAKE_CONNECT_BACK".into(), "1".into()));
-                spec.target = Some(mapping);
-                Ok(())
-            },
-        )
-        .await
-        .unwrap();
-    let code =
-        format!("import socket;s=socket.create_connection(('127.0.0.1', {port}));s.sendall(b'/app/main.py');s.close()");
-    let mut child = tokio::process::Command::new("/usr/bin/python3").args(["-c", &code]).spawn().unwrap();
-    let frames = manager.stack_trace(id, 1).await.unwrap();
-    assert_eq!(frames[0].path.as_ref().unwrap().to_path_buf(), root.join("main.py"));
-    assert!(child.wait().await.unwrap().success());
-    manager.stop(id).await.unwrap();
-}
@@ -20,7 +20,7 @@ parking_lot.workspace = true
 futures.workspace = true
 sqlx.workspace = true
 tiberius.workspace = true
-oracle.workspace = true
+oracledb.workspace = true
 bb8.workspace = true
 tokio-util = { workspace = true, features = ["compat"] }
 dirs.workspace = true
@@ -417,7 +417,7 @@ fn binary_type(name: &str, text: bool) -> bool {
 }

 /// Bytes as text: UTF-8, else hex (grids) or with invalid sequences replaced (catalog names).
-fn bytes_text(bytes: Vec<u8>, mode: Cells) -> String {
+pub(crate) fn bytes_text(bytes: Vec<u8>, mode: Cells) -> String {
    match (String::from_utf8(bytes), mode) {
        (Ok(s), _) => s,
        (Err(e), Cells::Display) => hex(e.as_bytes()),
@@ -594,6 +594,13 @@ fn is_identifier(name: &str) -> bool {
        && chars.all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '.')
 }

+/// sqlx's handshake flags for `sql_mode`: with either enabled it sends
+/// `SET sql_mode=(SELECT CONCAT(...))`, a non-constant subquery that MySQL-protocol
+/// servers like StarRocks reject (#2452), so the StarRocks preset turns both off.
+fn mysql_mode_flags(vendor: &str) -> (bool, bool) {
+    if vendor == "starrocks" { (false, false) } else { (true, true) }
+}
+
 /// A MySQL `SET` value: numbers and keywords as they are, anything else quoted.
 fn mysql_value(v: &str) -> String {
    let keyword = ["ON", "OFF", "TRUE", "FALSE", "DEFAULT"].iter().any(|k| k.eq_ignore_ascii_case(v));
@@ -839,6 +846,8 @@ impl Pool {
                if let Some(c) = &setup.collation {
                    opts = opts.collation(c);
                }
+                let (pipes_as_concat, no_engine_substitution) = mysql_mode_flags(&source.vendor);
+                opts = opts.pipes_as_concat(pipes_as_concat).no_engine_substitution(no_engine_substitution);
                if let Some(n) = setup.statement_cache {
                    opts = opts.statement_cache_capacity(n);
                }
@@ -1033,7 +1042,7 @@ pub enum Held {
    Mysql(Box<bb8::PooledConnection<'static, MysqlManager>>),
    SqlServer(Box<bb8::PooledConnection<'static, MssqlConnectionManager>>),
    Clickhouse(crate::clickhouse::ClickhousePool),
-    Oracle(crate::oracle::OracleConnection),
+    Oracle(Box<crate::oracle::OracleConnection>),
 }

 impl Held {
@@ -1049,7 +1058,7 @@ impl Held {
                }
                Held::Clickhouse(p.clone())
            }
-            Pool::Oracle(p) => Held::Oracle(p.get().await?),
+            Pool::Oracle(p) => Held::Oracle(Box::new(p.get().await?)),
        })
    }

@@ -1465,6 +1474,15 @@ mod tests {
        assert!(Setup::of(&DataSource { properties: vec![prop("connect_timeout", "soon")], ..s }).is_err());
    }

+    #[test]
+    fn starrocks_disables_the_non_constant_sql_mode_handshake() {
+        // MySQL and its other wire-compatible presets keep sqlx's defaults.
+        for vendor in ["", "mysql", "mariadb", "tidb"] {
+            assert_eq!(mysql_mode_flags(vendor), (true, true), "{vendor}");
+        }
+        assert_eq!(mysql_mode_flags("starrocks"), (false, false));
+    }
+
    #[test]
    fn sqlite_properties_become_pragmas() {
        let s = DataSource { properties: vec![prop("cache_size", "-2000")], ..Default::default() };
@@ -57,6 +57,7 @@ impl DbTableKind {
 pub enum DbObjectKind {
    Function,
    Procedure,
+    Package,
    Trigger,
    Sequence,
 }
@@ -92,12 +93,21 @@ pub struct SequenceInfo {
    pub data_type: String,
 }

-/// A schema's routines and sequences (the tree's `routines` / `sequences` folders).
+/// An Oracle package (its procedures and functions are not listed separately).
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+#[serde(rename = "DbPackageInfo")]
+pub struct PackageInfo {
+    pub name: String,
+}
+
+/// A schema's routines (procedures and functions), packages and sequences.
 #[derive(Debug, Clone, PartialEq, Eq, Default, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
 #[serde(rename = "DbSchemaObjects")]
 pub struct SchemaObjects {
    pub routines: Vec<RoutineInfo>,
+    pub packages: Vec<PackageInfo>,
    pub sequences: Vec<SequenceInfo>,
 }

@@ -296,7 +306,7 @@ fn through_tunnel(e: IdeError, source: &DataSource, via: Option<&str>) -> IdeErr

 /// Options › Run keep-alive query: pings the pool until it is closed or dropped
 /// (a dropped SSH tunnel or an idle-killing proxy stays alive meanwhile).
-fn keep_alive(pool: &Arc<Pool>, every: Duration) {
+pub(crate) fn keep_alive(pool: &Arc<Pool>, every: Duration) {
    let pool = Arc::downgrade(pool);
    tokio::spawn(async move {
        let mut tick = tokio::time::interval(every);
@@ -853,6 +863,14 @@ impl DbManager {
                })
                .collect();
        }
+        if let Some(q) = sql::packages(driver, schema) {
+            out.packages = pool
+                .rows(&q, MAX_META_ROWS)
+                .await?
+                .into_iter()
+                .filter_map(|r| Some(PackageInfo { name: r.into_iter().next().flatten()? }))
+                .collect();
+        }
        if let Some(q) = sql::sequences(driver, schema) {
            out.sequences = pool
                .rows(&q, MAX_META_ROWS)
@@ -870,9 +888,29 @@ impl DbManager {
        Ok(out)
    }

-    /// The definition of a routine (every overload), trigger or sequence.
+    /// The definition of a routine (every overload), package (spec and body), trigger or sequence.
    pub async fn object_ddl(&self, id: &str, schema: &str, kind: DbObjectKind, name: &str) -> IdeResult<String> {
        let pool = self.pool(id).await?;
+        if kind == DbObjectKind::Package {
+            let mut defs: Vec<String> = Vec::new();
+            for body in [false, true] {
+                let Some(q) = sql::package_ddl(pool.driver(), schema, name, body) else { continue };
+                match pool.rows(&q, MAX_META_ROWS).await {
+                    Ok(rows) => defs.extend(rows.into_iter().filter_map(|r| r.into_iter().next().flatten())),
+                    // A spec-only package has no body: the spec alone still opens.
+                    Err(e) if body => tracing::warn!("package body {schema}.{name}: {}", e.message),
+                    Err(e) => return Err(e),
+                }
+            }
+            if defs.is_empty() {
+                return Err(IdeError::not_found(format!("{schema}.{name}")));
+            }
+            return Ok(defs
+                .iter()
+                .map(|d| format!("{};\n", d.trim_end().trim_end_matches(';')))
+                .collect::<Vec<_>>()
+                .join("\n"));
+        }
        let (q, column) = sql::object_ddl(pool.driver(), schema, kind, name)
            .ok_or_else(|| IdeError::invalid(format!("no {kind:?} objects in this database")))?;
        let defs: Vec<String> = pool
@@ -20,7 +20,7 @@ pub enum DbDriver {
    /// Microsoft SQL Server.
    SqlServer,
    Clickhouse,
-    /// Oracle Database (via Oracle Instant Client).
+    /// Oracle Database (pure-Rust thin driver, no client library).
    Oracle,
 }

@@ -88,8 +88,6 @@ pub struct DbOptions {
    pub auto_disconnect_secs: Option<u32>,
    /// PostgreSQL: show only the configured database, its schemas right under the data source.
    pub single_database: bool,
-    /// Oracle: directory of the Oracle Instant Client (empty: `ORACLE_HOME` / system search path).
-    pub instant_client: String,
 }

 /// Schemas tab: the databases / schemas the tree shows. Names may use `*` and `?`.
@@ -270,7 +268,7 @@ pub fn scheme_driver(scheme: &str) -> Option<DbDriver> {
    match scheme.to_ascii_lowercase().as_str() {
        "postgres" | "postgresql" | "pgsql" | "redshift" | "cockroachdb" | "cockroach" | "yugabytedb"
        | "timescaledb" | "greenplum" => Some(DbDriver::Postgres),
-        "mysql" | "mariadb" | "tidb" | "singlestore" | "memsql" | "oceanbase" => Some(DbDriver::Mysql),
+        "mysql" | "mariadb" | "tidb" | "singlestore" | "memsql" | "oceanbase" | "starrocks" => Some(DbDriver::Mysql),
        "sqlserver" | "mssql" | "mssqlserver" => Some(DbDriver::SqlServer),
        "sqlite" | "sqlite3" => Some(DbDriver::Sqlite),
        "clickhouse" | "http" | "https" => Some(DbDriver::Clickhouse),
@@ -559,6 +557,7 @@ mod tests {
        assert_eq!((u.host.as_str(), u.port, u.user.as_str()), ("::1", None, "root"));
        assert_eq!(parse_url("jdbc:redshift://r:5439/dev").unwrap().driver, Some(DbDriver::Postgres));
        assert_eq!(parse_url("tidb://h:4000").unwrap().driver, Some(DbDriver::Mysql));
+        assert_eq!(parse_url("starrocks://h:9030").unwrap().driver, Some(DbDriver::Mysql));
        assert_eq!(parse_url("sqlite:/tmp/a.db").unwrap().file.as_deref(), Some("/tmp/a.db"));
        let u = parse_url("oracle://scott:[email protected]:1521/ORCLPDB1").unwrap();
        assert_eq!(u.driver, Some(DbDriver::Oracle));
@@ -664,6 +664,32 @@ pub fn routines(driver: DbDriver, schema: &str) -> Option<String> {
    }
 }

+/// Rows: `name` of a schema's packages (Oracle only; their procedures and functions are not
+/// listed separately, as in IDEA).
+pub fn packages(driver: DbDriver, schema: &str) -> Option<String> {
+    match driver {
+        DbDriver::Oracle => Some(format!(
+            "SELECT object_name FROM all_objects WHERE owner = {} AND object_type = 'PACKAGE' \
+             AND object_name NOT LIKE 'BIN$%' ORDER BY 1",
+            quote_literal(driver, schema)
+        )),
+        _ => None,
+    }
+}
+
+/// The statement reading a package's specification (`body` false) or body as DDL.
+pub fn package_ddl(driver: DbDriver, schema: &str, name: &str, body: bool) -> Option<String> {
+    match driver {
+        DbDriver::Oracle => Some(format!(
+            "SELECT DBMS_METADATA.GET_DDL('{}', {}, {}) FROM DUAL",
+            if body { "PACKAGE_BODY" } else { "PACKAGE" },
+            quote_literal(driver, name),
+            quote_literal(driver, schema)
+        )),
+        _ => None,
+    }
+}
+
 /// Rows: `name, data type` of a schema's sequences (PostgreSQL, Oracle).
 pub fn sequences(driver: DbDriver, schema: &str) -> Option<String> {
    match driver {
@@ -963,6 +989,7 @@ mod tests {
        assert!(completion_columns(DbDriver::Oracle).contains("all_tab_columns"));
        assert!(triggers(DbDriver::Oracle, "hr", "t").contains("all_triggers"));
        assert!(routines(DbDriver::Oracle, "hr").unwrap().contains("all_objects"));
+        assert!(packages(DbDriver::Oracle, "hr").unwrap().contains("object_type = 'PACKAGE'"));
        assert!(sequences(DbDriver::Oracle, "hr").unwrap().contains("all_sequences"));
    }

@@ -984,6 +1011,17 @@ mod tests {
        let (q, col) = object_ddl(DbDriver::Oracle, "hr", K::Procedure, "p").unwrap();
        assert!(q.contains("DBMS_METADATA.GET_DDL('PROCEDURE'") && col == 0);
        assert!(object_ddl(DbDriver::Oracle, "hr", K::Sequence, "q").unwrap().0.contains("all_sequences"));
+        assert!(
+            package_ddl(DbDriver::Oracle, "hr", "pkg", false)
+                .unwrap()
+                .contains("DBMS_METADATA.GET_DDL('PACKAGE', 'pkg', 'hr')")
+        );
+        assert!(
+            package_ddl(DbDriver::Oracle, "hr", "pkg", true)
+                .unwrap()
+                .contains("DBMS_METADATA.GET_DDL('PACKAGE_BODY', 'pkg', 'hr')")
+        );
+        assert!(package_ddl(DbDriver::Postgres, "public", "pkg", false).is_none());
    }

    #[test]
@@ -1001,6 +1039,7 @@ mod tests {
    fn schema_objects_per_dialect() {
        use crate::DbObjectKind as K;
        assert!(routines(DbDriver::Sqlite, "main").is_none());
+        assert!(packages(DbDriver::Sqlite, "main").is_none());
        assert!(sequences(DbDriver::Mysql, "db").is_none());
        assert!(routines(DbDriver::Postgres, "public").unwrap().contains("n.nspname = 'public'"));
        assert_eq!(
@@ -18,6 +18,7 @@ semver = "1"
 blake3.workspace = true
 zip.workspace = true
 base64.workspace = true
+dunce.workspace = true
 ed25519-dalek = "3"

 [dev-dependencies]
@@ -38,6 +38,10 @@ pub enum Capability {
    Clipboard,
    /// HTTPS (and loopback HTTP) to one host (`*.example.com` matches subdomains).
    Net(String),
+    /// Ask the user when the first request goes to an HTTPS (or loopback) host
+    /// the manifest does not list; each answer applies to one host. Plain
+    /// HTTP elsewhere always needs `net.http:<host>`.
+    NetAsk,
    /// Unencrypted HTTP to one host.
    NetHttp(String),
    /// A local socket or named pipe on the project machine.
@@ -71,6 +75,7 @@ impl Capability {
            | Self::DatabaseSources
            | Self::VcsWrite
            | Self::Net(_)
+            | Self::NetAsk
            | Self::NetHttp(_)
            | Self::Secrets
            | Self::InputEvents
@@ -104,6 +109,10 @@ impl Capability {
                "Copy to the clipboard from its commands, and read and write it from its web views".into()
            }
            Self::Net(host) => format!("Connect to {host} (from the machine the project is on)"),
+            Self::NetAsk => {
+                "Ask to connect to a host that is not on the list the first time it tries; you allow or refuse each host, and can revoke the allowed ones"
+                    .into()
+            }
            Self::NetHttp(host) => {
                format!("Connect to {host} over unencrypted HTTP (from the machine the project is on)")
            }
@@ -230,6 +239,7 @@ impl fmt::Display for Capability {
            Self::InputEvents => f.write_str("events.input"),
            Self::Clipboard => f.write_str("clipboard"),
            Self::Net(h) => write!(f, "net:{h}"),
+            Self::NetAsk => f.write_str("net:ask"),
            Self::NetHttp(h) => write!(f, "net.http:{h}"),
            Self::Ipc(p) => write!(f, "ipc:{p}"),
            Self::Process(b) => write!(f, "process:{b}"),
@@ -251,6 +261,9 @@ impl FromStr for Capability {
            }
            return match kind {
                "net" | "net.http" => {
+                    if kind == "net" && arg == "ask" {
+                        return Ok(Self::NetAsk);
+                    }
                    let host = arg.strip_prefix("*.").unwrap_or(arg);
                    let valid = !host.is_empty()
                        && host.len() <= 253
@@ -451,6 +464,25 @@ mod command_tests {
    }
 }

+#[cfg(test)]
+mod net_ask_tests {
+    use super::*;
+    #[test]
+    fn net_ask_is_its_own_medium_risk_grant_covering_no_host() {
+        let cap: Capability = "net:ask".parse().unwrap();
+        assert_eq!(cap, Capability::NetAsk);
+        assert_eq!(cap.to_string(), "net:ask");
+        assert_eq!(cap.risk(), Risk::Medium);
+        assert!(!cap.auto_migrates());
+        // It asks; it does not itself connect anywhere or pre-approve a host.
+        assert!(!cap.covers(&"net:api.example.com".parse().unwrap()));
+        assert!(!cap.covers(&Capability::NetHttp("example.com".into())));
+        assert!(!"net:api.example.com".parse::<Capability>().unwrap().covers(&cap));
+        assert_ne!("net:ask.com".parse::<Capability>().unwrap(), Capability::NetAsk);
+        assert!("net:ask".parse::<Capability>().unwrap().describe().contains("host"));
+    }
+}
+
 #[cfg(test)]
 mod database_tests {
    use super::*;
@@ -53,6 +53,9 @@ pub struct Grant {
    /// Granted capabilities (`project.read`, `net:x`, …).
    #[serde(default)]
    pub granted: BTreeSet<String>,
+    /// Exact hosts approved through `net:ask`, separate from manifest grants.
+    #[serde(default)]
+    pub net_hosts: BTreeSet<String>,
    /// Optional capabilities the user declined (not asked again until re-confirmed).
    #[serde(default)]
    pub declined: BTreeSet<String>,
@@ -201,6 +204,9 @@ impl Ledger {
        let Some(grant) = self.grants.get_mut(&req.subject) else {
            return Decision::NeedsConfirmation { new: req.required.clone(), first_time: true };
        };
+        if !req.required.iter().chain(&req.optional).any(|c| c == &Capability::NetAsk) {
+            grant.net_hosts.clear();
+        }
        if !grant.confirmed {
            return Decision::NeedsConfirmation { new: req.required.clone(), first_time: true };
        }
@@ -225,6 +231,9 @@ impl Ledger {
        binaries: BTreeMap<String, BinaryGrant>,
    ) {
        let grant = self.grants.entry(req.subject.clone()).or_default();
+        if !req.required.iter().chain(&req.optional).any(|c| c == &Capability::NetAsk) {
+            grant.net_hosts.clear();
+        }
        grant.plugin_id = req.plugin_id.to_owned();
        grant.version = req.version.to_owned();
        grant.package_hash = req.package_hash.to_owned();
@@ -252,6 +261,12 @@ impl Ledger {
            grant.declined.remove(&s);
            grant.granted.insert(s)
        } else {
+            if let Capability::Net(host) = cap {
+                return grant.net_hosts.remove(host) | grant.granted.remove(&s);
+            }
+            if cap == &Capability::NetAsk {
+                grant.net_hosts.clear();
+            }
            if let Capability::Process(_) = cap {
                grant.binaries.remove(&s);
                for binaries in grant.project_binaries.values_mut() {
@@ -262,6 +277,19 @@ impl Ledger {
        }
    }

+    /// Remembers one exact host without granting a manifest capability.
+    pub fn remember_net_host(&mut self, subject: &Subject, host: &str) -> bool {
+        let Some(grant) = self.grants.get_mut(subject) else { return false };
+        if !grant.confirmed || !grant.has(&Capability::NetAsk) || host.contains('*') {
+            return false;
+        }
+        grant.net_hosts.insert(host.to_owned())
+    }
+
+    pub fn forget_net_host(&mut self, subject: &Subject, host: &str) -> bool {
+        self.grants.get_mut(subject).is_some_and(|g| g.net_hosts.remove(host))
+    }
+
    /// Records the program approved for a `process:` grant.
    pub fn set_binary(&mut self, subject: &Subject, cap: &Capability, binary: BinaryGrant) {
        if let Some(grant) = self.grants.get_mut(subject) {
@@ -392,7 +420,13 @@ pub fn resolve_program(name: &str, path_var: Option<&OsStr>) -> Result<PathBuf,
        return if candidate.is_file() { Ok(candidate.to_path_buf()) } else { Err(format!("{name}: no such program")) };
    }
    let exts: Vec<String> = if cfg!(windows) {
-        std::env::var("PATHEXT").unwrap_or_else(|_| ".EXE;.CMD;.BAT".into()).split(';').map(str::to_owned).collect()
+        let pathext = std::env::var("PATHEXT").unwrap_or_else(|_| ".EXE;.CMD;.BAT".into());
+        let pathext: Vec<String> = pathext.split(';').filter(|e| !e.is_empty()).map(str::to_owned).collect();
+        // A name given with its extension (`cargo.exe`) is looked up as written.
+        let has_ext = candidate.extension().is_some_and(|e| {
+            pathext.iter().any(|x| x.trim_start_matches('.').eq_ignore_ascii_case(&e.to_string_lossy()))
+        });
+        if has_ext { vec![String::new()] } else { pathext }
    } else {
        vec![String::new()]
    };
@@ -413,11 +447,13 @@ pub fn resolve_program(name: &str, path_var: Option<&OsStr>) -> Result<PathBuf,
 /// `p` with its parent canonicalized but the file name as found: PATH
 /// entries like `/var` → `/private/var` (macOS) or `~` links collapse to
 /// their real directory, while a linked program (`cargo` → rustup) keeps
-/// its link name so the shim still dispatches on argv[0].
+/// its link name so the shim still dispatches on argv[0]. `dunce` keeps the
+/// path in its usual form on Windows: a `\\?\`-prefixed pin would never
+/// match the path the program was actually started with.
 fn canonical_dir(p: &Path) -> PathBuf {
    let Some(dir) = p.parent() else { return p.to_path_buf() };
    let Some(name) = p.file_name() else { return p.to_path_buf() };
-    std::fs::canonicalize(dir).map(|d| d.join(name)).unwrap_or_else(|_| p.to_path_buf())
+    dunce::canonicalize(dir).map(|d| d.join(name)).unwrap_or_else(|_| p.to_path_buf())
 }

 fn is_executable(p: &Path) -> bool {
@@ -470,6 +506,20 @@ mod tests {
        list.iter().map(|s| s.parse().unwrap()).collect()
    }

+    #[test]
+    #[cfg(windows)]
+    fn pinned_program_path_has_no_verbatim_prefix() {
+        // std::fs::canonicalize returns \\?\-prefixed paths on Windows; a pin
+        // stored in that form would never match the plain path the program is
+        // started with. dunce keeps the usual form.
+        let dir = tempfile::tempdir().unwrap();
+        std::fs::write(dir.path().join("cargo.exe"), b"").unwrap();
+        let pinned = resolve_program("cargo.exe", Some(dir.path().as_os_str())).unwrap();
+        let shown = pinned.to_string_lossy();
+        assert!(!shown.starts_with(r"\\?\"), "verbatim prefix leaked into the pin: {shown}");
+        assert!(pinned.is_absolute());
+    }
+
    fn req<'a>(version: &'a str, hash: &'a str, required: &[&str], optional: &[&str]) -> Request<'a> {
        Request {
            subject: Subject::Installed("p".into()),
@@ -510,6 +560,40 @@ mod tests {
        assert!(matches!(l.decide(&r3), Decision::NeedsConfirmation { .. }));
    }

+    #[test]
+    fn net_ask_hosts_persist_revoke_and_drop_with_the_capability() {
+        let tmp = tempfile::tempdir().unwrap();
+        let mut l = Ledger::load(tmp.path());
+        let r = req("1.0.0", "h", &["net:ask"], &[]);
+        l.confirm(&r, &[], BTreeMap::new());
+        let host = "api.example.com";
+        assert!(l.remember_net_host(&r.subject, host));
+        assert!(!l.remember_net_host(&r.subject, "*.example.com"));
+        assert!(!l.get(&r.subject).unwrap().has(&Capability::Net(host.into())));
+        l.save().unwrap();
+        l = Ledger::load(tmp.path());
+        assert!(l.get(&r.subject).unwrap().net_hosts.contains(host));
+        l.confirm(&r, &[], BTreeMap::new());
+        assert!(l.get(&r.subject).unwrap().net_hosts.contains(host));
+        assert!(l.set(&r.subject, &Capability::Net(host.into()), false));
+        assert!(l.get(&r.subject).unwrap().net_hosts.is_empty());
+
+        for confirm in [false, true] {
+            l.remember_net_host(&r.subject, host);
+            // A newly declared host must not inherit an ask grant after net:ask is removed.
+            let update = req("2.0.0", "h2", &["project.read", "net:api.example.com"], &[]);
+            if confirm {
+                l.confirm(&update, &[], BTreeMap::new());
+            } else {
+                assert!(matches!(l.decide(&update), Decision::NeedsConfirmation { .. }));
+            }
+            assert!(l.get(&r.subject).unwrap().net_hosts.is_empty());
+        }
+        l.remember_net_host(&r.subject, host);
+        l.set(&r.subject, &Capability::NetAsk, false);
+        assert!(l.get(&r.subject).unwrap().net_hosts.is_empty());
+    }
+
    #[test]
    fn migration_grants_low_risk_only() {
        let tmp = tempfile::tempdir().unwrap();
@@ -19,8 +19,10 @@ mod index;
 pub mod ledger;
 mod manifest;
 pub mod package;
+mod plugin_point;
 mod point;
 mod registry;
+mod resolve;
 mod ui;
 mod when;

@@ -30,7 +32,12 @@ pub use manifest::{
    ActivationEvent, CATEGORIES, Capabilities, ENGINE_VERSION, EVENT_KINDS, LEGACY_API, MANIFEST_FILE, MAX_CATEGORIES,
    Manifest, check_relative, engine_compatible, validate_item_id, validate_plugin_id, validate_point_id,
 };
+pub use plugin_point::{FieldType, PointDecl};
 pub use point::{Commit, Disposable, ExtensionPoint, MAX_PACKAGE_FILE, Package, Placement, Prepared, decode};
-pub use registry::{ContributionInfo, ExtensionRegistry, LOCALES_DIR, LOCALES_POINT, PreparedSet};
+pub use registry::{
+    ChangeListener, Contribution, ContributionInfo, DeclaredPoint, ExtensionRegistry, LOCALES_DIR, LOCALES_POINT,
+    PreparedSet,
+};
+pub use resolve::{Blocked, Dependency, DependencyState, Node, Plan, dependency_state, dependents, plan};
 pub use ui::{UiContribution, UiDecl, UiPoint, UiStore, to_json};
 pub use when::validate_when;
@@ -26,13 +26,15 @@
 //! activated at start-up, as before.

 use crate::capability::Capability;
+use crate::plugin_point::PointDecl;
+use crate::resolve::Dependency;
 use serde::Deserialize;
 use std::collections::BTreeSet;
 use std::path::{Component, Path, PathBuf};

 pub const MANIFEST_FILE: &str = "plugin.toml";
 /// The plugin API (engine) version this host implements.
-pub const ENGINE_VERSION: &str = "1.4.0";
+pub const ENGINE_VERSION: &str = "1.5.0";
 /// The 0.1 API, still accepted for contribution-only packages and 0.1 components.
 pub const LEGACY_API: &str = "0.1";
 /// Marketplace categories, in the order they are shown.
@@ -66,6 +68,10 @@ pub struct Manifest {
    pub wasm: Option<PathBuf>,
    pub activation: Vec<ActivationEvent>,
    pub capabilities: Capabilities,
+    /// `[[depends]]`: plugins this one needs (API 1.5).
+    pub depends: Vec<Dependency>,
+    /// `[[extension-points]]`: what other plugins may contribute to this one (API 1.5).
+    pub extension_points: Vec<PointDecl>,
    /// `contributes.<point>` → its declarations, validated by the extension points.
    pub contributes: toml::Table,
 }
@@ -151,6 +157,7 @@ pub const EVENT_KINDS: &[&str] = &[
    "file-closed",
    "settings-changed",
    "input-mode-changed",
+    "extensions-changed",
    "file-opened",
    "file-saved",
    "files-changed",
@@ -210,6 +217,10 @@ struct Raw {
    #[serde(default)]
    permissions: Option<Vec<String>>,
    #[serde(default)]
+    depends: Vec<Dependency>,
+    #[serde(default)]
+    extension_points: Vec<PointDecl>,
+    #[serde(default)]
    contributes: toml::Table,
 }

@@ -281,6 +292,8 @@ impl Manifest {
            wasm: raw.wasm,
            activation,
            capabilities,
+            depends: raw.depends,
+            extension_points: raw.extension_points,
            contributes: raw.contributes,
        };
        m.validate()?;
@@ -338,6 +351,9 @@ impl Manifest {
            if matches!(cap, Capability::ProjectWrite | Capability::FsWrite(_)) {
                self.needs_api(&format!("capability `{cap}`"), 3)?;
            }
+            if matches!(cap, Capability::NetAsk) {
+                self.needs_api(&format!("capability `{cap}`"), 5)?;
+            }
        }
        if let Some(dark) = &self.icon_dark {
            if self.icon.is_none() {
@@ -354,6 +370,9 @@ impl Manifest {
            {
                self.needs_api(&format!("`{event}`"), 4)?;
            }
+            if matches!(event, ActivationEvent::Event(kind) if kind == "extensions-changed") {
+                self.needs_api("`on-event:extensions-changed`", 5)?;
+            }
            if matches!(event, ActivationEvent::Event(kind) if kind == "files-changed") {
                self.needs_api("`on-event:files-changed`", 3)?;
            }
@@ -364,6 +383,7 @@ impl Manifest {
        for c in &self.declared_categories {
            validate_item_id(c, "category")?;
        }
+        self.validate_relations()?;
        for (point, decls) in &self.contributes {
            validate_point_id(point)?;
            if !matches!(decls, toml::Value::Array(_) | toml::Value::Table(_)) {
@@ -373,6 +393,42 @@ impl Manifest {
        Ok(())
    }

+    /// `[[depends]]` and `[[extension-points]]`.
+    fn validate_relations(&self) -> Result<(), String> {
+        if !self.depends.is_empty() {
+            self.needs_api("`[[depends]]`", 5)?;
+        }
+        if !self.extension_points.is_empty() {
+            self.needs_api("`[[extension-points]]`", 5)?;
+        }
+        let mut required = BTreeSet::new();
+        for dep in &self.depends {
+            validate_plugin_id(&dep.id)?;
+            if dep.id == self.id {
+                return Err(format!("`depends`: {} cannot depend on itself", self.id));
+            }
+            if let Some(req) = &dep.version
+                && semver::VersionReq::parse(req).is_err()
+            {
+                return Err(format!(
+                    "`depends`: {:?} is not a version requirement like \"^1.2\" (plugin {})",
+                    req, dep.id
+                ));
+            }
+            if !required.insert(&dep.id) {
+                return Err(format!("`depends`: {} is listed twice", dep.id));
+            }
+        }
+        let mut declared = BTreeSet::new();
+        for point in &self.extension_points {
+            point.validate(&self.id)?;
+            if !declared.insert(&point.id) {
+                return Err(format!("extension point {} is declared twice", point.id));
+            }
+        }
+        Ok(())
+    }
+
    /// The declarations of one extension point: `[[contributes.x]]` gives
    /// several, `[contributes.x]` one.
    pub fn declarations(&self, point: &str) -> Vec<toml::Value> {
@@ -469,11 +525,12 @@ pub fn validate_item_id(id: &str, what: &str) -> Result<(), String> {
 }

 /// Extension point ids: `camelCase` or `kebab-case` words, dots allowed (`iconThemes`, `menus`).
+/// Points declared by plugins are `<plugin id>.<name>`, which may be longer and contain `_`.
 pub fn validate_point_id(id: &str) -> Result<(), String> {
    let ok = !id.is_empty()
-        && id.len() <= 64
+        && id.len() <= 128
        && id.starts_with(|c: char| c.is_ascii_lowercase())
-        && id.chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '.'));
+        && id.chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '.' | '_'));
    if ok { Ok(()) } else { Err(format!("invalid contribution point {id:?}")) }
 }

@@ -708,6 +765,86 @@ mod api14_tests {
    }
 }

+#[cfg(test)]
+mod relations_tests {
+    use super::*;
+
+    const HEAD: &str = "id = \"acme.app\"\nname = \"App\"\nversion = \"1.0.0\"\nengines.openidea = \"^1.5\"\n";
+
+    fn parse(rest: &str) -> Result<Manifest, String> {
+        Manifest::parse(&format!("{HEAD}{rest}"))
+    }
+
+    #[test]
+    fn parses_depends_and_extension_points() {
+        let m = parse(
+            r#"
+            [[depends]]
+            id = "acme.base"
+            version = "^0.2"
+
+            [[depends]]
+            id = "acme.extra"
+            optional = true
+
+            [[extension-points]]
+            id = "acme.app.hooks"
+            required = ["name"]
+            fields = { name = "string" }
+
+            [[contributes."acme.base.things"]]
+            name = "x"
+            "#,
+        )
+        .unwrap();
+        assert_eq!(m.depends.len(), 2);
+        assert_eq!(m.depends[0].version.as_deref(), Some("^0.2"));
+        assert!(m.depends[1].optional);
+        assert_eq!(m.extension_points[0].id, "acme.app.hooks");
+        assert_eq!(m.declarations("acme.base.things").len(), 1);
+    }
+
+    #[test]
+    fn the_new_keys_need_api_1_5() {
+        let older =
+            "id = \"acme.app\"\nname = \"App\"\nversion = \"1.0.0\"\nwasm = \"p.wasm\"\nengines.openidea = \"^1.4\"\n";
+        let err = Manifest::parse(&format!("{older}[[depends]]\nid = \"acme.base\"\n")).unwrap_err();
+        assert!(err.contains("new in plugin API 1.5"), "{err}");
+        let err = Manifest::parse(&format!("{older}[[extension-points]]\nid = \"acme.app.x\"\n")).unwrap_err();
+        assert!(err.contains("new in plugin API 1.5"), "{err}");
+        let err = Manifest::parse(&format!("{older}activation = [\"on-event:extensions-changed\"]\n")).unwrap_err();
+        assert!(err.contains("new in plugin API 1.5"), "{err}");
+        let current = older.replace("^1.4", "^1.5");
+        assert!(Manifest::parse(&format!("{current}activation = [\"on-event:extensions-changed\"]\n")).is_ok());
+    }
+
+    #[test]
+    fn refuses_bad_dependencies() {
+        assert!(parse("[[depends]]\nid = \"acme.app\"\n").unwrap_err().contains("itself"));
+        assert!(parse("[[depends]]\nid = \"Bad Id\"\n").unwrap_err().contains("invalid plugin id"));
+        assert!(
+            parse("[[depends]]\nid = \"acme.base\"\nversion = \"one\"\n").unwrap_err().contains("version requirement")
+        );
+        let twice = "[[depends]]\nid = \"acme.base\"\n[[depends]]\nid = \"acme.base\"\n";
+        assert!(parse(twice).unwrap_err().contains("listed twice"));
+        assert!(parse("[[depends]]\nid = \"acme.base\"\nunknown = 1\n").is_err());
+    }
+
+    #[test]
+    fn refuses_points_outside_the_plugins_namespace() {
+        let err = parse("[[extension-points]]\nid = \"other.thing\"\n").unwrap_err();
+        assert!(err.contains("acme.app.<name>"), "{err}");
+        let twice = "[[extension-points]]\nid = \"acme.app.x\"\n[[extension-points]]\nid = \"acme.app.x\"\n";
+        assert!(parse(twice).unwrap_err().contains("declared twice"));
+    }
+
+    #[test]
+    fn plugin_ids_with_underscores_work_as_contribution_keys() {
+        assert!(validate_point_id("my_tools.base.things").is_ok());
+        assert!(validate_point_id("Bad").is_err());
+    }
+}
+
 #[cfg(test)]
 mod commands_api_tests {
    use super::*;
@@ -718,3 +855,24 @@ mod commands_api_tests {
        assert!(Manifest::parse(&manifest.replace("^1.3", "^1.4")).is_ok());
    }
 }
+
+#[cfg(test)]
+mod net_ask_api_tests {
+    use super::*;
+    #[test]
+    fn net_ask_requires_api_1_5() {
+        for declaration in ["[capabilities]\nrequired = [\"net:ask\"]", "[capabilities]\noptional = [\"net:ask\"]"] {
+            for engine in ["^1.4", "^1.5"] {
+                let manifest = format!(
+                    "id = 'test'\nname = 'Test'\nversion = '0.1.0'\nwasm = 'plugin.wasm'\nengines.openidea = '{engine}'\n{declaration}\n"
+                );
+                let parsed = Manifest::parse(&manifest);
+                if engine == "^1.5" {
+                    parsed.unwrap();
+                } else {
+                    assert!(parsed.unwrap_err().contains("new in plugin API 1.5"), "{engine}");
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,192 @@
+//! Extension points a plugin declares for other plugins to contribute to
+//! (`[[extension-points]]`), and the check of a contribution against them.
+
+use serde::{Deserialize, Serialize};
+use specta::Type;
+use std::collections::BTreeMap;
+
+const MAX_FIELDS: usize = 32;
+const MAX_ID: usize = 128;
+/// Longest string a contribution may carry in one field.
+const MAX_TEXT: usize = 64 * 1024;
+const MAX_LIST: usize = 1000;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "kebab-case")]
+pub enum FieldType {
+    String,
+    Boolean,
+    Integer,
+    Number,
+    StringList,
+}
+
+/// `[[extension-points]]`: a kind of contribution the declaring plugin's code reads.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(deny_unknown_fields)]
+pub struct PointDecl {
+    /// `<plugin id>.<name>`.
+    pub id: String,
+    #[serde(default)]
+    pub description: String,
+    /// Fields a contribution must have.
+    #[serde(default)]
+    pub required: Vec<String>,
+    /// Every field a contribution may have; a contribution with another key is refused.
+    #[serde(default)]
+    pub fields: BTreeMap<String, FieldType>,
+}
+
+impl PointDecl {
+    pub fn validate(&self, plugin_id: &str) -> Result<(), String> {
+        let prefix = format!("{plugin_id}.");
+        let name = self.id.strip_prefix(&prefix).unwrap_or("");
+        let name_ok = name.chars().next().is_some_and(|c| c.is_ascii_lowercase() || c.is_ascii_digit())
+            && name.chars().all(|c| c.is_ascii_lowercase() || c.is_ascii_digit() || matches!(c, '-' | '_' | '.'));
+        if !name_ok || self.id.len() > MAX_ID {
+            return Err(format!(
+                "invalid extension point {:?}: use \"{plugin_id}.<name>\" with a-z, 0-9, '.', '-', '_' in the name",
+                self.id
+            ));
+        }
+        if self.description.len() > 500 {
+            return Err(format!("extension point {}: `description` is longer than 500 characters", self.id));
+        }
+        if self.fields.len() > MAX_FIELDS {
+            return Err(format!("extension point {}: at most {MAX_FIELDS} fields", self.id));
+        }
+        for field in self.fields.keys() {
+            let ok = field.chars().next().is_some_and(|c| c.is_ascii_lowercase())
+                && field.chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_'))
+                && field.len() <= 64;
+            if !ok {
+                return Err(format!("extension point {}: invalid field name {field:?}", self.id));
+            }
+        }
+        for field in &self.required {
+            if !self.fields.contains_key(field) {
+                return Err(format!("extension point {}: required field {field:?} is not in `fields`", self.id));
+            }
+        }
+        Ok(())
+    }
+
+    /// Checks one contribution and returns it as JSON for the declaring plugin's code.
+    pub fn check(&self, value: &toml::Value) -> Result<serde_json::Value, String> {
+        let toml::Value::Table(table) = value else {
+            return Err("a contribution is a table".into());
+        };
+        for key in table.keys() {
+            if !self.fields.contains_key(key) {
+                let known: Vec<&str> = self.fields.keys().map(String::as_str).collect();
+                return Err(format!("unknown field {key:?} (this extension point has: {})", known.join(", ")));
+            }
+        }
+        for key in &self.required {
+            if !table.contains_key(key) {
+                return Err(format!("missing required field {key:?}"));
+            }
+        }
+        let mut out = serde_json::Map::new();
+        for (key, value) in table {
+            out.insert(key.clone(), convert(key, self.fields[key], value)?);
+        }
+        Ok(serde_json::Value::Object(out))
+    }
+}
+
+fn convert(key: &str, ty: FieldType, value: &toml::Value) -> Result<serde_json::Value, String> {
+    use serde_json::Value as J;
+    let wrong = |expected: &str| format!("field {key:?} must be {expected}");
+    match (ty, value) {
+        (FieldType::String, toml::Value::String(s)) => text(key, s).map(J::from),
+        (FieldType::Boolean, toml::Value::Boolean(b)) => Ok(J::from(*b)),
+        (FieldType::Integer, toml::Value::Integer(i)) => Ok(J::from(*i)),
+        (FieldType::Number, toml::Value::Integer(i)) => Ok(J::from(*i)),
+        (FieldType::Number, toml::Value::Float(f)) if f.is_finite() => Ok(J::from(*f)),
+        (FieldType::StringList, toml::Value::Array(items)) => {
+            if items.len() > MAX_LIST {
+                return Err(format!("field {key:?} has more than {MAX_LIST} items"));
+            }
+            items
+                .iter()
+                .map(|item| match item {
+                    toml::Value::String(s) => text(key, s).map(J::from),
+                    _ => Err(wrong("a list of strings")),
+                })
+                .collect::<Result<Vec<_>, _>>()
+                .map(J::Array)
+        }
+        (FieldType::String, _) => Err(wrong("a string")),
+        (FieldType::Boolean, _) => Err(wrong("true or false")),
+        (FieldType::Integer, _) => Err(wrong("an integer")),
+        (FieldType::Number, _) => Err(wrong("a number")),
+        (FieldType::StringList, _) => Err(wrong("a list of strings")),
+    }
+}
+
+fn text(key: &str, s: &str) -> Result<String, String> {
+    if s.len() > MAX_TEXT {
+        return Err(format!("field {key:?} is longer than {} KiB", MAX_TEXT >> 10));
+    }
+    Ok(s.to_owned())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn decl(src: &str) -> PointDecl {
+        toml::from_str(src).unwrap()
+    }
+
+    const COMPLETIONS: &str = r#"
+        id = "acme.base.completions"
+        description = "Extra completions"
+        required = ["label"]
+        fields = { label = "string", detail = "string", weight = "integer", scopes = "string-list" }
+    "#;
+
+    #[test]
+    fn the_id_is_namespaced_by_the_declaring_plugin() {
+        assert!(decl(COMPLETIONS).validate("acme.base").is_ok());
+        let err = decl(COMPLETIONS).validate("acme.other").unwrap_err();
+        assert!(err.contains("acme.other.<name>"), "{err}");
+        assert!(decl("id = \"acme.base.\"").validate("acme.base").is_err());
+        assert!(decl("id = \"acme.base.Bad Name\"").validate("acme.base").is_err());
+    }
+
+    #[test]
+    fn required_fields_must_be_declared() {
+        let err = decl("id = \"p.x\"\nrequired = [\"a\"]").validate("p").unwrap_err();
+        assert!(err.contains("required field \"a\""), "{err}");
+    }
+
+    #[test]
+    fn checks_a_contribution_and_converts_it_to_json() {
+        let point = decl(COMPLETIONS);
+        let contribution: toml::Value =
+            toml::from_str("label = \"ew.x\"\nweight = 3\nscopes = [\"xml\", \"java\"]").unwrap();
+        let json = point.check(&contribution).unwrap();
+        assert_eq!(json, serde_json::json!({"label": "ew.x", "weight": 3, "scopes": ["xml", "java"]}));
+    }
+
+    #[test]
+    fn refuses_what_the_point_does_not_declare() {
+        let point = decl(COMPLETIONS);
+        let check = |src: &str| point.check(&toml::from_str::<toml::Value>(src).unwrap()).unwrap_err();
+        assert!(check("detail = \"x\"").contains("missing required field \"label\""));
+        let err = check("label = \"a\"\nextra = 1");
+        assert!(err.contains("unknown field \"extra\"") && err.contains("label"), "{err}");
+        assert!(check("label = 1").contains("must be a string"));
+        assert!(check("label = \"a\"\nweight = \"3\"").contains("must be an integer"));
+        assert!(check("label = \"a\"\nscopes = [1]").contains("list of strings"));
+    }
+
+    #[test]
+    fn numbers_take_integers_and_floats() {
+        let point = decl("id = \"p.x\"\nfields = { ratio = \"number\" }");
+        assert!(point.check(&toml::from_str::<toml::Value>("ratio = 2").unwrap()).is_ok());
+        assert!(point.check(&toml::from_str::<toml::Value>("ratio = 0.5").unwrap()).is_ok());
+    }
+}
@@ -1,6 +1,7 @@
 //! Extension points plus the contributions committed to them, accounted per plugin.

 use crate::capability::Capability;
+use crate::plugin_point::PointDecl;
 use crate::point::{Disposable, ExtensionPoint, Package, Placement, Prepared};
 use parking_lot::{Mutex, RwLock};
 use serde::{Deserialize, Serialize};
@@ -23,7 +24,7 @@ pub struct ContributionInfo {
 }

 struct Entry {
-    point: &'static str,
+    point: String,
    key: Option<String>,
    label: String,
    disposable: Disposable,
@@ -38,7 +39,7 @@ pub struct PreparedSet {
    pub files: Vec<PathBuf>,
    /// Declarations for extension points this host does not know (skipped).
    pub warnings: Vec<String>,
-    items: Vec<(&'static str, Prepared)>,
+    items: Vec<(String, Prepared)>,
 }

 impl PreparedSet {
@@ -61,11 +62,41 @@ impl std::fmt::Debug for PreparedSet {
    }
 }

+/// What one plugin contributed to an extension point another plugin declared.
+#[derive(Clone, Debug, PartialEq)]
+pub struct Contribution {
+    /// The contributing plugin.
+    pub plugin: String,
+    /// The declaration as JSON, checked against the point's fields.
+    pub data: serde_json::Value,
+}
+
+/// An extension point a plugin declared, with who contributes to it.
+#[derive(Clone, Debug, PartialEq)]
+pub struct DeclaredPoint {
+    pub owner: String,
+    pub decl: PointDecl,
+    /// Plugin ids, in commit order, once each.
+    pub contributors: Vec<String>,
+}
+
+#[derive(Default)]
+struct Dynamic {
+    points: BTreeMap<String, (String, PointDecl)>,
+    contributions: BTreeMap<String, Vec<Contribution>>,
+}
+
+/// Called with (point id, owner plugin) after contributions to a declared point changed.
+pub type ChangeListener = Arc<dyn Fn(&str, &str) + Send + Sync>;
+
 #[derive(Default)]
 pub struct ExtensionRegistry {
    points: RwLock<BTreeMap<&'static str, Arc<dyn ExtensionPoint>>>,
    /// plugin id → its contributions in commit order.
    entries: Mutex<BTreeMap<String, Vec<Entry>>>,
+    /// Points declared by plugins and what was contributed to them.
+    dynamic: Arc<Mutex<Dynamic>>,
+    listener: Arc<RwLock<Option<ChangeListener>>>,
 }

 impl ExtensionRegistry {
@@ -97,6 +128,111 @@ impl ExtensionRegistry {
        self.points.read().get(id).cloned()
    }

+    /// Registers the function told when contributions to a plugin-declared point change.
+    pub fn set_change_listener(&self, listener: ChangeListener) {
+        *self.listener.write() = Some(listener);
+    }
+
+    /// The plugin that declared `point`, while it is committed.
+    pub fn point_owner(&self, point: &str) -> Option<String> {
+        self.dynamic.lock().points.get(point).map(|(owner, _)| owner.clone())
+    }
+
+    /// What plugins contributed to `point`, in commit order. Empty unless a plugin declares it.
+    pub fn contributions_to(&self, point: &str) -> Vec<Contribution> {
+        let dynamic = self.dynamic.lock();
+        if !dynamic.points.contains_key(point) {
+            return Vec::new();
+        }
+        dynamic.contributions.get(point).cloned().unwrap_or_default()
+    }
+
+    /// The points `owner` declared, with their contributors.
+    pub fn declared_points(&self, owner: &str) -> Vec<DeclaredPoint> {
+        let dynamic = self.dynamic.lock();
+        dynamic
+            .points
+            .iter()
+            .filter(|(_, (o, _))| o == owner)
+            .map(|(id, (owner, decl))| {
+                let mut contributors: Vec<String> = Vec::new();
+                for c in dynamic.contributions.get(id).into_iter().flatten() {
+                    if !contributors.contains(&c.plugin) {
+                        contributors.push(c.plugin.clone());
+                    }
+                }
+                DeclaredPoint { owner: owner.clone(), decl: decl.clone(), contributors }
+            })
+            .collect()
+    }
+
+    /// Makes `pkg`'s `[[extension-points]]` known: they take effect with the set's commit.
+    fn prepare_declarations(&self, pkg: &Package) -> Vec<(String, Prepared)> {
+        pkg.manifest
+            .extension_points
+            .iter()
+            .map(|decl| {
+                let (dynamic, owner, decl) = (self.dynamic.clone(), pkg.id().to_owned(), decl.clone());
+                let id = decl.id.clone();
+                let prepared = Prepared::new(format!("Extension point {id}"), move || {
+                    let id = decl.id.clone();
+                    dynamic.lock().points.insert(id.clone(), (owner.clone(), decl));
+                    Ok(Disposable::new(move || {
+                        dynamic.lock().points.remove(&id);
+                    }))
+                })
+                .key(format!("extension-point:{id}"));
+                (id, prepared)
+            })
+            .collect()
+    }
+
+    /// Validates `pkg`'s contributions to a point some plugin declares, or `None`
+    /// when no plugin declares `point` (the caller then skips it as unknown).
+    fn prepare_contributions(&self, pkg: &Package, point: &str) -> Option<Result<Vec<Prepared>, String>> {
+        let declared = self.dynamic.lock().points.get(point).cloned();
+        let own =
+            pkg.manifest.extension_points.iter().find(|d| d.id == point).map(|d| (pkg.id().to_owned(), d.clone()));
+        let (owner, decl) = declared.or(own)?;
+        if owner != pkg.id() && !pkg.manifest.depends.iter().any(|d| d.id == owner) {
+            return Some(Err(format!("{point} is declared by {owner}: add it to [[depends]]")));
+        }
+        let listener = self.listener.clone();
+        let result = pkg
+            .manifest
+            .declarations(point)
+            .into_iter()
+            .enumerate()
+            .map(|(i, value)| {
+                let data = decl.check(&value).map_err(|e| format!("contributions[{i}]: {e}"))?;
+                let label = decl
+                    .required
+                    .first()
+                    .and_then(|field| data.get(field))
+                    .and_then(|v| v.as_str())
+                    .map_or_else(|| point.to_owned(), str::to_owned);
+                let contribution = Contribution { plugin: pkg.id().to_owned(), data };
+                let (dynamic, listener, point) = (self.dynamic.clone(), listener.clone(), point.to_owned());
+                Ok(Prepared::new(label, move || {
+                    dynamic.lock().contributions.entry(point.clone()).or_default().push(contribution.clone());
+                    notify(&dynamic, &listener, &point);
+                    Ok(Disposable::new(move || {
+                        {
+                            let mut guard = dynamic.lock();
+                            if let Some(list) = guard.contributions.get_mut(&point)
+                                && let Some(pos) = list.iter().position(|c| *c == contribution)
+                            {
+                                list.remove(pos);
+                            }
+                        }
+                        notify(&dynamic, &listener, &point);
+                    }))
+                }))
+            })
+            .collect();
+        Some(result)
+    }
+
    /// Validates every `contributes.<point>` declaration of `pkg`. Fails as a
    /// whole on the first invalid declaration; unknown points are skipped with
    /// a warning (forward compatibility).
@@ -108,9 +244,24 @@ impl ExtensionRegistry {
            warnings: Vec::new(),
            items: Vec::new(),
        };
+        // Declared points first: contributions to them (the plugin's own too) commit after.
+        set.items.extend(self.prepare_declarations(pkg));
        for point_id in pkg.manifest.contributes.keys() {
            let Some(point) = self.point(point_id) else {
-                let msg = format!("contributes.{point_id}: not supported by this version of the IDE; skipped");
+                if let Some(result) = self.prepare_contributions(pkg, point_id) {
+                    let prepared = result.map_err(|e| format!("contributes.{point_id}: {e}"))?;
+                    set.items.extend(prepared.into_iter().map(|p| (point_id.clone(), p)));
+                    continue;
+                }
+                // Point ids are `<owner id>.<name>`, so the dependency that owns it can be named.
+                let owner =
+                    pkg.manifest.depends.iter().find(|d| point_id.strip_prefix(&format!("{}.", d.id)).is_some());
+                let msg = match owner {
+                    Some(owner) => {
+                        format!("contributes.{point_id}: {} is not running, so this is skipped until it is", owner.id)
+                    }
+                    None => format!("contributes.{point_id}: not supported by this version of the IDE; skipped"),
+                };
                tracing::warn!(plugin = %pkg.id(), "{msg}");
                set.warnings.push(msg);
                continue;
@@ -129,7 +280,7 @@ impl ExtensionRegistry {
                        set.files.push(f.clone());
                    }
                }
-                set.items.push((point.id(), prepared));
+                set.items.push((point.id().to_owned(), prepared));
            }
        }
        if let Some(point) = self.point(LOCALES_POINT)
@@ -144,7 +295,7 @@ impl ExtensionRegistry {
                    set.files.push(f.clone());
                }
            }
-            set.items.push((point.id(), prepared));
+            set.items.push((point.id().to_owned(), prepared));
        }
        Ok(set)
    }
@@ -201,7 +352,7 @@ impl ExtensionRegistry {
            .lock()
            .get(plugin)
            .map(|list| {
-                list.iter().map(|e| ContributionInfo { point: e.point.into(), label: e.label.clone() }).collect()
+                list.iter().map(|e| ContributionInfo { point: e.point.clone(), label: e.label.clone() }).collect()
            })
            .unwrap_or_default()
    }
@@ -217,6 +368,14 @@ impl ExtensionRegistry {
    }
 }

+fn notify(dynamic: &Mutex<Dynamic>, listener: &RwLock<Option<ChangeListener>>, point: &str) {
+    let owner = dynamic.lock().points.get(point).map(|(owner, _)| owner.clone());
+    let callback = listener.read().clone();
+    if let (Some(owner), Some(callback)) = (owner, callback) {
+        callback(point, &owner);
+    }
+}
+
 fn strip_prefix<'a>(e: &'a str, point: &str) -> &'a str {
    e.strip_prefix(&format!("contributes.{point}: ")).unwrap_or(e)
 }
@@ -310,6 +469,122 @@ mod tests {
        assert!(reg.contributions("p").is_empty());
    }

+    fn pkg_of(id: &str, body: &str) -> Package {
+        let src = format!("id = \"{id}\"\nname = \"N\"\nversion = \"1.0.0\"\nengines.openidea = \"^1.5\"\n{body}");
+        Package::new(Manifest::parse(&src).unwrap(), PathBuf::from("/nonexistent"))
+    }
+
+    const BASE: &str = r#"
+        [[extension-points]]
+        id = "acme.base.things"
+        required = ["name"]
+        fields = { name = "string", weight = "integer" }
+    "#;
+    const PLUGIN: &str =
+        "[[depends]]\nid = \"acme.base\"\n\n[[contributes.\"acme.base.things\"]]\nname = \"a\"\nweight = 2\n";
+
+    fn commit(reg: &ExtensionRegistry, pkg: &Package) {
+        reg.commit(reg.prepare(pkg).unwrap()).unwrap();
+    }
+
+    #[test]
+    fn a_plugin_declares_a_point_and_a_dependent_contributes_to_it() {
+        let reg = ExtensionRegistry::new();
+        commit(&reg, &pkg_of("acme.base", BASE));
+        assert_eq!(reg.point_owner("acme.base.things").as_deref(), Some("acme.base"));
+        assert!(reg.contributions_to("acme.base.things").is_empty());
+
+        commit(&reg, &pkg_of("acme.more", PLUGIN));
+        let got = reg.contributions_to("acme.base.things");
+        assert_eq!(got.len(), 1);
+        assert_eq!(got[0].plugin, "acme.more");
+        assert_eq!(got[0].data, serde_json::json!({"name": "a", "weight": 2}));
+        assert_eq!(
+            reg.contributions("acme.more")[0],
+            ContributionInfo { point: "acme.base.things".into(), label: "a".into() }
+        );
+        let declared = reg.declared_points("acme.base");
+        assert_eq!(declared.len(), 1);
+        assert_eq!(declared[0].contributors, ["acme.more"]);
+
+        assert!(reg.dispose_plugin("acme.more"));
+        assert!(reg.contributions_to("acme.base.things").is_empty());
+        assert!(reg.dispose_plugin("acme.base"));
+        assert_eq!(reg.point_owner("acme.base.things"), None);
+    }
+
+    #[test]
+    fn contributions_disappear_from_view_while_the_owner_is_gone() {
+        let reg = ExtensionRegistry::new();
+        commit(&reg, &pkg_of("acme.base", BASE));
+        commit(&reg, &pkg_of("acme.more", PLUGIN));
+        reg.dispose_plugin("acme.base");
+        assert!(reg.contributions_to("acme.base.things").is_empty(), "nobody may read a point that is not declared");
+        commit(&reg, &pkg_of("acme.base", BASE));
+        assert_eq!(reg.contributions_to("acme.base.things").len(), 1, "back with the owner");
+    }
+
+    #[test]
+    fn contributing_needs_a_dependency_on_the_owner() {
+        let reg = ExtensionRegistry::new();
+        commit(&reg, &pkg_of("acme.base", BASE));
+        let err =
+            reg.prepare(&pkg_of("acme.rogue", "[[contributes.\"acme.base.things\"]]\nname = \"x\"\n")).unwrap_err();
+        assert!(err.contains("acme.base") && err.contains("[[depends]]"), "{err}");
+    }
+
+    #[test]
+    fn a_contribution_is_checked_against_the_declared_fields() {
+        let reg = ExtensionRegistry::new();
+        commit(&reg, &pkg_of("acme.base", BASE));
+        let bad = "[[depends]]\nid = \"acme.base\"\n[[contributes.\"acme.base.things\"]]\nweight = 1\n";
+        let err = reg.prepare(&pkg_of("acme.more", bad)).unwrap_err();
+        assert_eq!(err, "contributes.acme.base.things: contributions[0]: missing required field \"name\"");
+    }
+
+    #[test]
+    fn a_point_nobody_declares_is_skipped_with_a_warning() {
+        let reg = ExtensionRegistry::new();
+        let set = reg.prepare(&pkg_of("acme.more", PLUGIN)).unwrap();
+        assert!(set.is_empty());
+        assert!(set.warnings[0].contains("acme.base.things"), "{:?}", set.warnings);
+    }
+
+    #[test]
+    fn a_missing_owner_is_named_instead_of_blaming_the_ide_version() {
+        let reg = ExtensionRegistry::new();
+        let set = reg.prepare(&pkg_of("acme.more", PLUGIN)).unwrap();
+        let warning = &set.warnings[0];
+        assert!(warning.contains("acme.base") && warning.contains("not running"), "{warning}");
+        assert!(!warning.contains("this version of the IDE"), "{warning}");
+
+        let unrelated = "[[contributes.\"acme.nobody.things\"]]\nname = \"x\"\n";
+        let set = reg.prepare(&pkg_of("acme.more", unrelated)).unwrap();
+        assert!(set.warnings[0].contains("this version of the IDE"), "{:?}", set.warnings);
+    }
+
+    #[test]
+    fn a_plugin_may_contribute_to_its_own_point() {
+        let reg = ExtensionRegistry::new();
+        let own = format!("{BASE}\n[[contributes.\"acme.base.things\"]]\nname = \"builtin\"\n");
+        commit(&reg, &pkg_of("acme.base", &own));
+        assert_eq!(reg.contributions_to("acme.base.things")[0].data["name"], "builtin");
+    }
+
+    #[test]
+    fn the_owner_hears_about_changes_to_its_point() {
+        let reg = ExtensionRegistry::new();
+        let heard: Arc<Mutex<Vec<(String, String)>>> = Arc::default();
+        let sink = heard.clone();
+        reg.set_change_listener(Arc::new(move |point, owner| sink.lock().push((point.into(), owner.into()))));
+        commit(&reg, &pkg_of("acme.base", BASE));
+        assert!(heard.lock().is_empty(), "declaring is not a contribution");
+        commit(&reg, &pkg_of("acme.more", PLUGIN));
+        reg.dispose_plugin("acme.more");
+        let expected = ("acme.base.things".to_owned(), "acme.base".to_owned());
+        assert_eq!(*heard.lock(), [expected.clone(), expected]);
+    }
+
    #[test]
    fn invalid_declarations_fail_prepare_and_unknown_points_warn() {
        let (reg, _) = setup();
@@ -0,0 +1,433 @@
+//! Which plugins can run, and in which order, given what they depend on.
+
+use semver::{Version, VersionReq};
+use serde::{Deserialize, Serialize};
+use specta::Type;
+use std::collections::{BTreeMap, BTreeSet};
+use std::fmt;
+
+/// `[[depends]]` of a manifest.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(deny_unknown_fields)]
+pub struct Dependency {
+    pub id: String,
+    /// Semver requirement on the dependency's version; none accepts any.
+    #[serde(default)]
+    pub version: Option<String>,
+    /// The plugin runs without it; when present it starts first.
+    #[serde(default)]
+    pub optional: bool,
+}
+
+impl Dependency {
+    /// `acme.base ^1.0`.
+    pub fn describe(&self) -> String {
+        match &self.version {
+            Some(v) => format!("{} {v}", self.id),
+            None => self.id.clone(),
+        }
+    }
+}
+
+/// A plugin as the resolver sees it.
+#[derive(Clone, Copy, Debug)]
+pub struct Node<'a> {
+    pub id: &'a str,
+    pub version: &'a str,
+    pub depends: &'a [Dependency],
+    /// Not switched off by the user.
+    pub enabled: bool,
+}
+
+/// Why an enabled plugin cannot run.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase", tag = "kind")]
+pub enum Blocked {
+    /// A required plugin is not installed.
+    Missing { requirement: String },
+    /// A required plugin is switched off.
+    Disabled { id: String },
+    /// A required plugin is installed in a version that does not satisfy the requirement.
+    Version { requirement: String, found: String },
+    /// A required plugin cannot run itself.
+    Dependency { id: String },
+    /// The plugin is part of a dependency cycle (`a → b → a`).
+    Cycle { ring: Vec<String> },
+}
+
+impl fmt::Display for Blocked {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Missing { requirement } => write!(f, "Requires {requirement}, which is not installed"),
+            Self::Disabled { id } => write!(f, "Requires {id}, which is disabled"),
+            Self::Version { requirement, found } => {
+                write!(f, "Requires {requirement}, but version {found} is installed")
+            }
+            Self::Dependency { id } => write!(f, "Requires {id}, which cannot run"),
+            Self::Cycle { ring } => write!(f, "Part of a dependency cycle: {}", ring.join(" → ")),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+pub struct Plan {
+    /// Plugins that can run, every plugin after the plugins it depends on.
+    pub order: Vec<String>,
+    /// Enabled plugins that cannot run. Disabled plugins are in neither list.
+    pub blocked: BTreeMap<String, Blocked>,
+}
+
+/// Decides, for every enabled plugin, whether its required plugins allow it to
+/// run and the order to start them in (the counterpart of IntelliJ's
+/// `PluginSetBuilder`: dependency graph, topological order, cycle report).
+pub fn plan(nodes: &[Node<'_>]) -> Plan {
+    let by_id: BTreeMap<&str, &Node<'_>> = nodes.iter().map(|n| (n.id, n)).collect();
+    let enabled: Vec<&Node<'_>> = by_id.values().copied().filter(|n| n.enabled).collect();
+    let mut blocked: BTreeMap<String, Blocked> = BTreeMap::new();
+
+    for node in &enabled {
+        for dep in node.depends.iter().filter(|d| !d.optional) {
+            if let Some(reason) = direct_reason(dep, by_id.get(dep.id.as_str()).copied()) {
+                blocked.entry(node.id.to_owned()).or_insert(reason);
+            }
+        }
+    }
+
+    // Cycles among plugins whose requirements are otherwise present.
+    let candidates: BTreeSet<&str> = enabled.iter().map(|n| n.id).filter(|id| !blocked.contains_key(*id)).collect();
+    let graph: Graph<'_> = candidates
+        .iter()
+        .map(|id| {
+            let deps = by_id[id].depends.iter().filter(|d| !d.optional).map(|d| d.id.as_str());
+            (*id, deps.filter(|d| candidates.contains(d)).collect())
+        })
+        .collect();
+    for component in components(&graph) {
+        let cyclic = component.len() > 1 || graph[component[0]].contains(&component[0]);
+        if cyclic {
+            let ring = ring_of(&component, &graph);
+            for id in component {
+                blocked.insert(id.to_owned(), Blocked::Cycle { ring: ring.clone() });
+            }
+        }
+    }
+
+    // A plugin that needs a blocked plugin is blocked too.
+    loop {
+        let mut changed = false;
+        for node in &enabled {
+            if blocked.contains_key(node.id) {
+                continue;
+            }
+            if let Some(dep) = node.depends.iter().find(|d| !d.optional && blocked.contains_key(&d.id)) {
+                blocked.insert(node.id.to_owned(), Blocked::Dependency { id: dep.id.clone() });
+                changed = true;
+            }
+        }
+        if !changed {
+            break;
+        }
+    }
+
+    let runnable: BTreeSet<&str> = enabled.iter().map(|n| n.id).filter(|id| !blocked.contains_key(*id)).collect();
+    Plan { order: topological(&runnable, &by_id), blocked }
+}
+
+/// Plugins that need `id`, directly or through other plugins, whether or not
+/// they are enabled. Optional dependencies do not count.
+pub fn dependents(nodes: &[Node<'_>], id: &str) -> Vec<String> {
+    let mut found: BTreeSet<String> = BTreeSet::new();
+    let mut frontier = vec![id.to_owned()];
+    while let Some(current) = frontier.pop() {
+        for node in nodes {
+            if node.depends.iter().any(|d| !d.optional && d.id == current) && found.insert(node.id.to_owned()) {
+                frontier.push(node.id.to_owned());
+            }
+        }
+    }
+    found.remove(id);
+    found.into_iter().collect()
+}
+
+/// How one dependency stands right now, for the plugin details page.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub enum DependencyState {
+    Satisfied,
+    Missing,
+    Disabled,
+    /// Installed, wrong version.
+    Version,
+    /// Installed and enabled, but cannot run itself.
+    Blocked,
+}
+
+pub fn dependency_state(dep: &Dependency, found: Option<&Node<'_>>, found_blocked: bool) -> DependencyState {
+    match direct_reason(dep, found) {
+        Some(Blocked::Missing { .. }) => DependencyState::Missing,
+        Some(Blocked::Disabled { .. }) => DependencyState::Disabled,
+        Some(Blocked::Version { .. }) => DependencyState::Version,
+        _ if found_blocked => DependencyState::Blocked,
+        _ => DependencyState::Satisfied,
+    }
+}
+
+fn direct_reason(dep: &Dependency, found: Option<&Node<'_>>) -> Option<Blocked> {
+    let Some(target) = found else {
+        return Some(Blocked::Missing { requirement: dep.describe() });
+    };
+    if !target.enabled {
+        return Some(Blocked::Disabled { id: dep.id.clone() });
+    }
+    let want = dep.version.as_deref()?;
+    let satisfied = VersionReq::parse(want)
+        .ok()
+        .zip(Version::parse(target.version).ok())
+        .is_some_and(|(req, have)| req.matches(&have));
+    (!satisfied).then(|| Blocked::Version { requirement: dep.describe(), found: target.version.to_owned() })
+}
+
+/// Plugin id → the plugin ids it requires.
+type Graph<'a> = BTreeMap<&'a str, Vec<&'a str>>;
+
+/// Strongly connected components (Tarjan) of `graph`.
+fn components<'a>(graph: &Graph<'a>) -> Vec<Vec<&'a str>> {
+    struct State<'a, 'g> {
+        index: usize,
+        stack: Vec<&'a str>,
+        info: BTreeMap<&'a str, (usize, usize, bool)>,
+        out: Vec<Vec<&'a str>>,
+        graph: &'g Graph<'a>,
+    }
+    fn visit<'a>(s: &mut State<'a, '_>, v: &'a str) {
+        s.info.insert(v, (s.index, s.index, true));
+        s.index += 1;
+        s.stack.push(v);
+        for &w in &s.graph[v] {
+            match s.info.get(w).copied() {
+                None => {
+                    visit(s, w);
+                    let low = s.info[w].1;
+                    let entry = s.info.get_mut(v).expect("visited");
+                    entry.1 = entry.1.min(low);
+                }
+                Some((index, _, true)) => {
+                    let entry = s.info.get_mut(v).expect("visited");
+                    entry.1 = entry.1.min(index);
+                }
+                Some(_) => {}
+            }
+        }
+        let (index, low, _) = s.info[v];
+        if index == low {
+            let mut component = Vec::new();
+            while let Some(w) = s.stack.pop() {
+                s.info.get_mut(w).expect("visited").2 = false;
+                component.push(w);
+                if w == v {
+                    break;
+                }
+            }
+            component.sort_unstable();
+            s.out.push(component);
+        }
+    }
+    let mut state = State { index: 0, stack: Vec::new(), info: BTreeMap::new(), out: Vec::new(), graph };
+    for &id in graph.keys() {
+        if !state.info.contains_key(id) {
+            visit(&mut state, id);
+        }
+    }
+    state.out
+}
+
+/// One cycle through `component`, from its smallest id back to it.
+fn ring_of(component: &[&str], graph: &Graph<'_>) -> Vec<String> {
+    let start = component[0];
+    let mut ring = vec![start.to_owned()];
+    let mut current = start;
+    let mut seen: BTreeSet<&str> = BTreeSet::from([start]);
+    loop {
+        let mut next: Vec<&str> = graph[current].iter().copied().filter(|d| component.contains(d)).collect();
+        next.sort_unstable();
+        // Prefer closing the ring; otherwise take the smallest unseen member.
+        let step =
+            if next.contains(&start) { start } else { *next.iter().find(|d| !seen.contains(**d)).unwrap_or(&start) };
+        ring.push(step.to_owned());
+        if step == start {
+            return ring;
+        }
+        seen.insert(step);
+        current = step;
+    }
+}
+
+/// Kahn's algorithm over the runnable plugins; ties break by id. Optional
+/// dependencies order too, but never block: leftovers (an optional edge
+/// closing a loop) are appended by id.
+fn topological(runnable: &BTreeSet<&str>, by_id: &BTreeMap<&str, &Node<'_>>) -> Vec<String> {
+    let mut waiting: BTreeMap<&str, BTreeSet<&str>> = runnable
+        .iter()
+        .map(|id| {
+            let deps = by_id[id].depends.iter().map(|d| d.id.as_str()).filter(|d| runnable.contains(d) && d != id);
+            (*id, deps.collect())
+        })
+        .collect();
+    let mut order: Vec<String> = Vec::with_capacity(runnable.len());
+    while let Some(next) = waiting.iter().find(|(_, deps)| deps.is_empty()).map(|(id, _)| *id) {
+        waiting.remove(next);
+        for deps in waiting.values_mut() {
+            deps.remove(next);
+        }
+        order.push(next.to_owned());
+    }
+    order.extend(waiting.keys().map(|id| (*id).to_owned()));
+    order
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn dep(id: &str) -> Dependency {
+        Dependency { id: id.into(), version: None, optional: false }
+    }
+
+    fn dep_v(id: &str, version: &str) -> Dependency {
+        Dependency { id: id.into(), version: Some(version.into()), optional: false }
+    }
+
+    fn optional(id: &str) -> Dependency {
+        Dependency { id: id.into(), version: None, optional: true }
+    }
+
+    fn node<'a>(id: &'a str, depends: &'a [Dependency]) -> Node<'a> {
+        Node { id, version: "1.0.0", depends, enabled: true }
+    }
+
+    #[test]
+    fn dependencies_start_first_whatever_the_ids_sort_like() {
+        let (a, z) = ([dep("z.base")], []);
+        let plan = plan(&[node("a.app", &a), node("z.base", &z)]);
+        assert_eq!(plan.order, ["z.base", "a.app"]);
+        assert!(plan.blocked.is_empty());
+    }
+
+    #[test]
+    fn independent_plugins_keep_id_order() {
+        let plan = plan(&[node("b", &[]), node("a", &[]), node("c", &[])]);
+        assert_eq!(plan.order, ["a", "b", "c"]);
+    }
+
+    #[test]
+    fn a_missing_requirement_blocks_with_the_requirement_text() {
+        let needs = [dep_v("acme.base", "^1.0")];
+        let plan = plan(&[node("acme.app", &needs)]);
+        assert!(plan.order.is_empty());
+        assert_eq!(plan.blocked["acme.app"], Blocked::Missing { requirement: "acme.base ^1.0".into() });
+        assert_eq!(plan.blocked["acme.app"].to_string(), "Requires acme.base ^1.0, which is not installed");
+    }
+
+    #[test]
+    fn a_disabled_requirement_blocks_but_the_disabled_plugin_itself_is_not_blocked() {
+        let needs = [dep("acme.base")];
+        let mut base = node("acme.base", &[]);
+        base.enabled = false;
+        let plan = plan(&[base, node("acme.app", &needs)]);
+        assert_eq!(plan.blocked["acme.app"], Blocked::Disabled { id: "acme.base".into() });
+        assert!(!plan.blocked.contains_key("acme.base"));
+        assert!(plan.order.is_empty());
+    }
+
+    #[test]
+    fn the_installed_version_must_satisfy_the_requirement() {
+        let needs = [dep_v("acme.base", "^0.2")];
+        let mut base = node("acme.base", &[]);
+        base.version = "0.3.0";
+        let plan_bad = plan(&[base, node("acme.app", &needs)]);
+        assert_eq!(
+            plan_bad.blocked["acme.app"],
+            Blocked::Version { requirement: "acme.base ^0.2".into(), found: "0.3.0".into() }
+        );
+        assert_eq!(plan_bad.blocked["acme.app"].to_string(), "Requires acme.base ^0.2, but version 0.3.0 is installed");
+
+        base.version = "0.2.7";
+        let plan_ok = plan(&[base, node("acme.app", &needs)]);
+        assert!(plan_ok.blocked.is_empty());
+        assert_eq!(plan_ok.order, ["acme.base", "acme.app"]);
+    }
+
+    #[test]
+    fn blocking_propagates_to_everything_downstream() {
+        let (b, c) = ([dep("a")], [dep("b")]);
+        let plan = plan(&[node("b", &b), node("c", &c)]);
+        assert_eq!(plan.blocked["b"], Blocked::Missing { requirement: "a".into() });
+        assert_eq!(plan.blocked["c"], Blocked::Dependency { id: "b".into() });
+        assert!(plan.order.is_empty());
+    }
+
+    #[test]
+    fn an_optional_requirement_never_blocks_but_orders_when_present() {
+        let app = [optional("acme.extra")];
+        let alone = plan(&[node("acme.app", &app)]);
+        assert_eq!(alone.order, ["acme.app"]);
+        assert!(alone.blocked.is_empty());
+
+        let with = plan(&[node("acme.app", &app), node("acme.extra", &[])]);
+        assert_eq!(with.order, ["acme.extra", "acme.app"]);
+
+        let mut off = node("acme.extra", &[]);
+        off.enabled = false;
+        let disabled = plan(&[node("acme.app", &app), off]);
+        assert_eq!(disabled.order, ["acme.app"]);
+        assert!(disabled.blocked.is_empty());
+    }
+
+    #[test]
+    fn a_cycle_blocks_its_members_and_names_the_ring() {
+        let (a, b, d) = ([dep("b")], [dep("a")], [dep("a")]);
+        let plan = plan(&[node("a", &a), node("b", &b), node("d", &d)]);
+        let ring = Blocked::Cycle { ring: vec!["a".into(), "b".into(), "a".into()] };
+        assert_eq!(plan.blocked["a"], ring);
+        assert_eq!(plan.blocked["b"], ring);
+        assert_eq!(ring.to_string(), "Part of a dependency cycle: a → b → a");
+        assert_eq!(plan.blocked["d"], Blocked::Dependency { id: "a".into() });
+        assert!(plan.order.is_empty());
+    }
+
+    #[test]
+    fn a_plugin_requiring_itself_is_a_cycle() {
+        let a = [dep("a")];
+        let plan = plan(&[node("a", &a)]);
+        assert_eq!(plan.blocked["a"], Blocked::Cycle { ring: vec!["a".into(), "a".into()] });
+    }
+
+    #[test]
+    fn an_optional_loop_does_not_block_and_still_yields_every_plugin() {
+        let (a, b) = ([optional("b")], [optional("a")]);
+        let plan = plan(&[node("a", &a), node("b", &b)]);
+        assert!(plan.blocked.is_empty());
+        assert_eq!(plan.order.len(), 2);
+    }
+
+    #[test]
+    fn dependents_are_transitive_and_ignore_optional_edges() {
+        let (b, c, d) = ([dep("a")], [dep("b")], [optional("a")]);
+        let nodes = [node("a", &[]), node("b", &b), node("c", &c), node("d", &d)];
+        assert_eq!(dependents(&nodes, "a"), ["b", "c"]);
+        assert_eq!(dependents(&nodes, "c"), Vec::<String>::new());
+    }
+
+    #[test]
+    fn dependency_state_tells_the_details_page_what_to_say() {
+        let want = dep_v("base", "^1.0");
+        assert_eq!(dependency_state(&want, None, false), DependencyState::Missing);
+        let mut base = node("base", &[]);
+        assert_eq!(dependency_state(&want, Some(&base), false), DependencyState::Satisfied);
+        assert_eq!(dependency_state(&want, Some(&base), true), DependencyState::Blocked);
+        base.version = "2.0.0";
+        assert_eq!(dependency_state(&want, Some(&base), false), DependencyState::Version);
+        base.enabled = false;
+        assert_eq!(dependency_state(&want, Some(&base), false), DependencyState::Disabled);
+    }
+}
@@ -627,8 +627,8 @@ mod tests {
    #[test]
    fn finds_remote_by_repo() {
        let remotes = vec![
-            ide_vcs::Remote { name: "origin".into(), url: "[email protected]:me/App.git".into() },
-            ide_vcs::Remote { name: "upstream".into(), url: "https://github.com/org/app/".into() },
+            ide_vcs::Remote { name: "origin".into(), url: "[email protected]:me/App.git".into(), resolved_url: None },
+            ide_vcs::Remote { name: "upstream".into(), url: "https://github.com/org/app/".into(), resolved_url: None },
        ];
        assert_eq!(remote_for(&remotes, "me/app").map(|r| r.name.as_str()), Some("origin"));
        assert_eq!(remote_for(&remotes, "org/app").map(|r| r.name.as_str()), Some("upstream"));
@@ -10,7 +10,6 @@ name = "openidea-server"
 path = "src/bin/server.rs"

 [dependencies]
-percent-encoding = "2"
 encoding_rs.workspace = true
 ide-core.workspace = true
 ide-mcp.workspace = true
@@ -368,7 +368,9 @@ fn check(dir: &Path) -> Result<(), String> {
        let manifest = Manifest::load(&dir)?;
        println!("{} {} — {}", preview.id, preview.version, preview.name);
        if manifest.legacy {
-            println!("  note: plugin.toml uses the 0.1 format (`openidea-api`); see plugins/README.md to move to 0.2");
+            println!(
+                "  note: plugin.toml uses the 0.1 format (`openidea-api`); its code no longer runs: rebuild it against the 1.x SDK and declare `engines.openidea` (see plugins/README.md)"
+            );
        }
        if let Some(wasm) = &manifest.wasm {
            let engine = PluginEngine::new()?;
@@ -208,7 +208,7 @@ authors = []
 engines.openidea = "^1.0"

 # One entry per theme. `editor-scheme` is optional: its tokens are merged over
-# the theme's (IntelliJ's .theme.json + .icls pair). Reference: docs/plugins/themes.md.
+# the theme's (IntelliJ's .theme.json + .icls pair). Reference: plugins/themes.md.
 [[contributes.themes]]
 path = "themes/__SLUG__.theme.json"
 editor-scheme = "themes/__SLUG__.scheme.json"
@@ -1,9 +1,37 @@
 //! Storage policy and best-effort migration of rebuildable desktop data.

+use std::ffi::OsString;
 use std::fs;
 use std::io;
 use std::path::{Path, PathBuf};

+/// Moves the rebuildable local data (tools, language servers, indexes, caches);
+/// configuration and roaming data keep following the OS.
+pub const LOCAL_DATA_ENV: &str = "OPENIDEA_LOCAL_DATA_DIR";
+
+/// `$OPENIDEA_LOCAL_DATA_DIR/<identifier>` when set, else the OS local data directory
+/// (Tauri's `app_local_data_dir`). The identifier keeps release and per-worktree
+/// debug builds apart under one root. A set but unusable path is an error, never a
+/// silent fallback to the OS location.
+pub fn local_data_dir(identifier: &str) -> Result<PathBuf, String> {
+    resolve_local(std::env::var_os(LOCAL_DATA_ENV), dirs::data_local_dir(), identifier)
+}
+
+fn resolve_local(var: Option<OsString>, os: Option<PathBuf>, identifier: &str) -> Result<PathBuf, String> {
+    let Some(root) = var.filter(|v| !v.is_empty()).map(PathBuf::from) else {
+        return os.map(|dir| dir.join(identifier)).ok_or_else(|| "cannot find the local data directory".into());
+    };
+    // The working directory depends on how the IDE was launched.
+    if !root.is_absolute() {
+        return Err(format!("{LOCAL_DATA_ENV} must be an absolute path: {}", root.display()));
+    }
+    let dir = root.join(identifier);
+    fs::create_dir_all(&dir)
+        .and_then(|()| tempfile::NamedTempFile::new_in(&dir).map(drop))
+        .map_err(|error| format!("{LOCAL_DATA_ENV}: cannot write to {}: {error}", dir.display()))?;
+    Ok(dir)
+}
+
 /// Unknown entries and recovery/user content deliberately stay in roaming data.
 pub fn is_local(entry: &Path) -> bool {
    ["tools", "language-server-runtimes", "index", "cache", "lsp", "notebook-runtime", "server", "logs"]
@@ -276,6 +304,102 @@ fn relative_wrapper(text: &str, source: &Path) -> String {
 mod tests {
    use super::*;

+    #[test]
+    fn local_dir_follows_the_os_unless_the_variable_is_set() {
+        let os = Some(PathBuf::from("/os-local"));
+        for var in [None, Some(OsString::new())] {
+            assert_eq!(
+                resolve_local(var, os.clone(), "ai.l0ng.openidea").unwrap(),
+                Path::new("/os-local/ai.l0ng.openidea")
+            );
+        }
+        assert!(resolve_local(None, None, "id").is_err());
+
+        let tmp = tempfile::tempdir().unwrap();
+        let root = tmp.path().join("missing/nested");
+        let dir = resolve_local(Some(root.clone().into()), os.clone(), "ai.l0ng.openidea").unwrap();
+        assert_eq!(dir, root.join("ai.l0ng.openidea"));
+        assert!(dir.is_dir());
+        assert_eq!(fs::read_dir(&dir).unwrap().count(), 0);
+        // Debug worktrees have their own identifiers and stay apart under one root.
+        assert_ne!(resolve_local(Some(root.clone().into()), None, "dev-a").unwrap(), dir);
+    }
+
+    #[test]
+    fn local_dir_preserves_an_existing_probe_file() {
+        let tmp = tempfile::tempdir().unwrap();
+        let dir = tmp.path().join("id");
+        fs::create_dir(&dir).unwrap();
+        let probe = dir.join(".openidea-write-check");
+        fs::write(&probe, "keep").unwrap();
+        assert_eq!(resolve_local(Some(tmp.path().into()), None, "id").unwrap(), dir);
+        assert_eq!(fs::read_to_string(probe).unwrap(), "keep");
+        assert_eq!(fs::read_dir(dir).unwrap().count(), 1);
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn local_dir_preserves_an_existing_probe_symlink_and_its_target() {
+        let tmp = tempfile::tempdir().unwrap();
+        let dir = tmp.path().join("id");
+        fs::create_dir(&dir).unwrap();
+        let target = tmp.path().join("target");
+        fs::write(&target, "keep").unwrap();
+        let probe = dir.join(".openidea-write-check");
+        std::os::unix::fs::symlink(&target, &probe).unwrap();
+        assert_eq!(resolve_local(Some(tmp.path().into()), None, "id").unwrap(), dir);
+        assert_eq!(fs::read_to_string(target).unwrap(), "keep");
+        assert!(fs::symlink_metadata(probe).unwrap().file_type().is_symlink());
+        assert_eq!(fs::read_dir(dir).unwrap().count(), 1);
+    }
+
+    #[test]
+    fn local_dir_allows_concurrent_probes_for_the_same_identifier() {
+        let tmp = tempfile::tempdir().unwrap();
+        let barrier = std::sync::Barrier::new(8);
+        std::thread::scope(|scope| {
+            for _ in 0..8 {
+                let barrier = &barrier;
+                let root = tmp.path();
+                scope.spawn(move || {
+                    barrier.wait();
+                    for _ in 0..16 {
+                        assert_eq!(resolve_local(Some(root.into()), None, "id").unwrap(), root.join("id"));
+                    }
+                });
+            }
+        });
+        assert_eq!(fs::read_dir(tmp.path().join("id")).unwrap().count(), 0);
+    }
+
+    #[test]
+    fn local_dir_rejects_relative_and_unwritable_paths() {
+        for relative in ["local", "./local", "../local"] {
+            let error = resolve_local(Some(relative.into()), Some("/os".into()), "id").unwrap_err();
+            assert!(error.contains(LOCAL_DATA_ENV) && error.contains("absolute"), "{error}");
+        }
+        let tmp = tempfile::tempdir().unwrap();
+        let blocker = tmp.path().join("file");
+        fs::write(&blocker, "").unwrap();
+        let error = resolve_local(Some(blocker.into()), Some("/os".into()), "id").unwrap_err();
+        assert!(error.contains("cannot write"), "{error}");
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn local_dir_rejects_an_existing_read_only_directory() {
+        use std::os::unix::fs::PermissionsExt;
+        let tmp = tempfile::tempdir().unwrap();
+        let dir = tmp.path().join("id");
+        fs::create_dir(&dir).unwrap();
+        fs::set_permissions(&dir, fs::Permissions::from_mode(0o555)).unwrap();
+        // Root ignores permission bits.
+        if fs::write(dir.join("probe"), "").is_err() {
+            assert!(resolve_local(Some(tmp.path().into()), None, "id").unwrap_err().contains("cannot write"));
+        }
+        fs::set_permissions(&dir, fs::Permissions::from_mode(0o755)).unwrap();
+    }
+
    #[test]
    fn wrappers_accept_mixed_separators_without_rewriting_neighbor_paths() {
        let text = "@echo off\r\n\"C:\\old\\tools/demo\\payload.exe\" \"C:\\old\\tools/demo-other\\x\" %*\r\n";
@@ -56,7 +56,7 @@ pub struct HostConfig {

 pub struct Host {
    pub(crate) mcp_executable: RwLock<Option<PathBuf>>,
-    plugin_host: Arc<RwLock<std::sync::Weak<plugins::PluginHost>>>,
+    plugin_host: RwLock<std::sync::Weak<plugins::PluginHost>>,
    pub mcp_reports: mcp::Reports,
    pub mcp_requests: mcp::Requests,
    pub trust: trust::TrustStore,
@@ -125,7 +125,7 @@ impl Host {
        let ssh = Arc::new(ide_ssh::SshManager::new(data_dir.join("ssh-passwords.json")));
        ssh.set_configs(global_settings.effective().ssh.configs);
        let host = Self {
-            plugin_host: Arc::default(),
+            plugin_host: RwLock::default(),
            mcp_executable: RwLock::default(),
            mcp_reports: Default::default(),
            mcp_requests: Default::default(),
@@ -28,6 +28,8 @@ pub struct Reports(RwLock<State>);
 struct State {
    windows: HashMap<String, Window>,
    focused: Option<String>,
+    /// Windows in the order they were last focused, the most recent last.
+    focus_order: Vec<String>,
    remote: HashMap<String, PathBuf>,
    libraries: HashMap<String, Vec<PathBuf>>,
 }
@@ -46,8 +48,16 @@ impl Reports {
        state.windows.entry(window.into()).or_default().focused = editor;
        if focused {
            state.focused = Some(window.into());
+            state.focus_order.retain(|w| w != window);
+            state.focus_order.push(window.into());
        }
    }
+    /// Sorts `windows` by when they were last focused, the most recent first; windows
+    /// never focused keep their order after them.
+    pub(crate) fn most_recently_focused_first(&self, windows: &mut [String]) {
+        let order = &self.0.read().focus_order;
+        windows.sort_by_key(|w| std::cmp::Reverse(order.iter().position(|o| o == w)));
+    }
    pub fn report_problems(&self, window: &str, reset: bool, files: Vec<FileProblems>) {
        let mut state = self.0.write();
        let problems = &mut state.windows.entry(window.into()).or_default().problems;
@@ -68,6 +78,7 @@ impl Reports {
        state.windows.remove(window);
        state.remote.remove(window);
        state.libraries.remove(window);
+        state.focus_order.retain(|w| w != window);
        if state.focused.as_deref() == Some(window) {
            state.focused = None;
        }
@@ -122,3 +133,24 @@ impl Reports {
        files.into_iter().map(|(path, items)| FileProblems { path: path.into(), items }).collect()
    }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn windows_sort_by_their_last_focus() {
+        let reports = Reports::default();
+        for window in ["a", "b", "a", "c"] {
+            reports.set_focused_editor(window, None, true);
+        }
+        reports.set_focused_editor("b", None, false);
+        let mut windows: Vec<String> = ["a", "b", "c", "never"].map(String::from).into();
+        reports.most_recently_focused_first(&mut windows);
+        assert_eq!(windows, ["c", "a", "b", "never"]);
+        reports.forget_window("c");
+        let mut windows: Vec<String> = ["never", "c", "b", "a"].map(String::from).into();
+        reports.most_recently_focused_first(&mut windows);
+        assert_eq!(windows, ["a", "b", "never", "c"]);
+    }
+}
@@ -6,7 +6,7 @@ use crate::rpc::Dispatcher;
 use ide_agent::registry::{AgentRegistry, RegistryPaths};
 use ide_agent::{
    AgentChange, AgentCommand, AgentEntry, AgentEvent, AgentProbe, AgentPrompt, AgentProvider, AgentQueued, AgentTask,
-    NewAgentTask,
+    McpScope, McpServer, McpServerInput, NewAgentTask,
 };
 use ide_core::error::ErrorKind;
 use ide_core::{IdeError, IdeEvent, IdeResult, IpcPath, RequestId, SharedSink, TaskId};
@@ -277,6 +277,105 @@ pub async fn base_text(host: &Host, window: &str, task: String, path: IpcPath) -
    host.project(window)?.agents.base_text(&task, path.into_path_buf()).await
 }

+/// Rollback: the task's changed files among `paths` (all without) back as they were when it started.
+pub async fn rollback_changes(host: &Host, window: &str, task: String, paths: Option<Vec<String>>) -> IdeResult<()> {
+    host.require_trust(window)?;
+    host.project(window)?.agents.rollback_changes(&task, paths).await
+}
+
+type McpServerMap = std::collections::BTreeMap<String, ide_core::settings::AgentMcpServer>;
+
+fn mcp_maps(host: &Host, window: &str) -> (McpServerMap, McpServerMap, Option<std::sync::Arc<crate::Project>>) {
+    let user = host.global_settings.effective().agents.mcp_servers;
+    let project = host.project(window).ok().filter(|p| !p.light);
+    let workspace = project
+        .as_ref()
+        .map(|p| p.settings.layer(ide_workspace::settings::SettingsScope::Project).agents.mcp_servers)
+        .unwrap_or_default();
+    (user, workspace, project)
+}
+
+fn persist_mcp_map(
+    host: &Host,
+    project: Option<&std::sync::Arc<crate::Project>>,
+    scope: McpScope,
+    map: &McpServerMap,
+) -> IdeResult<()> {
+    let value = if map.is_empty() {
+        serde_json::Value::Null
+    } else {
+        serde_json::to_value(map).map_err(|e| IdeError::invalid(e.to_string()))?
+    };
+    let event = IdeEvent::SettingsChanged { key: "agents.mcpServers".into() };
+    match scope {
+        McpScope::User => {
+            host.global_settings.set(ide_workspace::settings::SettingsScope::Global, "agents.mcpServers", value)?;
+            for p in host.projects() {
+                p.settings.reload();
+                p.sink.emit(event.clone());
+            }
+        }
+        McpScope::Workspace => {
+            let p = project.ok_or_else(|| IdeError::invalid("Open a project to configure workspace MCP servers"))?;
+            p.settings.set(ide_workspace::settings::SettingsScope::Project, "agents.mcpServers", value)?;
+            p.sink.emit(event);
+        }
+    }
+    Ok(())
+}
+
+fn update_mcp_maps<F>(host: &Host, window: &str, f: F) -> IdeResult<Vec<McpServer>>
+where
+    F: FnOnce(&mut McpServerMap, &mut McpServerMap, Option<&std::path::Path>) -> Result<(), String>,
+{
+    let (mut user, mut workspace, project) = mcp_maps(host, window);
+    let prev_user = user.clone();
+    let prev_workspace = workspace.clone();
+    let project_root = project.as_ref().map(|p| p.root.as_path());
+    f(&mut user, &mut workspace, project_root).map_err(IdeError::invalid)?;
+    if workspace != prev_workspace {
+        persist_mcp_map(host, project.as_ref(), McpScope::Workspace, &workspace)?;
+    }
+    if user != prev_user {
+        persist_mcp_map(host, project.as_ref(), McpScope::User, &user)?;
+    }
+    Ok(ide_agent::mcp::servers_from_settings(&user, &workspace))
+}
+
+/// Lists configured MCP servers across User (`settings.toml`) and Workspace (`.openidea/settings.toml`) scopes.
+pub fn mcp_list(host: &Host, window: &str) -> IdeResult<Vec<McpServer>> {
+    let (user, workspace, _) = mcp_maps(host, window);
+    Ok(ide_agent::mcp::servers_from_settings(&user, &workspace))
+}
+
+/// Creates or updates a User or Workspace MCP server and returns the updated list.
+pub fn mcp_save(host: &Host, window: &str, input: McpServerInput) -> IdeResult<Vec<McpServer>> {
+    update_mcp_maps(host, window, |user, workspace, project_root| {
+        ide_agent::mcp::apply_save(user, workspace, project_root.is_some(), input)
+    })
+}
+
+/// Enables or disables an MCP server and returns the updated list.
+pub fn mcp_set_enabled(host: &Host, window: &str, id: String, enabled: bool) -> IdeResult<Vec<McpServer>> {
+    update_mcp_maps(host, window, |user, workspace, _| {
+        ide_agent::mcp::apply_set_enabled(user, workspace, &id, enabled).map(|_| ())
+    })
+}
+
+/// Removes a User or Workspace MCP server and returns the updated list.
+pub fn mcp_remove(host: &Host, window: &str, id: String) -> IdeResult<Vec<McpServer>> {
+    update_mcp_maps(host, window, |user, workspace, _| ide_agent::mcp::apply_remove(user, workspace, &id).map(|_| ()))
+}
+
+/// Copies MCP servers from `.mcp.json` and `.vscode/mcp.json` into the workspace settings once.
+pub fn mcp_import(host: &Host, window: &str) -> IdeResult<Vec<McpServer>> {
+    update_mcp_maps(host, window, |_, workspace, project_root| {
+        let root = project_root.ok_or_else(|| "Open a project to import workspace MCP servers".to_string())?;
+        ide_agent::mcp::apply_import(workspace, root);
+        Ok(())
+    })
+}
+
 /// Commands of this module the remote server answers.
 pub(crate) fn register(d: &mut Dispatcher) {
    d.add("agent_subscribe", |c| async move { subscribe(&c.host, &c.window, c.channel("onEvent")?) });
@@ -288,6 +387,14 @@ pub(crate) fn register(d: &mut Dispatcher) {
        registry_install(&c.host, &c.window, c.arg("id")?, c.arg("request")?, c.sender("onEvent")?).await
    });
    d.add("agent_registry_remove", |c| async move { registry_remove(&c.host, &c.window, c.arg("id")?).await });
+    d.add("agent_mcp_list", |c| async move { mcp_list(&c.host, &c.window) });
+    d.add("agent_mcp_save", |c| async move { mcp_save(&c.host, &c.window, c.arg("input")?) });
+    d.add(
+        "agent_mcp_set_enabled",
+        |c| async move { mcp_set_enabled(&c.host, &c.window, c.arg("id")?, c.arg("enabled")?) },
+    );
+    d.add("agent_mcp_remove", |c| async move { mcp_remove(&c.host, &c.window, c.arg("id")?) });
+    d.add("agent_mcp_import", |c| async move { mcp_import(&c.host, &c.window) });
    d.add("agent_commands", |c| async move { commands(&c.host, &c.window, c.arg("provider")?, c.arg("task")?).await });
    d.add("agent_entries", |c| async move { entries(&c.host, &c.window, c.arg("task")?, c.arg("subagent")?) });
    d.add("agent_create", |c| async move { create(&c.host, &c.window, c.arg("request")?).await });
@@ -321,6 +428,9 @@ pub(crate) fn register(d: &mut Dispatcher) {
    );
    d.add("agent_changes", |c| async move { changes(&c.host, &c.window, c.arg("task")?).await });
    d.add("agent_base_text", |c| async move { base_text(&c.host, &c.window, c.arg("task")?, c.arg("path")?).await });
+    d.add("agent_rollback_changes", |c| async move {
+        rollback_changes(&c.host, &c.window, c.arg("task")?, c.arg("paths")?).await
+    });
 }

 fn validate_project_root(root: &std::path::Path, requested: Option<&std::path::Path>) -> IdeResult<std::path::PathBuf> {
@@ -552,7 +552,8 @@ pub async fn build_run(
            let mut combined: Option<compile::BuildPlan> = None;
            for member in workspace.projects.iter().filter(|p| file.as_ref().is_none_or(|f| f.starts_with(p))) {
                let settings = ide_workspace::SettingsStore::load(&config_dir, Some(member)).effective();
-                let member_cache = cache.join(crate::project::project_key(member));
+                let member_cache =
+                    if member == &root { cache.clone() } else { cache.join(crate::project::project_key(member)) };
                let model = with_profiles(load(member, &member_cache, &settings), &member_cache);
                let plan = prepare_plan(
                    compile::plan(member, &model, kind, file.as_deref(), settings.cmake.profiles.as_deref())?,
@@ -12,13 +12,18 @@ pub(super) fn scopes(project: &Project, config: &Path) -> IdeResult<Vec<Scope>>
 }

 fn scopes_at(root: &Path, cache: &Path, config: &Path, settings: Settings) -> IdeResult<Vec<Scope>> {
+    let window_root = root;
    Ok(match ide_workspace::workspace::Workspace::load(root)? {
        Some(workspace) => workspace
            .projects
            .into_iter()
            .filter(|p| p.is_dir())
            .map(|root| Scope {
-                cache: cache.join(crate::project::project_key(&root)),
+                cache: if root == window_root {
+                    cache.to_owned()
+                } else {
+                    cache.join(crate::project::project_key(&root))
+                },
                settings: ide_workspace::SettingsStore::load(config, Some(&root)).effective(),
                root,
            })
@@ -36,10 +41,12 @@ pub(super) fn load_scopes(root: &Path, scopes: &[Scope]) -> BuildModel {
    let mut combined = BuildModel::default();
    for scope in scopes {
        let mut model = load(&scope.root, &scope.cache, &scope.settings);
-        if scope.root == root {
+        if scopes.len() == 1 && scope.root == root {
            return model;
        }
-        if let Some(maven) = &mut model.maven {
+        if scope.root != root
+            && let Some(maven) = &mut model.maven
+        {
            let owner = ide_core::ipc_path::to_ipc(&scope.root);
            for p in &mut maven.projects {
                p.project_root = Some(owner.clone());
@@ -73,7 +80,7 @@ pub(super) fn load_scopes(root: &Path, scopes: &[Scope]) -> BuildModel {
                }
            }
        }
-        for g in &mut model.gradle {
+        for g in model.gradle.iter_mut().filter(|_| scope.root != root) {
            g.dir = absolute(&scope.root, &g.dir);
            for p in &mut g.projects {
                p.dir = absolute(&scope.root, &p.dir);
@@ -145,6 +152,30 @@ pub(super) fn update_files(root: &Path, scopes: &[Scope], model: &BuildModel, to
 mod tests {
    use super::*;

+    #[test]
+    fn attached_primary_keeps_its_cache_and_combines_build_models() {
+        let tmp = tempfile::tempdir().unwrap();
+        let base = dunce::canonicalize(tmp.path()).unwrap();
+        let root = base.join("primary");
+        let other = base.join("other");
+        for path in [&root, &other] {
+            std::fs::create_dir(path).unwrap();
+            std::fs::write(path.join("pom.xml"), "<project><artifactId>app</artifactId></project>").unwrap();
+        }
+        let cache = base.join("cache");
+        ide_build::save_maven_profiles(&cache, &["kept".into()]).unwrap();
+        ide_workspace::workspace::Workspace::attach(&root, "Primary", vec![root.clone(), other.clone()]).unwrap();
+        let scopes = scopes_at(&root, &cache, &base.join("config"), Settings::default()).unwrap();
+        assert_eq!(scopes[0].cache, cache);
+        assert_eq!(ide_build::maven_profiles(&scopes[0].cache), ["kept"]);
+        assert_eq!(scopes[1].cache, cache.join(crate::project::project_key(&other)));
+        let model = load_scopes(&root, &scopes);
+        let projects = model.maven.unwrap().projects;
+        assert_eq!(projects.len(), 2);
+        assert_eq!(projects[0].pom, "pom.xml");
+        assert_eq!(projects[1].pom, absolute(&other, "pom.xml"));
+    }
+
    #[test]
    fn workspace_models_use_member_settings_paths_and_caches() {
        let temp = tempfile::tempdir().unwrap();
@@ -1,5 +1,4 @@
 mod output;
-mod target;

 use crate::Host;
 use crate::rpc::Dispatcher;
@@ -10,15 +9,6 @@ use std::path::PathBuf;
 /// Starts a session owned by this window: its events (and those of child sessions) go here only.
 pub async fn debug_start(host: &Host, window: &str, config: LaunchConfig) -> IdeResult<DebugSessionId> {
    host.require_trust(window)?;
-    let target_id = config
-        .extra_json
-        .as_deref()
-        .and_then(|s| serde_json::from_str::<serde_json::Value>(s).ok())
-        .and_then(|v| v.get("__runTarget").and_then(|v| v.as_str()).map(str::to_owned));
-    if let Some(id) = target_id {
-        let owner = SessionOwner::new(host.owner_window(window), host.window_sink(window));
-        return target::start(host, window, config, owner, id).await;
-    }
    let mut config = match_java_debug_encoding(config, cfg!(windows));
    if config.adapter == "debugpy"
        && config.request == "launch"
@@ -38,6 +28,7 @@ pub async fn debug_start(host: &Host, window: &str, config: LaunchConfig) -> Ide
        let settings = settings.clone();
        config = host
            .blocking(move || {
+                ide_sdk::go::prepare_debug_compiler(&mut config.env, &config.extra_json)?;
                ide_sdk::go::configure_environment(&root, &settings, &mut config.env);
                ide_sdk::go::apply_to_debug(
                    &mut config.env,
@@ -1,102 +0,0 @@
-use crate::Host;
-use ide_core::path_mapping::PathMapping;
-use ide_core::{IdeError, IdeResult};
-use ide_dap::target::TargetMapping;
-use ide_dap::{LaunchConfig, SessionOwner};
-use ide_language::ProgramPin;
-use serde_json::json;
-
-pub(super) async fn start(
-    host: &Host,
-    window: &str,
-    mut config: LaunchConfig,
-    owner: SessionOwner,
-    id: String,
-) -> IdeResult<ide_core::DebugSessionId> {
-    let project = host.project(window)?;
-    let plugins =
-        host.plugin_host().ok_or_else(|| IdeError::unavailable("plugin run target is no longer available"))?;
-    let registration = plugins
-        .run_targets(&project.root)
-        .into_iter()
-        .find(|t| t.id == id)
-        .ok_or_else(|| IdeError::unavailable("plugin run target is no longer available"))?;
-    let container = registration
-        .target
-        .container_root
-        .ok_or_else(|| IdeError::invalid("Debugging a plugin target requires a container root"))?;
-    let dbg = ide_dap::adapter::find_config(&host.languages, &config.adapter)
-        .ok_or_else(|| IdeError::invalid("unknown debug adapter"))?;
-    let placement = dbg.target_placement.as_deref().unwrap_or("");
-    if !matches!(placement, "connect-back" | "adapter-in-target")
-        || (placement == "adapter-in-target" && dbg.transport != "stdio")
-    {
-        return Err(IdeError::invalid("This debugger does not support plugin run targets"));
-    }
-    let mapping = TargetMapping {
-        paths: PathMapping::new(&project.root.to_string_lossy(), &container),
-        external_prefix: format!(
-            "openidea-target://{}/0/",
-            percent_encoding::utf8_percent_encode(&id, percent_encoding::NON_ALPHANUMERIC)
-        ),
-    };
-    let mut extra: serde_json::Value = config
-        .extra_json
-        .as_deref()
-        .map(serde_json::from_str)
-        .transpose()
-        .map_err(|e| IdeError::invalid(e.to_string()))?
-        .unwrap_or(json!({}));
-    extra.as_object_mut().ok_or_else(|| IdeError::invalid("invalid debug launch arguments"))?.remove("__runTarget");
-    // DAP paths already use target coordinates; adapter-native mappings stay identity.
-    if placement == "connect-back" {
-        config.program = None;
-        config.args.clear();
-        for key in ["program", "runtimeExecutable", "runtimeArgs"] {
-            extra.as_object_mut().unwrap().remove(key);
-        }
-        if extra.get("port").and_then(|v| v.as_u64()).unwrap_or(0) == 0 {
-            extra["port"] = json!(9003);
-        }
-        extra["hostname"] = json!("0.0.0.0");
-        extra["pathMappings"] = json!({container.clone(): container.clone()});
-    } else {
-        for key in ["debugLauncherPython", "pythonPath"] {
-            extra.as_object_mut().unwrap().remove(key);
-        }
-        extra["console"] = json!("internalConsole");
-        extra["python"] = json!(dbg.command);
-        extra["pathMappings"] = json!([{"localRoot":container,"remoteRoot":container}]);
-    }
-    config.extra_json = Some(extra.to_string());
-    let wrapped = if placement == "adapter-in-target" {
-        let run = serde_json::from_value(json!({"id":"debug-adapter","name":"Debug adapter","kind":"shell","command":dbg.command,"args":dbg.args,"cwd":config.cwd,"env":config.env,"detected":false,"isTest":false})).map_err(|e| IdeError::invalid(e.to_string()))?;
-        let root = project.root.clone();
-        Some(host.blocking(move || plugins.prepare_run_target(&root, &id, &run)).await?)
-    } else {
-        None
-    };
-    host.require_trust(window)?;
-    let root = project.root.clone();
-    let settings = project.settings.effective();
-    host.debugger
-        .start_prepared(
-            config,
-            owner,
-            |_| None,
-            move |spec, _| {
-                if let Some(run) = wrapped {
-                    spec.command = run.command;
-                    spec.args = run.args;
-                    spec.cwd = run.cwd.map(Into::into).unwrap_or(root);
-                    spec.env = run.env.into_iter().collect();
-                    spec.pinned = Some(ProgramPin::approve(&spec.command)?);
-                } else if let Some(command) = ide_sdk::apply::tool_command(&root, &settings, &spec.command) {
-                    spec.command = command.to_string_lossy().into_owned();
-                }
-                spec.target = Some(mapping);
-                Ok(())
-            },
-        )
-        .await
-}
@@ -1,7 +1,7 @@
 //! Repository version lookups for manifest inspections and completion.
 use crate::{Host, rpc::Dispatcher};
 use ide_core::{CancellationToken, DocId, IdeError, IdeResult, RequestId};
-use ide_workspace::dependencies::{DependencyVersionSource, DependencyVersions, cargo, go};
+use ide_workspace::dependencies::{DependencyVersionSource, DependencyVersions, cargo, go, npm};
 use std::collections::BTreeMap;
 use std::hash::{DefaultHasher, Hash, Hasher};
 use std::path::{Path, PathBuf};
@@ -25,6 +25,31 @@ impl DependencyVersionSource for CratesIo {
    }
 }

+struct NpmRegistry;
+impl DependencyVersionSource for NpmRegistry {
+    fn id(&self) -> &'static str {
+        "npm"
+    }
+
+    /// Scoped names (`@scope/name`) aren't file-name safe.
+    fn cache_key(&self, package: &str) -> Option<String> {
+        let mut hash = DefaultHasher::new();
+        package.hash(&mut hash);
+        Some(format!("{}-{:016x}", self.id(), hash.finish()))
+    }
+
+    fn fetch(&self, package: &str, cancel: &CancellationToken) -> IdeResult<Vec<String>> {
+        let path = npm::registry_path(package).ok_or_else(|| IdeError::internal("invalid package name"))?;
+        let search_path = std::env::var_os("PATH").unwrap_or_default();
+        // The abbreviated metadata: the full document of a large package runs to tens of megabytes.
+        let text = ide_tools::Http::new(&search_path)?
+            .https_only()
+            .accept("application/vnd.npm.install-v1+json")
+            .get_text_limited(&format!("https://registry.npmjs.org/{path}"), Some(32 * 1024 * 1024), cancel)?;
+        npm::registry_versions(&text).ok_or_else(|| IdeError::internal("invalid registry metadata"))
+    }
+}
+
 struct GoModules {
    root: PathBuf,
    env: BTreeMap<String, String>,
@@ -82,7 +107,7 @@ fn go_source(project: &crate::Project, config_dir: &Path, path: &Path) -> IdeRes
        workspace
            .projects
            .into_iter()
-            .filter(|root| path.starts_with(root))
+            .filter(|root| **root != project.root && path.starts_with(root))
            .max_by_key(|root| root.components().count())
    });
    let settings = match &member {
@@ -122,6 +147,13 @@ pub async fn dependency_versions(
                let versions = cache.versions(&source, &dependency.package, &cancel)?;
                return Ok(vec![DependencyVersions { dependency, versions, update: None }]);
            }
+            if snap.path.file_name().is_some_and(|name| name == "package.json") {
+                let Some(dependency) = offset.and_then(|offset| npm::dependency_at(&snap.text, offset)) else {
+                    return Ok(Vec::new());
+                };
+                let versions = cache.versions(&NpmRegistry, &dependency.package, &cancel)?;
+                return Ok(vec![DependencyVersions { dependency, versions, update: None }]);
+            }
            if snap.path.file_name().is_none_or(|name| name != "Cargo.toml") {
                return Ok(Vec::new());
            }
@@ -208,4 +240,51 @@ mod tests {
        assert!(dependency_versions(&host, "main", info.id, None, RequestId(414)).await.unwrap().is_empty());
        host.close_project("main");
    }
+
+    struct CachedNpm;
+    impl DependencyVersionSource for CachedNpm {
+        fn id(&self) -> &'static str {
+            "npm"
+        }
+        fn cache_key(&self, package: &str) -> Option<String> {
+            NpmRegistry.cache_key(package)
+        }
+        fn fetch(&self, _: &str, _: &CancellationToken) -> IdeResult<Vec<String>> {
+            Ok(vec!["20.11.0".into(), "18.19.3".into()])
+        }
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn package_json_completes_the_version_at_the_cursor() {
+        let temp = tempfile::tempdir().unwrap();
+        let base = dunce::canonicalize(temp.path()).unwrap();
+        let root = base.join("project");
+        std::fs::create_dir(&root).unwrap();
+        let text = "{\n  \"devDependencies\": { \"@types/node\": \"^20\" }\n}\n";
+        let path = root.join("package.json");
+        std::fs::write(&path, text).unwrap();
+        let host = Host::new(HostConfig {
+            config_dir: base.join("config"),
+            data_dir: base.join("data"),
+            local_data_dir: base.join("local"),
+            languages: Arc::new(ide_language::LanguageRegistry::load(None).unwrap()),
+            syntax: Arc::default(),
+            sink_for: Box::new(|_| Arc::new(|_| {})),
+            owner: |w| w,
+            runtime: tokio::runtime::Handle::current(),
+            project_environment: false,
+        });
+        let project = host.open_project("main", &root).unwrap();
+        let info = project.documents.open(&path).unwrap();
+        host.dependency_versions.versions(&CachedNpm, "@types/node", &CancellationToken::new()).unwrap();
+        let offset = text.find("^20").unwrap() as u32 + 2;
+        let found = dependency_versions(&host, "main", info.id, Some(offset), RequestId(420)).await.unwrap();
+        assert_eq!(found.len(), 1);
+        assert_eq!(found[0].dependency.package, "@types/node");
+        assert_eq!(found[0].versions, ["20.11.0", "18.19.3"]);
+        // Inspections (no offset) and positions outside a version ask nothing.
+        assert!(dependency_versions(&host, "main", info.id, None, RequestId(421)).await.unwrap().is_empty());
+        assert!(dependency_versions(&host, "main", info.id, Some(2), RequestId(422)).await.unwrap().is_empty());
+        host.close_project("main");
+    }
 }
@@ -88,8 +88,28 @@ impl Session {
                Ok(None)
            }
        };
-        let before = fingerprint()?;
+        let mut before = fingerprint()?;
        let previous = fs::read(&record).ok().and_then(|bytes| serde_json::from_slice::<Outputs>(&bytes).ok());
+        // Timestamp-incremental builders (Maven, the Kotlin plugin) skip sources whose
+        // mtime did not advance. An external edit that preserves both length and mtime
+        // invalidates the fingerprint but would still compile to nothing below, and the
+        // stale outputs would be re-recorded as fresh. Re-stamp those sources first so
+        // the rebuild sees them; then re-scan so the record written afterwards matches.
+        let restamp: Vec<PathBuf> = match (before.as_ref(), previous.as_ref().and_then(|o| o.fingerprint.as_ref())) {
+            (Some(current), Some(recorded)) => recorded.mtime_preserved_edits(current),
+            _ => Vec::new(),
+        };
+        if !restamp.is_empty() {
+            let now = std::time::SystemTime::now();
+            for rel in &restamp {
+                let path = root.join(rel);
+                if let Err(error) = fs::File::options().write(true).open(&path).and_then(|file| file.set_modified(now))
+                {
+                    tracing::debug!(path = %path.display(), %error, "Cannot re-stamp externally edited source");
+                }
+            }
+            before = fingerprint()?;
+        }
        if let Some(outputs) = previous.as_ref()
            && policy != BuildPolicy::Rebuild
            && outputs.reusable(&before, &snapshots)
@@ -234,6 +254,22 @@ mod tests {
        ide_build::load(root, &root.join("cache"), None)
    }

+    /// Like [`fixture`], but the build script skips sources whose mtime did not advance,
+    /// mirroring Maven's (and the Kotlin plugin's) timestamp-incremental compilation.
+    fn fixture_timestamp_incremental(root: &Path) -> ide_build::BuildModel {
+        fs::write(
+            root.join("pom.xml"),
+            r#"<project><groupId>demo</groupId><artifactId>app</artifactId><version>1</version></project>"#,
+        )
+        .unwrap();
+        let script = root.join("mvnw");
+        fs::write(&script, "#!/bin/sh\necho build \"$@\" >> calls\nif [ -f src/main/kotlin/broken ]; then exit 1; fi\nmkdir -p target/classes\nif [ ! -f target/classes/Main.class ] || [ src/main/kotlin/Main.kt -nt target/classes/Main.class ]; then\ncp src/main/kotlin/Main.kt target/classes/Main.class\nfi\n").unwrap();
+        fs::set_permissions(&script, fs::Permissions::from_mode(0o755)).unwrap();
+        fs::create_dir_all(root.join("src/main/kotlin")).unwrap();
+        fs::write(root.join("src/main/kotlin/Main.kt"), "first").unwrap();
+        ide_build::load(root, &root.join("cache"), None)
+    }
+
    #[test]
    fn rebuild_bypasses_snapshots_and_error_continuation_retains_previous_classes() {
        let dir = tempfile::tempdir().unwrap();
@@ -357,6 +393,45 @@ mod tests {
        assert_eq!(fs::read_to_string(rebuilt.snapshot.join("0/Main.class")).unwrap(), "other");
    }

+    #[test]
+    fn restart_after_mtime_preserving_external_edit_actually_recompiles() {
+        // The content hash triggers a rebuild for a same-length, same-mtime external
+        // edit, but a timestamp-incremental builder (real Maven) would still compile
+        // nothing and the stale snapshot would be re-recorded as fresh. Dropping the
+        // session simulates the IDE restart from the report.
+        let dir = tempfile::tempdir().unwrap();
+        let root = dir.path();
+        let model = fixture_timestamp_incremental(root);
+        let cache = root.join("cache");
+        let cancel = CancellationToken::new();
+        let mut session = Session::new(cache.clone());
+        let first = session.build(root, &model, root, BuildOptions::default(), None, &cancel).unwrap();
+        assert_eq!(fs::read_to_string(first.snapshot.join("0/Main.class")).unwrap(), "first");
+        // Pin the old output's mtime so the `-nt` check below is deterministic even on
+        // coarse-granularity filesystems.
+        fs::File::options()
+            .write(true)
+            .open(root.join("target/classes/Main.class"))
+            .unwrap()
+            .set_modified(std::time::SystemTime::UNIX_EPOCH + std::time::Duration::from_secs(42))
+            .unwrap();
+        drop(session);
+
+        let source = root.join("src/main/kotlin/Main.kt");
+        let mtime = fs::metadata(&source).unwrap().modified().unwrap();
+        fs::write(&source, "other").unwrap(); // 5 bytes, same length as "first"
+        fs::File::options().write(true).open(&source).unwrap().set_modified(mtime).unwrap();
+
+        let mut session = Session::new(cache.clone());
+        let rebuilt = session.build(root, &model, root, BuildOptions::default(), None, &cancel).unwrap();
+        assert_ne!(rebuilt.snapshot, first.snapshot);
+        assert_eq!(
+            fs::read_to_string(rebuilt.snapshot.join("0/Main.class")).unwrap(),
+            "other",
+            "the re-stamped source must actually recompile instead of re-recording stale outputs"
+        );
+    }
+
    #[test]
    fn session_drop_removes_superseded_snapshots_and_preserves_records_across_reopen() {
        let dir = tempfile::tempdir().unwrap();
@@ -197,6 +197,7 @@ fn plugin_completion(item: ide_plugin::CompletionItem) -> CompletionItem {
    CompletionItem {
        label: item.label,
        label_detail: None,
+        label_description: None,
        detail: item.detail,
        kind,
        documentation: item.documentation.map(|value| Markup { kind: "markdown".into(), value }),
@@ -545,45 +546,85 @@ pub async fn lsp_virtual_document(host: &Host, window: &str, uri: String) -> Ide
    if uri.starts_with("git-revision:") {
        return crate::ops::vcs::revision_virtual_document(host, window, &uri).await;
    }
-    if uri.starts_with("openidea-target:") && uri.contains("/0/") {
-        host.require_trust(window)?;
-        let project = host.project(window)?;
-        let plugins =
-            host.plugin_host().ok_or_else(|| IdeError::unavailable("container document reader is unavailable"))?;
-        for registration in plugins.run_targets(&project.root) {
-            let prefix = format!(
-                "openidea-target://{}/0/",
-                percent_encoding::utf8_percent_encode(&registration.id, percent_encoding::NON_ALPHANUMERIC)
-            );
-            if let Some(suffix) = uri.strip_prefix(&prefix) {
-                let path = ide_core::path_mapping::file_path(&format!("file:///{suffix}"))
-                    .filter(|p| p.starts_with('/') && !p.split('/').any(|s| s == ".." || s == "."))
-                    .ok_or_else(|| IdeError::invalid("invalid container document URI"))?;
-                let container_root = registration
-                    .target
-                    .container_root
-                    .ok_or_else(|| IdeError::invalid("invalid container document URI"))?;
-                let target = ide_language::ServerTarget {
-                    id: registration.id,
-                    origin: None,
-                    project_root: project.root.clone(),
-                    mapping: ide_core::path_mapping::PathMapping::new(&project.root.to_string_lossy(), &container_root),
-                    container_root,
-                };
-                let title = std::path::Path::new(&path)
-                    .file_name()
-                    .map(|s| s.to_string_lossy().into_owned())
-                    .unwrap_or_default();
-                let language_id = host.languages.detect(std::path::Path::new(&path), None);
-                let text = host.blocking(move || super::lsp_target::read(&plugins, &target, &path)).await?;
-                return Ok(VirtualDocument { uri, text, title, language_id, description: None, decompiled: false });
-            }
-        }
-        return Err(IdeError::unavailable("plugin run target is no longer available"));
-    }
    host.project(window)?.lsp.virtual_document(&uri).await
 }

+/// Whether this class belongs to the project's Maven local repository.
+pub async fn lsp_can_download_sources(host: &Host, window: &str, uri: String) -> IdeResult<bool> {
+    let project = host.project(window)?;
+    if !project.is_trusted() {
+        return Ok(false);
+    }
+    let Some(jar) = ide_lsp::LspManager::library_archive(&uri) else { return Ok(false) };
+    host.blocking(move || {
+        let settings = project.settings.effective();
+        let repository = ide_sdk::apply::maven_local_repository(&project.root, &settings)
+            .or_else(ide_build::maven::default_local_repo);
+        Ok(repository.is_some_and(|repo| ide_build::maven::sources::artifact(&jar, &repo).is_some())
+            && ide_build::maven::has_projects(&project.root, &settings.languages.java.maven))
+    })
+    .await
+}
+
+/// Download with the project's Maven configuration, or attach an archive selected by the user.
+pub async fn lsp_library_sources(
+    host: &Host,
+    window: &str,
+    request: RequestId,
+    uri: String,
+    pos: Pos,
+    sources: Option<std::path::PathBuf>,
+) -> IdeResult<Option<Location>> {
+    host.require_trust(window)?;
+    let project = host.project(window)?;
+    let cancel = host.begin_project_request(window, request);
+    let result = async {
+        let sources = match sources {
+            Some(sources) => Some(sources),
+            None => {
+                let jar = ide_lsp::LspManager::library_archive(&uri)
+                    .ok_or_else(|| IdeError::invalid("not a library class"))?;
+                let project = project.clone();
+                let cancel = cancel.clone();
+                host.blocking(move || {
+                    let settings = project.settings.effective();
+                    let repository = ide_sdk::apply::maven_local_repository(&project.root, &settings)
+                        .or_else(ide_build::maven::default_local_repo)
+                        .ok_or_else(|| IdeError::unavailable("Maven local repository is unavailable"))?;
+                    let artifact = ide_build::maven::sources::artifact(&jar, &repository)
+                        .ok_or_else(|| IdeError::invalid("not an artifact in the Maven local repository"))?;
+                    let model = super::build::load(&project.root, &project.build_cache_dir(), &settings);
+                    let maven = model.maven.ok_or_else(|| IdeError::unavailable("no Maven project"))?;
+                    let owns = |p: &&ide_build::maven::MavenProject| {
+                        p.dependencies.iter().any(|d| d.group_id == artifact.group && d.artifact_id == artifact.name)
+                    };
+                    let mut owner = maven
+                        .projects
+                        .iter()
+                        .find(owns)
+                        .or_else(|| maven.projects.first())
+                        .cloned()
+                        .ok_or_else(|| IdeError::unavailable("no Maven project"))?;
+                    let profiles =
+                        settings.languages.java.maven.profiles(&ide_build::maven_profiles(&project.build_cache_dir()));
+                    if !profiles.is_empty() {
+                        owner.options.push(format!("-P{}", profiles.join(",")));
+                    }
+                    ide_build::maven::sources::download(&project.root, &owner, &artifact, &repository, &cancel)
+                })
+                .await?
+            }
+        };
+        match sources {
+            Some(sources) => project.lsp.library_source_location(&uri, sources, pos, &cancel).await,
+            None => Ok(None),
+        }
+    }
+    .await;
+    host.end_request(request);
+    result
+}
+
 /// Opens compiled classes through JDT, with project source taking priority on disk.
 pub async fn lsp_resolve_class_file(host: &Host, window: &str, path: std::path::PathBuf) -> IdeResult<String> {
    let archive = ide_vfs::split_archive_path(&path);
@@ -822,6 +863,8 @@ fn plugin_code_action(plugin: &str, root: &Path, a: ide_plugin::CodeAction) -> C
        .and_then(|r| serde_json::to_value(r).ok());
    CodeAction {
        title: a.title,
+        diagnostics: Vec::new(),
+        original_diagnostics: None,
        kind: a.kind,
        is_preferred: a.preferred,
        disabled_reason,
@@ -843,12 +886,13 @@ fn plugin_file_edits(
    use ide_plugin::FileOperation;
    let confine = !a.operations.is_empty() || a.open.is_some();
    let confined = |path: &Path| ide_plugin::resolve_new_in_root(root, &path.to_string_lossy());
+    let writable = |path: &Path| ide_plugin::resolve_writable_in_root(root, &path.to_string_lossy());
    let mut files = Vec::new();
    let mut created_with_text = Vec::new();
    for operation in &a.operations {
        match operation {
            FileOperation::Create { path, text, overwrite } => {
-                let path = confined(path)?;
+                let path = writable(path)?;
                files.push(FileEdit::Create { path: path.clone().into(), overwrite: *overwrite });
                if !text.is_empty() {
                    let start = Range::point(Pos::new(0, 0));
@@ -869,7 +913,7 @@ fn plugin_file_edits(
        }
    }
    for (path, edits) in &a.edits {
-        let path = if confine { confined(path)? } else { path.clone() };
+        let path = if confine { writable(path)? } else { path.clone() };
        if created_with_text.contains(&path) {
            return Err("put the text of a created file in its `create`, not in an edit".into());
        }
@@ -1399,6 +1443,28 @@ pub async fn lsp_restart(host: &Host, window: &str, server: ServerId) -> IdeResu
    Ok(())
 }

+/// Restarts the language servers named `name` in every open project, so a tool installed or
+/// updated from one window is what all of them run (not only that window's project).
+pub async fn lsp_restart_named(host: &Host, name: &str) -> IdeResult<()> {
+    for project in host.projects() {
+        let ids: Vec<ServerId> = project.lsp.servers().into_iter().filter(|s| s.name == name).map(|s| s.id).collect();
+        if ids.is_empty() {
+            continue;
+        }
+        for id in ids {
+            if let Err(e) = project.lsp.restart(id).await {
+                tracing::warn!(server = name, root = %project.root.display(), "restart after a tool update: {e}");
+            }
+        }
+        if name == "jdtls"
+            && let Some(bridge) = &project.kotlin_bridge
+        {
+            bridge.schedule();
+        }
+    }
+    Ok(())
+}
+
 /// Applies a (previewed) workspace edit, e.g. after rename confirmation.
 pub async fn apply_workspace_edit(host: &Host, window: &str, edit: WorkspaceEdit) -> IdeResult<()> {
    let project = host.project(window)?;
@@ -1646,6 +1712,14 @@ pub(crate) fn register(d: &mut Dispatcher) {
        |c| async move { lsp_resolve_class_file(&c.host, &c.window, c.arg("path")?).await },
    );
    d.add("lsp_virtual_document", |c| async move { lsp_virtual_document(&c.host, &c.window, c.arg("uri")?).await });
+    d.add(
+        "lsp_can_download_sources",
+        |c| async move { lsp_can_download_sources(&c.host, &c.window, c.arg("uri")?).await },
+    );
+    d.add("lsp_library_sources", |c| async move {
+        lsp_library_sources(&c.host, &c.window, c.arg("request")?, c.arg("uri")?, c.arg("pos")?, c.arg("sources")?)
+            .await
+    });
    d.add("lsp_references", |c| async move {
        let on_partial = c.sender("onPartial")?;
        lsp_references(
@@ -2141,6 +2215,55 @@ mod tests {
        assert!(without_generated_helpers(Vec::new()).is_empty());
    }

+    #[cfg(unix)]
+    #[test]
+    fn plugins_file_actions_confine_content_writes_and_preserve_link_entries() {
+        use ide_core::FileEdit;
+        use ide_plugin::{CodeAction, FileOperation};
+        let tmp = tempfile::tempdir().unwrap();
+        let root = tmp.path().join("proj");
+        std::fs::create_dir(&root).unwrap();
+        let root = dunce::canonicalize(root).unwrap();
+        let outside = tmp.path().join("outside.txt");
+        std::fs::write(&outside, "unchanged").unwrap();
+        std::fs::write(root.join("target.txt"), "inside").unwrap();
+        for (name, target) in [
+            ("outside", outside.clone()),
+            ("dangling", tmp.path().join("missing.txt")),
+            ("inside", root.join("target.txt")),
+        ] {
+            std::os::unix::fs::symlink(target, root.join(name)).unwrap();
+        }
+        let action = |operations, edits| CodeAction {
+            title: "Update files".into(),
+            kind: None,
+            preferred: false,
+            edits,
+            operations,
+            open: Some(root.join("target.txt")),
+            data: None,
+            file_action: true,
+        };
+        for name in ["outside", "dangling"] {
+            let create = FileOperation::Create { path: root.join(name), text: "text".into(), overwrite: true };
+            assert!(plugin_file_edits(&root, &action(vec![create], Vec::new())).is_err());
+            let edits = vec![(root.join(name), vec![TextEdit { range: Range::default(), new_text: "text".into() }])];
+            assert!(plugin_file_edits(&root, &action(Vec::new(), edits)).is_err());
+        }
+        let create = FileOperation::Create { path: root.join("inside"), text: "text".into(), overwrite: true };
+        let (files, _) = plugin_file_edits(&root, &action(vec![create], Vec::new())).unwrap();
+        assert!(matches!(&files[0], FileEdit::Create { path, .. } if **path == root.join("target.txt")));
+        let operations = vec![
+            FileOperation::Rename { from: root.join("outside"), to: root.join("dangling") },
+            FileOperation::Delete { path: root.join("outside") },
+        ];
+        let (files, _) = plugin_file_edits(&root, &action(operations, Vec::new())).unwrap();
+        assert!(matches!(&files[0], FileEdit::Rename { from, to }
+            if **from == root.join("outside") && **to == root.join("dangling")));
+        assert!(matches!(&files[1], FileEdit::Delete { path, .. } if **path == root.join("outside")));
+        assert_eq!(std::fs::read_to_string(outside).unwrap(), "unchanged");
+    }
+
    #[test]
    fn a_plugin_action_maps_its_file_operations_before_its_edits_and_stays_in_the_project() {
        use ide_core::FileEdit;
@@ -1,120 +0,0 @@
-//! Project language-server targets, shared by desktop and openidea-server.
-use crate::plugins::PluginHost;
-use ide_core::{IdeError, IdeResult};
-use ide_language::{LanguageServerConfig, ServerTarget};
-use std::path::Path;
-
-pub(crate) fn configure(
-    plugins: &PluginHost,
-    root: &Path,
-    id: &str,
-    cfg: &mut LanguageServerConfig,
-) -> IdeResult<bool> {
-    let Some(registration) = plugins.run_targets(root).into_iter().find(|t| t.id == id) else { return Ok(false) };
-    let container_root = registration.target.container_root.clone().unwrap_or_default();
-    cfg.target = Some(ServerTarget {
-        id: id.into(),
-        origin: None,
-        project_root: root.into(),
-        container_root: container_root.clone(),
-        mapping: ide_core::path_mapping::PathMapping::new(&root.to_string_lossy(), &container_root),
-    });
-    if container_root.is_empty() {
-        return Err(IdeError::invalid("language server targets require a container root"));
-    }
-    let run = command(&cfg.command, cfg.args.clone());
-    let wrapped = plugins.prepare_run_target(root, id, &run)?;
-    cfg.command = wrapped.command;
-    cfg.args = wrapped.args;
-    cfg.connect = None;
-    cfg.pinned = Some(ide_language::ProgramPin::approve(&cfg.command)?);
-    Ok(true)
-}
-
-fn command(command: &str, args: Vec<String>) -> ide_run::RunConfig {
-    serde_json::from_value(serde_json::json!({
-        "id":"language-server", "name":"Language server", "kind":"shell",
-        "command":command, "args":args, "cwd":".", "env":{}, "detected":false, "isTest":false
-    }))
-    .expect("valid internal run configuration")
-}
-
-pub(crate) fn read(plugins: &PluginHost, target: &ServerTarget, path: &str) -> IdeResult<String> {
-    let registration = plugins
-        .run_targets(&target.project_root)
-        .into_iter()
-        .find(|t| t.id == target.id)
-        .ok_or_else(|| IdeError::unavailable("plugin run target is no longer available"))?;
-    if registration.target.container_root.as_deref() != Some(&target.container_root) {
-        return Err(IdeError::unavailable("plugin run target changed; navigate again"));
-    }
-    let mut wrapped = plugins.prepare_run_target(&target.project_root, &target.id, &command("cat", Vec::new()))?;
-    wrapped.args.extend(["--".into(), path.into()]);
-    capture(&wrapped, &target.project_root)
-}
-
-/// Bounds both output and time, and always kills/reaps the wrapper on failure.
-fn capture(run: &ide_run::RunConfig, root: &Path) -> IdeResult<String> {
-    use std::io::Read;
-    use std::process::{Command, Stdio};
-    use std::sync::{
-        Arc,
-        atomic::{AtomicBool, Ordering},
-    };
-    const LIMIT: u64 = 4 * 1024 * 1024;
-    let mut cmd = Command::new(&run.command);
-    ide_core::process::prepare(&mut cmd);
-    ide_core::process::own_group(&mut cmd);
-    let mut child = cmd
-        .args(&run.args)
-        .current_dir(root)
-        .envs(ide_core::process::shell_env())
-        .stdin(Stdio::null())
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped())
-        .spawn()?;
-    let stdout = child.stdout.take().expect("piped stdout");
-    let stderr = child.stderr.take().expect("piped stderr");
-    let overflow = Arc::new(AtomicBool::new(false));
-    let large = overflow.clone();
-    let output = std::thread::spawn(move || {
-        let mut bytes = Vec::new();
-        let result = stdout.take(LIMIT + 1).read_to_end(&mut bytes);
-        large.store(bytes.len() as u64 > LIMIT, Ordering::Release);
-        result.map(|_| bytes)
-    });
-    let errors = std::thread::spawn(move || {
-        let mut stderr = stderr;
-        let mut bytes = Vec::new();
-        let _ = (&mut stderr).take(65536).read_to_end(&mut bytes);
-        let _ = std::io::copy(&mut stderr, &mut std::io::sink());
-        bytes
-    });
-    let deadline = std::time::Instant::now() + std::time::Duration::from_secs(10);
-    let status = loop {
-        if output.is_finished()
-            && errors.is_finished()
-            && let Ok(Some(status)) = child.try_wait()
-        {
-            break Ok(status);
-        }
-        match (std::time::Instant::now() < deadline, overflow.load(Ordering::Acquire)) {
-            (true, false) => std::thread::sleep(std::time::Duration::from_millis(10)),
-            _ => {
-                ide_core::process::kill_tree_of(child.id());
-                let _ = child.kill();
-                let _ = child.wait();
-                break Err(IdeError::unavailable("container document exceeds the size or time limit"));
-            }
-        }
-    };
-    let bytes = output.join().map_err(|_| IdeError::unavailable("container document reader failed"))??;
-    let stderr = errors.join().unwrap_or_default();
-    if !status?.success() {
-        return Err(IdeError::unavailable(format!("container document: {}", String::from_utf8_lossy(&stderr))));
-    }
-    if bytes.len() as u64 > LIMIT {
-        return Err(IdeError::invalid("container document exceeds 4 MiB"));
-    }
-    String::from_utf8(bytes).map_err(|_| IdeError::invalid("container document is not UTF-8 text"))
-}
@@ -98,5 +98,3 @@ impl Host {
        self.runtime.spawn_blocking(f).await.map_err(|e| IdeError::internal(e.to_string()))?
    }
 }
-
-pub(crate) mod lsp_target;
@@ -8,7 +8,7 @@ use ide_language::{FileReference, WebReference};
 use ide_workspace::file_refs::{self, PathCompletion};
 use serde::{Deserialize, Serialize};
 use specta::Type;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};

 /// A web reference no language server resolves and where it points: `class="card"` →
 /// `.card` selectors, `id` → `#id` selectors, `href="#top"` → the element, `var(--x)` →
@@ -41,6 +41,11 @@ pub fn find_files(host: &Host, window: &str, query: String, limit: u32) -> IdeRe
    Ok(host.project(window)?.index.find_files(&query, limit as usize))
 }

+pub async fn find_files_named(host: &Host, window: &str, name: String) -> IdeResult<Vec<IpcPath>> {
+    let project = host.project(window)?;
+    blocking(move || Ok(project.index.files_named(&name).into_iter().map(Into::into).collect())).await
+}
+
 pub fn find_dirs(host: &Host, window: &str, query: String, limit: u32) -> IdeResult<Vec<FileMatch>> {
    Ok(host.project(window)?.index.find_dirs(&query, limit as usize))
 }
@@ -107,6 +112,68 @@ pub async fn web_goto(host: &Host, window: &str, doc: DocId, pos: Pos) -> IdeRes
    .await
 }

+/// The file a Python import path names: `a.b.c` is `a/b/c.py(i)` or `a/b/c/__init__.py(i)`
+/// in the project or one of its content roots (an attached dependency project included);
+/// `.x` names it relative to `from`'s directory. Neither the language server (it analyses a
+/// single root) nor the definition index resolves a package segment, so ⌘B on the `a.b` of
+/// `from a.b import x` needs this.
+pub async fn nav_resolve_module(host: &Host, window: &str, name: String, from: IpcPath) -> IdeResult<Option<IpcPath>> {
+    let project = host.project(window)?;
+    blocking(move || {
+        let dots = name.len() - name.trim_start_matches('.').len();
+        let parts: Vec<&str> = name.split('.').filter(|s| !s.is_empty()).collect();
+        if parts.is_empty() {
+            return Ok(None);
+        }
+        let rel = parts.iter().collect::<PathBuf>();
+        let bases: Vec<PathBuf> = if dots > 0 {
+            let dir = PathBuf::from(from);
+            let dir = dir.parent().map(Path::to_path_buf).unwrap_or(dir);
+            let base = (0..dots.saturating_sub(1)).fold(dir, |p, _| p.parent().map(Path::to_path_buf).unwrap_or(p));
+            vec![base]
+        } else {
+            crate::project::navigation_roots(&project, &from)
+        };
+        for base in bases {
+            let dir = base.join(&rel);
+            for candidate in
+                [dir.with_extension("py"), dir.with_extension("pyi"), dir.join("__init__.py"), dir.join("__init__.pyi")]
+            {
+                if candidate.is_file() {
+                    return Ok(Some(IpcPath::from(candidate)));
+                }
+            }
+        }
+        Ok(None)
+    })
+    .await
+}
+
+/// Index definitions named `name` in the other roots `from` may navigate into (its configured
+/// dependencies and extra content roots — see `navigation_roots`): the cross-root answer when
+/// the language server cannot resolve an import into an attached dependency project. `from`'s
+/// own root is left out: the server sees it, so a name it could not resolve there is not
+/// answered by every declaration that happens to share it (any `save` for `repo.save()`).
+pub async fn nav_index_definitions(
+    host: &Host,
+    window: &str,
+    name: String,
+    from: IpcPath,
+) -> IdeResult<Vec<SymbolMatch>> {
+    let project = host.project(window)?;
+    blocking(move || {
+        let roots = crate::project::navigation_roots(&project, &from);
+        let Some((_own, roots)) = roots.split_first() else { return Ok(Vec::new()) };
+        if roots.is_empty() {
+            return Ok(Vec::new());
+        }
+        // Filter inside the index: a cap applied before the root filter can fill with
+        // own-root matches and evict the dependency roots entirely.
+        Ok(project.index.symbols_named_within(&name, None, roots, 500))
+    })
+    .await
+}
+
 /// The existing file or directory a path written in `from` names (`href`, `url()`, a string literal).
 pub async fn fs_resolve_reference(
    host: &Host,
@@ -167,6 +234,7 @@ pub(crate) fn register(d: &mut Dispatcher) {
    d.add("index_status", |c| async move { index_status(&c.host, &c.window) });
    d.add("index_file_extensions", |c| async move { index_file_extensions(&c.host, &c.window) });
    d.add("find_files", |c| async move { find_files(&c.host, &c.window, c.arg("query")?, c.arg("limit")?) });
+    d.add("find_files_named", |c| async move { find_files_named(&c.host, &c.window, c.arg("name")?).await });
    d.add("find_dirs", |c| async move { find_dirs(&c.host, &c.window, c.arg("query")?, c.arg("limit")?) });
    d.add("find_symbols", |c| async move {
        find_symbols(&c.host, &c.window, c.arg("query")?, c.arg("filter")?, c.arg("limit")?)
@@ -175,6 +243,12 @@ pub(crate) fn register(d: &mut Dispatcher) {
    d.add("remove_recent", |c| async move { remove_recent(&c.host, &c.window, c.arg("path")?) });
    d.add("recent_files", |c| async move { recent_files(&c.host, &c.window) });
    d.add("web_goto", |c| async move { web_goto(&c.host, &c.window, c.arg("doc")?, c.arg("pos")?).await });
+    d.add("nav_resolve_module", |c| async move {
+        nav_resolve_module(&c.host, &c.window, c.arg("name")?, c.arg("from")?).await
+    });
+    d.add("nav_index_definitions", |c| async move {
+        nav_index_definitions(&c.host, &c.window, c.arg("name")?, c.arg("from")?).await
+    });
    d.add("fs_resolve_reference", |c| async move {
        fs_resolve_reference(&c.host, &c.window, c.arg("from")?, c.arg("value")?).await
    });
@@ -13,6 +13,8 @@ pub struct ProjectInfo {
    pub trusted: bool,
    pub root: ide_core::IpcPath,
    pub name: String,
+    #[serde(default)]
+    pub display_name: String,
    pub is_git: bool,
    pub settings: Settings,
    #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -24,17 +26,23 @@ pub struct ProjectInfo {
 pub fn info(project: &Project) -> ProjectInfo {
    let settings = project.settings.effective();
    let custom = settings.general.project_name.trim();
+    let primary = if custom.is_empty() {
+        project.root.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default()
+    } else {
+        custom.to_owned()
+    };
+    let workspace = ide_workspace::workspace::Workspace::load(&project.root).ok().flatten();
    ProjectInfo {
        trusted: project.is_trusted(),
-        name: if custom.is_empty() {
-            project.root.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default()
-        } else {
-            custom.to_owned()
-        },
+        display_name: workspace
+            .as_ref()
+            .map(|w| w.display_name(&project.root, &primary))
+            .unwrap_or_else(|| primary.clone()),
+        name: workspace.as_ref().filter(|w| w.is_container(&project.root)).map(|w| w.name.clone()).unwrap_or(primary),
        is_git: !project.repos.read().is_empty(),
        settings,
        root: project.root.clone().into(),
-        workspace: ide_workspace::workspace::Workspace::load(&project.root).ok().flatten(),
+        workspace,
        unity: ide_workspace::unity::detect(&project.root),
    }
 }
@@ -63,38 +71,71 @@ pub fn roots(host: &Host, window: &str) -> IdeResult<ide_workspace::ProjectRoots

 pub fn save_workspace(host: &Host, window: &str, name: &str, paths: Vec<std::path::PathBuf>) -> IdeResult<ProjectInfo> {
    let project = host.project(window)?;
-    ide_workspace::workspace::Workspace::save(&project.root, name, paths, false)?;
+    let previous = ide_workspace::workspace::Workspace::load(&project.root)?
+        .ok_or_else(|| ide_core::IdeError::invalid("This folder is not a workspace"))?;
+    for path in paths.iter().filter(|p| !previous.projects.contains(p)) {
+        require_attachment_trust(host, path)?;
+    }
+    if !previous.is_container(&project.root) && paths.first() != Some(&project.root) {
+        return Err(ide_core::IdeError::invalid("The primary project cannot be detached"));
+    }
+    if !previous.is_container(&project.root) && paths == [project.root.clone()] {
+        std::fs::remove_file(project.root.join(ide_workspace::workspace::FILE))?;
+    } else {
+        let workspace = ide_workspace::workspace::Workspace::save(&project.root, name, paths, false)?;
+        keep_attachment_private(&project.root, &workspace)?;
+    }
+    refresh_workspace(&project);
+    Ok(info(&project))
+}
+
+fn require_attachment_trust(host: &Host, path: &Path) -> IdeResult<()> {
+    if !host.trust.trusted(path)? {
+        return Err(ide_core::IdeError::invalid("Trust the project before attaching it"));
+    }
+    Ok(())
+}
+
+fn keep_attachment_private(root: &Path, workspace: &ide_workspace::workspace::Workspace) -> IdeResult<()> {
+    if !workspace.is_container(root) {
+        ide_vcs::changelists::ensure_ignored(&root.join(".openidea"), &["/workspace.json"])?;
+    }
+    Ok(())
+}
+
+fn refresh_workspace(project: &Project) {
    project.settings.reload();
    project.refresh_index_scope();
    project.refresh_repositories();
    project.sink.emit(ide_core::IdeEvent::ProjectRootsChanged { root: project.root.clone().into() });
-    Ok(info(&project))
 }

-/// Links a folder, or prepares an automatic workspace for the caller to open in place.
+/// Attaches a trusted folder without replacing the current project.
 pub fn attach_workspace(host: &Host, window: &str, path: &Path) -> IdeResult<ide_core::IpcPath> {
    let project = host.project(window)?;
    let path = dunce::canonicalize(path)?;
    if project.light {
        return Err(ide_core::IdeError::invalid("Open a project before attaching a folder"));
    }
+    if path == project.root {
+        return Ok(project.root.clone().into());
+    }
+    require_attachment_trust(host, &path)?;
    if let Some(mut workspace) = ide_workspace::workspace::Workspace::load(&project.root)? {
        if !workspace.projects.contains(&path) {
            workspace.projects.push(path);
            save_workspace(host, window, &workspace.name, workspace.projects)?;
        }
-        return Ok(project.root.clone().into());
+    } else {
+        let workspace = ide_workspace::workspace::Workspace::attach(
+            &project.root,
+            &info(&project).name,
+            vec![project.root.clone(), path],
+        )?;
+        keep_attachment_private(&project.root, &workspace)?;
+        refresh_workspace(&project);
    }
-    if path == project.root {
-        return Ok(project.root.clone().into());
-    }
-    Ok(ide_workspace::workspace::Workspace::create_for_project(
-        &host.data_dir,
-        &project.root,
-        &info(&project).name,
-        &path,
-    )?
-    .into())
+    Ok(project.root.clone().into())
 }

 /// What [`set_settings`] changed; the caller tells the windows.
@@ -180,8 +221,11 @@ pub fn set_settings(
        || key == "editor.codeStyle"
        || key.starts_with("editor.codeStyle.")
        || key == "inspections"
-        || key.starts_with("inspections.");
-    let toolchain = ["languages", "tools", "languageServers", "languageServerTargets", "projectStructure"]
+        || key.starts_with("inspections.")
+        || key == "files"
+        || key == "files.composeFileOverrides"
+        || key.starts_with("files.composeFileOverrides.");
+    let toolchain = ["languages", "tools", "languageServers", "projectStructure"]
        .iter()
        .any(|k| key == *k || key.starts_with(&format!("{k}.")));
    // Code style only reaches servers as settings (e.g. jdtls' formatter profile); builds don't depend on it.
@@ -24,7 +24,7 @@ pub(super) fn project_configs(
    let root_suppressed = ide_run::load_suppressed_config_ids(root)?;
    let mut all = detected_and_saved(root, settings, &user, &root_suppressed);
    if let Some(workspace) = ide_workspace::workspace::Workspace::load(root)? {
-        for member in workspace.projects.into_iter().filter(|p| p.is_dir()) {
+        for member in workspace.projects.into_iter().filter(|p| p != root && p.is_dir()) {
            let settings = ide_workspace::SettingsStore::load(config_dir, Some(&member)).effective();
            let saved = ide_run::load_user_configs(&member)?;
            let suppressed = ide_run::load_suppressed_config_ids(&member)?;
@@ -145,20 +145,21 @@ fn settings_for(
    config: &mut RunConfig,
 ) -> IdeResult<(std::path::PathBuf, ide_core::settings::Settings)> {
    let workspace = ide_workspace::workspace::Workspace::load(&project.root)?;
-    if workspace.is_some() {
+    let owner = ide_run::scope::owner(&project.root, config);
+    let member = workspace.as_ref().and_then(|workspace| {
+        workspace
+            .projects
+            .iter()
+            .filter(|root| **root != project.root && owner.starts_with(root))
+            .max_by_key(|root| root.components().count())
+            .cloned()
+    });
+    if workspace.as_ref().is_some_and(|w| w.is_container(&project.root)) || member.is_some() {
        if config.extras.module.is_none() && !matches!(config.kind.as_str(), "application" | "spring-boot") {
            config.extras.module = config.cwd.as_deref().map(ide_core::ipc_path::to_ipc);
        }
        ide_run::scope::rebase(config, &project.root, None);
    }
-    let member = workspace.and_then(|workspace| {
-        let owner = ide_run::scope::owner(&project.root, config);
-        workspace
-            .projects
-            .into_iter()
-            .filter(|root| owner.starts_with(root))
-            .max_by_key(|root| root.components().count())
-    });
    Ok(match member {
        Some(root) => {
            let settings = ide_workspace::SettingsStore::load(&host.config_dir, Some(&root)).effective();
@@ -202,8 +203,22 @@ pub fn apply_settings(host: &Host, window: &str, configs: Vec<RunConfig>) -> Ide
 }

 pub async fn start(host: &Host, window: &str, config: RunConfig, on_output: Emit<OutputChunk>) -> IdeResult<RunInfo> {
+    start_request(host, window, config, on_output, None).await
+}
+
+pub async fn start_request(
+    host: &Host,
+    window: &str,
+    config: RunConfig,
+    on_output: Emit<OutputChunk>,
+    request: Option<ide_core::RequestId>,
+) -> IdeResult<RunInfo> {
+    let cancel = request.map(|id| host.begin_request(id)).unwrap_or_default();
    let operation = config.extras.params.get("plugin.operation").cloned();
-    let result = start_inner(host, window, config, on_output).await;
+    let result = start_inner(host, window, config, on_output, &cancel).await;
+    if let Some(id) = request {
+        host.end_request(id);
+    }
    if let (Ok(info), Some(operation), Some(plugins)) = (&result, operation, host.plugin_host()) {
        plugins.run_operation_started(window, &operation, info.id);
    }
@@ -215,7 +230,11 @@ async fn start_inner(
    window: &str,
    mut config: RunConfig,
    on_output: Emit<OutputChunk>,
+    cancel: &ide_core::CancellationToken,
 ) -> IdeResult<RunInfo> {
+    if cancel.is_cancelled() {
+        return Err(IdeError::cancelled());
+    }
    host.require_trust(window)?;
    let project = host.project(window)?;
    if config.extras.target.is_none() {
@@ -258,7 +277,20 @@ async fn start_inner(
                host.plugin_host().ok_or_else(|| IdeError::not_found("plugin run target is no longer available"))?;
            let root = project.root.clone();
            let id = id.to_owned();
-            let config = host.blocking(move || plugins.prepare_run_target(&root, &id, &config)).await?;
+            let token = cancel.clone();
+            let config = host
+                .blocking(move || {
+                    let operation = if config.is_test {
+                        ide_plugin::RunTargetOperation::Test
+                    } else {
+                        ide_plugin::RunTargetOperation::Run
+                    };
+                    plugins.prepare_run_target_launch(&root, &id, &config, operation, &token)
+                })
+                .await?;
+            if cancel.is_cancelled() {
+                return Err(IdeError::cancelled());
+            }
            project.require_trust()?;
            return host.processes.start(
                &project.root,
@@ -305,7 +337,7 @@ async fn start_inner(
    // what makes the setting take effect without reopening the project.
    if config.kind == "maven" {
        ide_sdk::apply::prepare_maven_run(&mut config, root, &settings);
-    } else if matches!(config.kind.as_str(), "gradle" | "tomcat") {
+    } else if matches!(config.kind.as_str(), "gradle" | "tomcat" | "junit") {
        ide_sdk::apply::apply_to_run_configs(std::slice::from_mut(&mut config), root, &settings);
    } else {
        ide_sdk::apply::resolve_run_command(&mut config, root, &settings);
@@ -130,6 +130,17 @@ pub fn run_system_env(_host: &Host, _window: &str) -> std::collections::BTreeMap
    ide_run::system_env()
 }

+/// Variables of the `.env` files a debug launch names, in order (later files win):
+/// the same files a run loads, over the system environment debug adapters inherit.
+pub fn run_env_files(
+    _host: &Host,
+    _window: &str,
+    files: Vec<std::path::PathBuf>,
+) -> IdeResult<std::collections::BTreeMap<String, String>> {
+    ide_run::envfile::load(&files, &ide_run::system_env())
+        .map_err(|e| IdeError::not_found(format!("cannot read .env file: {e}")))
+}
+
 /// Writes the Gradle init script that adds `jvm_args` to the JVMs the build forks
 /// (`bootRun`, `run`, tests) and returns its path, for `--init-script`.
 pub async fn run_gradle_jvm_args_script(_host: &Host, _window: &str, jvm_args: Vec<String>) -> IdeResult<String> {
@@ -332,6 +343,7 @@ pub(crate) fn register(d: &mut Dispatcher) {
        run_import_configs(&c.host, &c.window, c.arg("source")?, c.arg("existing")?)
    });
    d.add("run_system_env", |c| async move { Ok(run_system_env(&c.host, &c.window)) });
+    d.add("run_env_files", |c| async move { run_env_files(&c.host, &c.window, c.arg("files")?) });
    d.add("run_gradle_jvm_args_script", |c| async move {
        run_gradle_jvm_args_script(&c.host, &c.window, c.arg("jvmArgs")?).await
    });
@@ -61,7 +61,7 @@ pub(crate) fn search_project(
        ide_search::SearchScope::FileSet { set } => Some(set),
        _ => None,
    };
-    let workspace = ide_workspace::workspace::Workspace::load(root)?.is_some();
+    let workspace = ide_workspace::workspace::Workspace::load(root)?.is_some_and(|w| w.is_container(root));
    let include_root = !workspace
        || matches!(query.scope, ide_search::SearchScope::Directory { .. } | ide_search::SearchScope::Files { .. });
    let content_roots = match query.scope {
@@ -24,8 +24,10 @@ fn tools(host: &Host, window: &str) -> IdeResult<Tools> {
        .collect();
    // Godot is usually an app bundle / Flatpak outside the search path.
    let found = ide_sdk::godot::find(None).map(|p| (ide_sdk::godot::COMMAND.to_owned(), p));
+    let runtime = ide_sdk::apply::tool_install_environment(&root, &settings);
    let work_dir = (!root.as_os_str().is_empty()).then_some(root);
    Ok(Tools::new(&data)
+        .with_runtime(runtime.commands, runtime.env)
        .with_custom_paths(custom)
        .with_found_paths(found.into_iter().collect())
        .with_work_dir(work_dir))
@@ -25,7 +25,12 @@ pub async fn status(host: &Host, window: &str) -> IdeResult<Vec<FileStatus>> {
 mod commands;
 pub use commands::*;

-fn check_worktree_removal(project_root: &std::path::Path, path: &std::path::Path) -> IdeResult<()> {
+/// Refuses (with `refusal`) to remove or move the worktree that holds the open project.
+fn check_worktree_away_from_project(
+    project_root: &std::path::Path,
+    path: &std::path::Path,
+    refusal: &str,
+) -> IdeResult<()> {
    fn canonical_path(path: &std::path::Path) -> std::io::Result<std::path::PathBuf> {
        let mut existing = path.to_path_buf();
        let mut tail = Vec::new();
@@ -54,7 +59,7 @@ fn check_worktree_removal(project_root: &std::path::Path, path: &std::path::Path
    }

    if canonical_path(project_root)?.starts_with(canonical_path(path)?) {
-        return Err(ide_core::IdeError::invalid("Cannot remove a worktree containing the open project."));
+        return Err(ide_core::IdeError::invalid(refusal));
    }
    Ok(())
 }
@@ -426,7 +426,8 @@ pub async fn vcs_log_details_batch(
    let cancel = host.begin_project_read_request(window, request);
    let result = blocking(move || {
        project.with_log_repo_at(repo.as_deref(), |r| {
-            revisions.iter().map(|id| r.log_details_cancellable(id, &cancel)).collect()
+            r.enable_log_index(&project.cache);
+            r.log_details_batch_cancellable(&revisions, &cancel)
        })
    })
    .await;
@@ -673,10 +674,11 @@ pub async fn vcs_rename_branch(
    repo: Option<PathBuf>,
    from: String,
    to: String,
+    unset_upstream: bool,
 ) -> IdeResult<()> {
    host.require_trust(window)?;
    let project = host.project(window)?;
-    blocking(move || project.with_repo_at(repo.as_deref(), |r| r.rename_branch(&from, &to))).await
+    blocking(move || project.with_repo_at(repo.as_deref(), |r| r.rename_branch(&from, &to, unset_upstream))).await
 }

 pub async fn vcs_merge(host: &Host, window: &str, repo: Option<PathBuf>, branch: String) -> IdeResult<()> {
@@ -995,7 +997,17 @@ pub async fn vcs_rebase_with(

 pub async fn vcs_remotes(host: &Host, window: &str, repo: Option<PathBuf>) -> IdeResult<Vec<Remote>> {
    let project = LogAccess::new(host, window, repo.as_deref());
-    blocking(move || project.with_log_repo_at(repo.as_deref(), |r| r.remotes())).await
+    blocking(move || {
+        let mut remotes = project.with_log_repo_at(repo.as_deref(), |r| r.remotes())?;
+        for r in &mut remotes {
+            let resolved = ide_ssh::resolve_ssh_remote_url(&r.url);
+            if resolved != r.url {
+                r.resolved_url = Some(resolved);
+            }
+        }
+        Ok(remotes)
+    })
+    .await
 }

 pub async fn vcs_edit_remote(host: &Host, window: &str, repo: Option<PathBuf>, edit: RemoteEdit) -> IdeResult<()> {
@@ -1046,7 +1058,11 @@ pub async fn vcs_remove_worktree(
        } else {
            project.with_repo_at(repo.as_deref(), |r| Ok(r.root().join(&path)))?
        };
-        check_worktree_removal(&project.root, &path)?;
+        check_worktree_away_from_project(
+            &project.root,
+            &path,
+            "Cannot remove a worktree containing the open project.",
+        )?;
        let result = project.with_repo_at(repo.as_deref(), |r| r.remove_worktree(&path, force));
        project.refresh_repositories();
        result
@@ -1054,6 +1070,25 @@ pub async fn vcs_remove_worktree(
    .await
 }

+/// Move Worktree…: moves the linked worktree at `path` to `to`.
+pub async fn vcs_move_worktree(
+    host: &Host,
+    window: &str,
+    repo: Option<PathBuf>,
+    path: PathBuf,
+    to: PathBuf,
+) -> IdeResult<()> {
+    host.require_trust(window)?;
+    let project = host.project(window)?;
+    blocking(move || {
+        check_worktree_away_from_project(&project.root, &path, "Cannot move a worktree containing the open project.")?;
+        let result = project.with_repo_at(repo.as_deref(), |r| r.move_worktree(&path, &to));
+        project.refresh_repositories();
+        result
+    })
+    .await
+}
+
 pub async fn vcs_compare_scope(host: &Host, window: &str, paths: Vec<PathBuf>) -> IdeResult<CompareScope> {
    let project = host.project(window)?;
    blocking(move || Ok(project.repos().compare_scope(&paths))).await
@@ -1379,7 +1414,8 @@ pub(crate) fn register(d: &mut Dispatcher) {
        vcs_restore_branch(&c.host, &c.window, c.arg("repo")?, c.arg("deleted")?).await
    });
    d.add("vcs_rename_branch", |c| async move {
-        vcs_rename_branch(&c.host, &c.window, c.arg("repo")?, c.arg("from")?, c.arg("to")?).await
+        vcs_rename_branch(&c.host, &c.window, c.arg("repo")?, c.arg("from")?, c.arg("to")?, c.arg("unset_upstream")?)
+            .await
    });
    d.add("vcs_merge", |c| async move { vcs_merge(&c.host, &c.window, c.arg("repo")?, c.arg("branch")?).await });
    d.add("vcs_rebase", |c| async move { vcs_rebase(&c.host, &c.window, c.arg("repo")?, c.arg("onto")?).await });
@@ -1474,6 +1510,9 @@ pub(crate) fn register(d: &mut Dispatcher) {
        vcs_add_worktree(&c.host, &c.window, c.arg("repo")?, c.arg("path")?, c.arg("commitish")?, c.arg("newBranch")?)
            .await
    });
+    d.add("vcs_move_worktree", |c| async move {
+        vcs_move_worktree(&c.host, &c.window, c.arg("repo")?, c.arg("path")?, c.arg("to")?).await
+    });
    d.add("vcs_remove_worktree", |c| async move {
        vcs_remove_worktree(&c.host, &c.window, c.arg("repo")?, c.arg("path")?, c.arg("force")?).await
    });
@@ -6,6 +6,7 @@ use ide_core::ipc_path::to_ipc;
 use ide_core::{CancellationToken, TextEdit};
 use ide_extension::Capability;
 use ide_extension::Package;
+use ide_extension::ledger::{Ledger, Subject};
 use ide_language::ProgramPin;
 use ide_plugin::{
    CommitChange, CommitDraft, EventKind, HostApi, HostError, HttpRequest, HttpResponse, NotificationLevel,
@@ -17,7 +18,7 @@ use std::io::Read;
 use std::path::{Path, PathBuf};
 use std::process::{Child, ChildStdin, Command as StdCommand, Stdio};
 use std::sync::Arc;
-use std::sync::atomic::{AtomicU64, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 use std::time::{Duration, Instant};

 /// Largest storage of one plugin (keys + values).
@@ -110,6 +111,10 @@ pub trait PluginWorkspace: Send + Sync {
    fn trusted(&self, root: &Path) -> bool;
    /// Root of the project open in `window`.
    fn project_of(&self, window: &str) -> Option<PathBuf>;
+    /// Windows showing the open project at `root`, the most recently focused first.
+    fn project_windows(&self, _root: &Path) -> Vec<String> {
+        Vec::new()
+    }
    /// Shows `items` as producer `source`'s diagnostics of `path` (replacing earlier ones).
    fn publish_diagnostics(&self, source: &str, path: &Path, items: Vec<ide_core::Diagnostic>)
    -> Result<(), HostError>;
@@ -159,16 +164,10 @@ impl SecretStore for FileSecretStore {
            None => map.remove(name),
        };
        let file = self.file(plugin);
-        std::fs::create_dir_all(file.parent().expect("has parent")).map_err(|e| e.to_string())?;
+        std::fs::create_dir_all(&self.dir).map_err(|e| e.to_string())?;
+        ide_vfs::create_private_dir(file.parent().expect("has parent")).map_err(|e| e.to_string())?;
        let bytes = serde_json::to_vec(&map).map_err(|e| e.to_string())?;
-        let tmp = file.with_extension("tmp");
-        std::fs::write(&tmp, bytes).map_err(|e| e.to_string())?;
-        #[cfg(unix)]
-        {
-            use std::os::unix::fs::PermissionsExt;
-            let _ = std::fs::set_permissions(&tmp, std::fs::Permissions::from_mode(0o600));
-        }
-        std::fs::rename(&tmp, &file).map_err(|e| e.to_string())
+        replace_entry(&file, &bytes).map_err(|e| e.to_string())
    }
 }

@@ -497,6 +496,10 @@ pub(super) struct Shared {
    pub(super) prompts: Mutex<HashMap<u64, PromptEntry>>,
    /// Plugins being stopped: their calls may not open new prompts (taken before `prompts`).
    pub(super) prompts_blocked: Mutex<BTreeSet<String>>,
+    /// One network question per plugin; refusals throttle all hosts for 30 seconds.
+    net_prompts: Mutex<HashMap<String, Option<Instant>>>,
+    pub net_hosts_session_only: AtomicBool,
+    session_net_hosts: Mutex<HashMap<String, BTreeSet<String>>>,
    pub(super) next_prompt: AtomicU64,
    pub(super) run_configurations: super::run_detectors::DynamicConfigurations,
    pub(super) run_targets: Mutex<super::run_targets::Targets>,
@@ -520,10 +523,15 @@ pub(super) struct Shared {
    pub secrets: RwLock<Arc<dyn SecretStore>>,
    /// (plugin, `process:` capability) → the approved program.
    pub pins: Arc<RwLock<HashMap<(String, String), ProgramPin>>>,
+    /// The grant ledger, shared with the [`super::PluginHost`]: `net:ask`
+    /// looks up and records "always allow" hosts right where a request runs.
+    pub ledger: Arc<Mutex<Ledger>>,
    pub project_pins: ProjectPins,
    pub event_editors: RwLock<HashMap<String, ide_plugin::EditorContext>>,
    /// Validated UI declarations (settings schemas, declared views).
    pub ui: Arc<ide_extension::UiStore>,
+    /// Extension points plugins declare and what was contributed to them.
+    pub registry: Arc<ide_extension::ExtensionRegistry>,
    /// The UI language the windows report (BCP 47).
    pub locale: RwLock<String>,
    /// (plugin, window) → the log tabs its code opened there, oldest first:
@@ -544,14 +552,18 @@ impl Shared {
        data_dir: PathBuf,
        pins: Arc<RwLock<HashMap<(String, String), ProgramPin>>>,
        ui: Arc<ide_extension::UiStore>,
+        ledger: Arc<Mutex<Ledger>>,
+        registry: Arc<ide_extension::ExtensionRegistry>,
    ) -> Arc<Self> {
        Arc::new(Self {
            ui,
+            registry,
            locale: RwLock::new("en".into()),
            sink,
            workspace: RwLock::new(None),
            secrets: RwLock::new(Arc::new(FileSecretStore { dir: data_dir.clone() })),
            pins,
+            ledger,
            project_pins: Arc::default(),
            event_editors: RwLock::default(),
            data_dir,
@@ -564,6 +576,9 @@ impl Shared {
            process_shutdowns: Mutex::default(),
            prompts: Mutex::default(),
            prompts_blocked: Mutex::default(),
+            net_prompts: Mutex::default(),
+            net_hosts_session_only: AtomicBool::new(false),
+            session_net_hosts: Mutex::default(),
            next_prompt: AtomicU64::new(1),
            run_configurations: Arc::default(),
            run_targets: Mutex::default(),
@@ -795,6 +810,8 @@ impl Shared {
            self.sink.emit(None, PluginEvent::DecorationsChanged { plugin_id: plugin.into(), sets: Vec::new() });
        }
        self.withdraw_prompts(plugin);
+        self.net_prompts.lock().remove(plugin);
+        self.session_net_hosts.lock().remove(plugin);
        let removed: Vec<(Option<String>, String)> = {
            let mut contexts = self.contexts.lock();
            let keys: Vec<_> = contexts.keys().filter(|(_, p, _)| p == plugin).cloned().collect();
@@ -920,6 +937,15 @@ fn storage_io(e: std::io::Error) -> HostError {
    HostError::Failed(format!("storage: {e}"))
 }

+fn replace_entry(path: &Path, bytes: &[u8]) -> std::io::Result<()> {
+    use std::io::Write;
+    let mut tmp =
+        tempfile::Builder::new().prefix(".entry-").suffix(".tmp").tempfile_in(path.parent().expect("has parent"))?;
+    tmp.write_all(bytes)?;
+    tmp.persist(path).map_err(|e| e.error)?;
+    Ok(())
+}
+
 /// A key's file name: its hash, since keys may hold any character.
 fn entry_name(key: &str) -> String {
    blake3::hash(key.as_bytes()).to_hex().to_string()
@@ -941,8 +967,7 @@ fn write_entry(dir: &Path, key: &str, value: &str) -> Result<(), HostError> {
    bytes.extend_from_slice(&len.to_le_bytes());
    bytes.extend_from_slice(key.as_bytes());
    bytes.extend_from_slice(value.as_bytes());
-    let tmp = file.with_extension("tmp");
-    std::fs::write(&tmp, bytes).and_then(|()| std::fs::rename(&tmp, &file)).map_err(storage_io)
+    replace_entry(&file, &bytes).map_err(storage_io)
 }

 /// The stored entries' files and the bytes of their keys and values.
@@ -979,6 +1004,9 @@ impl PluginApi {
    /// older version into it.
    fn storage(&self) -> Result<PathBuf, HostError> {
        let dir = self.shared.storage_dir(self.id());
+        std::fs::create_dir_all(&self.shared.data_dir).map_err(storage_io)?;
+        ide_vfs::create_private_dir(dir.parent().expect("has parent")).map_err(failed)?;
+        ide_vfs::create_private_dir(&dir).map_err(failed)?;
        let legacy = self.shared.data_dir.join(self.id()).join("storage.json");
        match std::fs::read(&legacy) {
            Ok(bytes) => {
@@ -1308,6 +1336,21 @@ impl HostApi for PluginApi {
        host.mcp_executable.read().as_ref().map(|exe| ide_mcp::stdio_command(exe, &root))
    }

+    fn extension_contributions(&self, point: &str) -> Result<Vec<(String, String)>, HostError> {
+        self.require_api("extension points", 5)?;
+        match self.shared.registry.point_owner(point) {
+            None => Err(HostError::NotFound(format!("no running plugin declares {point}"))),
+            Some(owner) if owner != self.id() => Err(HostError::Denied(format!("extension point {point}"))),
+            Some(_) => Ok(self
+                .shared
+                .registry
+                .contributions_to(point)
+                .into_iter()
+                .map(|c| (c.plugin, c.data.to_string()))
+                .collect()),
+        }
+    }
+
    fn register_run_target(&self, root: &Path, target: ide_plugin::PluginRunTarget) -> Result<(), HostError> {
        self.register_target(root, target)
    }
@@ -1758,17 +1801,31 @@ impl HostApi for PluginApi {
        body: String,
        actions: Vec<ide_plugin::NotificationAction>,
    ) -> Result<(), HostError> {
-        if !actions.is_empty() {
-            let commands = self.shared.ui.items("commands", Some(self.id()));
-            if let Some(a) = actions.iter().find(|a| !commands.iter().any(|c| c.key == a.command)) {
-                return Err(HostError::NotFound(format!("the plugin declares no command {:?}", a.command)));
-            }
-        }
+        check_actions(self, &actions)?;
        let plugin_id = self.id().to_owned();
        self.shared.sink.emit(client, PluginEvent::Notification { plugin_id, level, title, body, actions });
        Ok(())
    }

+    fn notify_project(
+        &self,
+        root: &Path,
+        level: NotificationLevel,
+        title: String,
+        body: String,
+        actions: Vec<ide_plugin::NotificationAction>,
+    ) -> Result<(), HostError> {
+        check_actions(self, &actions)?;
+        let windows = self.shared.workspace().map(|w| w.project_windows(root)).unwrap_or_default();
+        let window = windows
+            .into_iter()
+            .find(|w| !self.shared.client_closed(w))
+            .ok_or_else(|| HostError::NotFound(format!("the project {} is not open", root.display())))?;
+        let plugin_id = self.id().to_owned();
+        self.shared.sink.emit(Some(&window), PluginEvent::Notification { plugin_id, level, title, body, actions });
+        Ok(())
+    }
+
    fn copy_to_clipboard(&self, client: Option<&str>, text: String) -> Result<(), HostError> {
        let client = from_window(client, "copy to the clipboard")?;
        self.shared.sink.emit(Some(client), PluginEvent::CopyToClipboard { plugin_id: self.id().to_owned(), text });
@@ -2193,6 +2250,90 @@ impl HostApi for PluginApi {
        })
    }

+    /// The `net:ask` answer: a host the user allowed with "always" is
+    /// remembered in the ledger (no dialog again, background included); a new
+    /// host is asked about in `client`'s window when there is one. Dismissal
+    /// and refusal both deny and throttle further questions.
+    fn net_ask(
+        &self,
+        subject: &Subject,
+        client: Option<&str>,
+        host: &str,
+        cancel: &CancellationToken,
+    ) -> Result<Option<bool>, HostError> {
+        if cancel.is_cancelled() {
+            return Err(HostError::Cancelled);
+        }
+        if !self.pkg.manifest.declares(&Capability::NetAsk) {
+            return Ok(None);
+        }
+        let host = host.trim_end_matches('.').to_ascii_lowercase();
+        {
+            let ledger = self.shared.ledger.lock();
+            if let Some(grant) = ledger.get(subject)
+                && grant.confirmed
+                && grant.has(&Capability::NetAsk)
+                && grant.net_hosts.contains(&host)
+            {
+                return Ok(Some(true));
+            }
+        }
+        if self.shared.session_net_hosts.lock().get(self.id()).is_some_and(|hosts| hosts.contains(&host)) {
+            return Ok(Some(true));
+        }
+        let Some(client) = client else { return Ok(None) };
+        {
+            let closed = self.shared.closed_clients.lock();
+            if closed.contains(client) {
+                return Ok(None);
+            }
+        }
+        if self.shared.prompts_blocked.lock().contains(self.id()) {
+            return Ok(None);
+        }
+        {
+            let mut prompts = self.shared.net_prompts.lock();
+            if prompts.get(self.id()).is_some_and(|until| until.is_none_or(|until| until > Instant::now())) {
+                return Ok(None);
+            }
+            prompts.insert(self.id().to_owned(), None);
+        }
+        let session_only = self.shared.net_hosts_session_only.load(Ordering::Relaxed);
+        let answer = self.ask(Some(client), Prompt::NetPermission { host: host.clone(), session_only }, cancel);
+        let result = match answer {
+            Ok(Some(keys)) if keys == ["session"] || keys == ["always"] => {
+                let mut ledger = self.shared.ledger.lock();
+                if cancel.is_cancelled() {
+                    Err(HostError::Cancelled)
+                } else if ledger.get(subject).is_some_and(|g| g.confirmed && g.has(&Capability::NetAsk)) {
+                    if session_only || keys == ["session"] {
+                        self.shared.session_net_hosts.lock().entry(self.id().into()).or_default().insert(host);
+                    } else {
+                        ledger.remember_net_host(subject, &host);
+                        if let Err(e) = ledger.save() {
+                            tracing::warn!("saving plugin grants: {e}");
+                        }
+                    }
+                    drop(ledger);
+                    self.shared.sink.emit(None, PluginEvent::CommandsChanged);
+                    Ok(Some(true))
+                } else {
+                    Ok(None)
+                }
+            }
+            Ok(Some(keys)) if keys == ["once"] => Ok(Some(false)),
+            Ok(_) => Ok(None),
+            Err(e) => Err(e),
+        };
+        let mut prompts = self.shared.net_prompts.lock();
+        if matches!(result, Ok(Some(_))) {
+            prompts.remove(self.id());
+        } else {
+            prompts.insert(self.id().to_owned(), Some(Instant::now() + Duration::from_secs(30)));
+        }
+        result
+    }
+
    fn secret_is_set(&self, name: &str) -> bool {
        self.shared.secrets.read().get(self.id(), name).is_some()
    }
@@ -2664,7 +2805,9 @@ impl HostApi for PluginApi {
            Err(e) if e.kind == ide_core::error::ErrorKind::NotFound => ("utf-8".to_string(), false),
            Err(e) => return Err(not_writable(real, e)),
        };
-        if self.plugin_dir().is_ok_and(|dir| real.starts_with(dir)) {
+        let private = self.plugin_dir().is_ok_and(|dir| real.starts_with(dir));
+        check_write_path(real)?;
+        if private {
            let bytes = ide_vfs::encode(text, &encoding, has_bom).map_err(|e| not_writable(real, e))?;
            ide_vfs::write_atomic_private(real, &bytes).map(drop).map_err(|e| not_writable(real, e))
        } else {
@@ -2674,7 +2817,9 @@ impl HostApi for PluginApi {

    fn write_bytes_file(&self, real: &Path, bytes: &[u8]) -> Result<(), HostError> {
        check_unsaved(self.shared.workspace(), real)?;
-        if self.plugin_dir().is_ok_and(|dir| real.starts_with(dir)) {
+        let private = self.plugin_dir().is_ok_and(|dir| real.starts_with(dir));
+        check_write_path(real)?;
+        if private {
            ide_vfs::write_atomic_private(real, bytes).map(drop).map_err(|e| not_writable(real, e))
        } else {
            ide_vfs::write_atomic(real, bytes).map(drop).map_err(|e| not_writable(real, e))
@@ -2682,6 +2827,16 @@ impl HostApi for PluginApi {
    }
 }

+/// Approved write paths are already resolved. Refuse substitutions since approval.
+fn check_write_path(path: &Path) -> Result<(), HostError> {
+    let parent = path.parent().ok_or_else(|| HostError::Invalid("no directory to put it in".into()))?;
+    let checked = ide_plugin::resolve_writable_in_root(parent, &to_ipc(path)).map_err(HostError::Invalid)?;
+    if checked != path {
+        return Err(HostError::Invalid(format!("{}: file path changed before writing", path.display())));
+    }
+    Ok(())
+}
+
 /// A file that is not there, or cannot be read, as the plugin sees it.
 fn not_a_file(path: &Path, e: std::io::Error) -> HostError {
    match e.kind() {
@@ -2718,6 +2873,15 @@ fn not_writable(path: &Path, e: ide_core::error::IdeError) -> HostError {
    }
 }

+/// Notification buttons must name commands the plugin declares.
+fn check_actions(api: &PluginApi, actions: &[ide_plugin::NotificationAction]) -> Result<(), HostError> {
+    let commands = if actions.is_empty() { Vec::new() } else { api.shared.ui.items("commands", Some(api.id())) };
+    match actions.iter().find(|a| !commands.iter().any(|c| c.key == a.command)) {
+        Some(a) => Err(HostError::NotFound(format!("the plugin declares no command {:?}", a.command))),
+        None => Ok(()),
+    }
+}
+
 /// [`PluginWorkspace`] over the desktop host's open projects.
 pub struct HostWorkspace(pub std::sync::Weak<crate::Host>);

@@ -3016,6 +3180,13 @@ impl PluginWorkspace for HostWorkspace {
        self.0.upgrade()?.project(window).ok().map(|p| p.root.clone())
    }

+    fn project_windows(&self, root: &Path) -> Vec<String> {
+        let Some(host) = self.0.upgrade() else { return Vec::new() };
+        let mut windows = host.windows_for_root(root);
+        host.mcp_reports.most_recently_focused_first(&mut windows);
+        windows
+    }
+
    fn publish_diagnostics(
        &self,
        source: &str,
@@ -3065,10 +3236,134 @@ mod tests {
        )
        .unwrap();
        let sink: Arc<dyn PluginEventSink> = Arc::new(|_: Option<&str>, _: PluginEvent| {});
-        let shared = Shared::new(sink, dir.join(".data"), pins, ide_extension::UiStore::new());
+        let shared = Shared::new(
+            sink,
+            dir.join(".data"),
+            pins,
+            ide_extension::UiStore::new(),
+            Arc::default(),
+            Arc::new(ide_extension::ExtensionRegistry::new()),
+        );
        PluginApi { pkg: Package::new(manifest, dir.to_path_buf()), shared }
    }

+    #[test]
+    fn net_questions_are_exclusive_throttled_and_cancelled() {
+        let dir = tempfile::tempdir().unwrap();
+        let mut api = api(dir.path(), Arc::default());
+        api.pkg = Package::new(
+            ide_extension::Manifest::parse(
+                "id = \"acme.lint\"\nname = \"Lint\"\nversion = \"1.0.0\"\nengines.openidea = \"^1.5\"\n[capabilities]\nrequired = [\"net:ask\"]\n",
+            ).unwrap(),
+            dir.path().to_path_buf(),
+        );
+        let subject = Subject::Installed(api.id().into());
+        api.shared.ledger.lock().confirm(
+            &ide_extension::ledger::Request {
+                subject: subject.clone(),
+                plugin_id: api.id(),
+                version: "1.0.0",
+                package_hash: "h",
+                required: vec![Capability::NetAsk],
+                optional: vec![],
+            },
+            &[],
+            BTreeMap::new(),
+        );
+        for answer in [Some(vec!["always".into(), "once".into()]), None] {
+            api.shared.net_prompts.lock().clear();
+            let cancel = CancellationToken::new();
+            std::thread::scope(|scope| {
+                let run = scope.spawn(|| api.net_ask(&subject, Some("main"), "::1", &cancel));
+                let deadline = Instant::now() + Duration::from_secs(5);
+                let id = loop {
+                    if let Some(id) = api.shared.prompts.lock().keys().next().copied() {
+                        break id;
+                    }
+                    assert!(Instant::now() < deadline);
+                    std::thread::sleep(Duration::from_millis(10));
+                };
+                assert_eq!(api.net_ask(&subject, Some("other"), "other.example", &cancel).unwrap(), None);
+                if let Some(answer) = answer {
+                    assert!(api.shared.answer_prompt(id, Some(answer)));
+                    assert_eq!(run.join().unwrap().unwrap(), None);
+                } else {
+                    cancel.cancel();
+                    assert!(matches!(run.join().unwrap(), Err(HostError::Cancelled)));
+                }
+            });
+            assert!(api.shared.prompts.lock().is_empty());
+            assert!(api.shared.ledger.lock().get(&subject).unwrap().net_hosts.is_empty());
+            assert_eq!(api.net_ask(&subject, Some("main"), "new.example", &CancellationToken::new()).unwrap(), None);
+        }
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn writes_recheck_approved_paths_after_symlink_substitution() {
+        use std::os::unix::fs::symlink;
+        let tmp = tempfile::tempdir().unwrap();
+        let api = api(tmp.path(), Arc::default());
+        let root = tmp.path().join("project");
+        std::fs::create_dir_all(root.join("nested")).unwrap();
+        let path = ide_plugin::resolve_writable_in_root(&root, "nested/file.txt").unwrap();
+        let outside = tmp.path().join("outside.txt");
+        std::fs::write(&outside, "unchanged").unwrap();
+        symlink(&outside, &path).unwrap();
+        assert!(api.write_text_file(&path, "text").is_err());
+        assert!(api.write_bytes_file(&path, b"bytes").is_err());
+        assert_eq!(std::fs::read_to_string(&outside).unwrap(), "unchanged");
+
+        std::fs::remove_file(&path).unwrap();
+        std::fs::remove_dir(root.join("nested")).unwrap();
+        symlink(tmp.path(), root.join("nested")).unwrap();
+        assert!(api.write_text_file(&path, "text").is_err());
+        assert!(api.write_bytes_file(&path, b"bytes").is_err());
+        assert!(!tmp.path().join("file.txt").exists());
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn storage_and_secrets_do_not_write_through_temporary_symlinks() {
+        use std::os::unix::fs::symlink;
+        let tmp = tempfile::tempdir().unwrap();
+        let api = api(tmp.path(), Arc::default());
+        let outside = tmp.path().join("outside.txt");
+        std::fs::write(&outside, "unchanged").unwrap();
+        let dir = api.storage().unwrap();
+        let entry = dir.join(entry_name("key"));
+        symlink(&outside, entry.with_extension("tmp")).unwrap();
+        symlink(&outside, &entry).unwrap();
+        api.storage_set("key", Some("value".into())).unwrap();
+        assert_eq!(api.storage_get("key").unwrap().as_deref(), Some("value"));
+        assert_eq!(std::fs::read_to_string(&outside).unwrap(), "unchanged");
+
+        let secrets = FileSecretStore { dir: tmp.path().join("secrets") };
+        secrets.set("acme.lint", "key", Some("before")).unwrap();
+        symlink(&outside, secrets.file("acme.lint").with_extension("tmp")).unwrap();
+        secrets.set("acme.lint", "key", Some("after")).unwrap();
+        assert_eq!(secrets.get("acme.lint", "key").as_deref(), Some("after"));
+        assert_eq!(std::fs::read_to_string(&outside).unwrap(), "unchanged");
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn storage_and_secrets_refuse_symlinked_private_directories() {
+        let tmp = tempfile::tempdir().unwrap();
+        let api = api(tmp.path(), Arc::default());
+        let dir = api.storage().unwrap();
+        std::fs::remove_dir(&dir).unwrap();
+        let outside = tmp.path().join("outside");
+        std::fs::create_dir(&outside).unwrap();
+        std::os::unix::fs::symlink(&outside, &dir).unwrap();
+        assert!(api.storage_set("key", Some("value".into())).is_err());
+        let secrets = FileSecretStore { dir: tmp.path().join("secrets") };
+        std::fs::create_dir(&secrets.dir).unwrap();
+        std::os::unix::fs::symlink(&outside, secrets.dir.join("acme.lint")).unwrap();
+        assert!(secrets.set("acme.lint", "key", Some("value")).is_err());
+        assert_eq!(std::fs::read_dir(outside).unwrap().count(), 0);
+    }
+
    #[cfg(windows)]
    #[test]
    fn private_directory_matches_resolved_write_paths() {
@@ -3682,6 +3977,8 @@ mod workbench_tests {
            root.join(".data"),
            Arc::default(),
            ide_extension::UiStore::new(),
+            Arc::default(),
+            Arc::new(ide_extension::ExtensionRegistry::new()),
        );
        *shared.workspace.write() =
            Some(Arc::new(Workspace { root: root.into(), trusted, text: text.map(str::to_owned) }));
@@ -0,0 +1,214 @@
+//! Plugin dependencies at run time: which plugins may start, in which order,
+//! and what follows when a plugin they need goes away or comes back.
+
+use super::{LoadedPlugin, PluginHost, PluginStatus, types::*};
+use ide_extension::{Blocked, Node, Plan, dependency_state, dependents, plan};
+use ide_plugin::WorkbenchEvent;
+use std::collections::BTreeSet;
+use std::sync::Arc;
+
+/// Points whose contributions changed since the owners were last told.
+pub(super) type PendingChanges = Arc<parking_lot::Mutex<BTreeSet<String>>>;
+
+impl PluginHost {
+    /// The plan for the plugins as they are now. Plugins that are switched off,
+    /// broken or being uninstalled cannot be depended on.
+    fn dependency_plan(&self) -> Plan {
+        self.with_nodes(|_, plan| plan.clone())
+    }
+
+    fn with_nodes<R>(&self, f: impl FnOnce(&[Node<'_>], &Plan) -> R) -> R {
+        let plugins: Vec<Arc<LoadedPlugin>> = self.plugins.read().values().cloned().collect();
+        let disabled = self.state.lock().disabled.clone();
+        let nodes: Vec<Node<'_>> = plugins
+            .iter()
+            .map(|p| Node {
+                id: p.id(),
+                version: &p.manifest().version,
+                depends: &p.manifest().depends,
+                enabled: !disabled.contains(p.id()) && !p.invalid && !p.meta.lock().uninstalling,
+            })
+            .collect();
+        let plan = plan(&nodes);
+        f(&nodes, &plan)
+    }
+
+    /// Why `plugin` may not start now, if it may not.
+    pub(super) fn blocked_reason(&self, plugin: &LoadedPlugin) -> Option<Blocked> {
+        if let Some(reason) = self.dependency_plan().blocked.get(plugin.id()) {
+            return Some(reason.clone());
+        }
+        // Enabled and present, but it could not start itself (failed, waiting for consent).
+        let plugins = self.plugins.read();
+        plugin
+            .manifest()
+            .depends
+            .iter()
+            .filter(|d| !d.optional)
+            .find(|d| {
+                plugins.get(&d.id).is_some_and(|p| {
+                    matches!(p.status(), PluginStatus::Failed | PluginStatus::NeedsConsent | PluginStatus::Blocked)
+                })
+            })
+            .map(|d| Blocked::Dependency { id: d.id.clone() })
+    }
+
+    /// Stops `plugin` and shows why it is not running.
+    pub(super) fn set_blocked(&self, plugin: &LoadedPlugin, reason: &Blocked) {
+        self.stop(plugin);
+        let mut meta = plugin.meta.lock();
+        meta.status = PluginStatus::Blocked;
+        meta.error = Some(reason.to_string());
+        meta.warnings.clear();
+        tracing::info!(plugin = %plugin.id(), "{reason}");
+    }
+
+    /// Orders `plugins` so each comes after the plugins it needs.
+    pub(super) fn in_start_order(&self, mut plugins: Vec<Arc<LoadedPlugin>>) -> Vec<Arc<LoadedPlugin>> {
+        let order = self.dependency_plan().order;
+        let rank = |id: &str| order.iter().position(|o| o == id).unwrap_or(usize::MAX);
+        plugins.sort_by(|a, b| rank(a.id()).cmp(&rank(b.id())).then_with(|| a.id().cmp(b.id())));
+        plugins
+    }
+
+    /// Brings every plugin in line with the dependency plan: plugins that lost
+    /// something they need stop, plugins that can run again start. Called with
+    /// the lifecycle lock held, after anything that adds, removes, enables or
+    /// disables a plugin.
+    pub(super) fn reconcile(&self) {
+        let plan = self.dependency_plan();
+        let get = |id: &str| self.plugins.read().get(id).cloned();
+        for (id, reason) in &plan.blocked {
+            if let Some(plugin) = get(id)
+                && (plugin.status() != PluginStatus::Blocked
+                    || plugin.meta.lock().error.as_deref() != Some(&reason.to_string()))
+            {
+                self.set_blocked(&plugin, reason);
+            }
+        }
+        for id in &plan.order {
+            if let Some(plugin) = get(id)
+                && plugin.status() == PluginStatus::Blocked
+            {
+                self.start(&plugin);
+            }
+        }
+    }
+
+    /// After `id` started again (reloaded, updated): plugins that need it follow,
+    /// and what they contributed is checked against its current extension points.
+    pub(super) fn settle_dependents(&self, id: &str) {
+        self.restart_dependents(id);
+        self.reconcile();
+    }
+
+    /// Starts again the running plugins that need `id`, and those that list it
+    /// as an optional requirement: the latter skipped their contributions to its
+    /// points while it was absent, so they take effect when it appears.
+    fn restart_dependents(&self, id: &str) {
+        let mut ids = self.with_nodes(|nodes, _| dependents(nodes, id));
+        for optional in self.optional_dependents(id) {
+            if !ids.contains(&optional) {
+                ids.push(optional);
+            }
+        }
+        for dependent in ids {
+            self.restart_live(&dependent);
+        }
+    }
+
+    /// After `id` was enabled: the plugins that list it as an optional requirement
+    /// start again (the ones that need it start through [`reconcile`](Self::reconcile)).
+    pub(super) fn restart_optional_dependents(&self, id: &str) {
+        for dependent in self.optional_dependents(id) {
+            self.restart_live(&dependent);
+        }
+    }
+
+    fn optional_dependents(&self, id: &str) -> Vec<String> {
+        self.plugins
+            .read()
+            .values()
+            .filter(|p| p.manifest().depends.iter().any(|d| d.optional && d.id == id))
+            .map(|p| p.id().to_owned())
+            .collect()
+    }
+
+    fn restart_live(&self, id: &str) {
+        let Some(plugin) = self.plugins.read().get(id).cloned() else { return };
+        if plugin.status().is_live() {
+            self.stop(&plugin);
+            self.start(&plugin);
+        }
+    }
+
+    /// Tells plugins that declare an extension point that contributions to it changed.
+    pub(super) fn flush_extension_changes(&self) {
+        let points: Vec<String> = std::mem::take(&mut *self.extension_changes.lock()).into_iter().collect();
+        if !points.is_empty() {
+            self.post_events(None, vec![WorkbenchEvent::ExtensionsChanged(points)]);
+        }
+    }
+
+    /// `[[depends]]` with their state, who needs this plugin, and its extension points.
+    pub(super) fn relations(
+        &self,
+        plugin: &LoadedPlugin,
+    ) -> (Vec<DependencyInfo>, Vec<DependentInfo>, Vec<ExtensionPointInfo>) {
+        let disabled = self.state.lock().disabled.clone();
+        let plugins = self.plugins.read();
+        let depends = plugin
+            .manifest()
+            .depends
+            .iter()
+            .map(|dep| {
+                let found = plugins.get(&dep.id);
+                let node = found.map(|p| Node {
+                    id: p.id(),
+                    version: &p.manifest().version,
+                    depends: &[],
+                    enabled: !disabled.contains(p.id()) && !p.invalid,
+                });
+                let stuck = found.is_some_and(|p| {
+                    matches!(p.status(), PluginStatus::Failed | PluginStatus::NeedsConsent | PluginStatus::Blocked)
+                });
+                DependencyInfo {
+                    id: dep.id.clone(),
+                    name: found.map(|p| p.manifest().name.clone()),
+                    version: dep.version.clone(),
+                    optional: dep.optional,
+                    state: dependency_state(dep, node.as_ref(), stuck),
+                }
+            })
+            .collect();
+        let all: Vec<Node<'_>> = plugins
+            .values()
+            .map(|p| Node {
+                id: p.id(),
+                version: &p.manifest().version,
+                depends: &p.manifest().depends,
+                enabled: !disabled.contains(p.id()) && !p.invalid,
+            })
+            .collect();
+        let needing = dependents(&all, plugin.id())
+            .into_iter()
+            .filter_map(|id| plugins.get(&id))
+            .map(|p| DependentInfo {
+                id: p.id().to_owned(),
+                name: p.manifest().name.clone(),
+                enabled: !disabled.contains(p.id()),
+            })
+            .collect();
+        let points = self
+            .registry
+            .declared_points(plugin.id())
+            .into_iter()
+            .map(|p| ExtensionPointInfo {
+                id: p.decl.id,
+                description: p.decl.description,
+                contributors: p.contributors,
+            })
+            .collect();
+        (depends, needing, points)
+    }
+}
@@ -78,6 +78,25 @@ pub fn read_source(path: &Path) -> IdeResult<IntellijThemeSource> {
 /// The theme plugins of the JetBrains IDEs (and Android Studio) of this user,
 /// the themes their IDEs are set to first.
 pub fn installed_themes() -> Vec<InstalledIntellijTheme> {
+    find_installed(&latest_product_versions(local_ide_dirs()))
+}
+
+/// The settings folder of a JetBrains IDE (or Android Studio) of this user.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct InstalledIdeSettings {
+    /// The IDE and its version: `IntelliJ IDEA 2025.2`.
+    pub ide: String,
+    /// What Import Settings reads.
+    pub path: IpcPath,
+}
+
+/// The settings folders of the JetBrains IDEs of this user, most recently used first.
+pub fn installed_ide_settings() -> Vec<InstalledIdeSettings> {
+    settings_folders(&local_ide_dirs())
+}
+
+fn local_ide_dirs() -> Vec<IdeDir> {
    let Some(home) = dirs::home_dir() else { return Vec::new() };
    let layout = if cfg!(target_os = "macos") {
        Layout::Mac
@@ -86,7 +105,65 @@ pub fn installed_themes() -> Vec<InstalledIntellijTheme> {
    } else {
        Layout::Xdg
    };
-    find_installed(&ide_dirs(layout, &home, |key| std::env::var_os(key)))
+    ide_dirs(layout, &home, |key| std::env::var_os(key))
+}
+
+fn settings_folders(ides: &[IdeDir]) -> Vec<InstalledIdeSettings> {
+    let mut used: Vec<_> =
+        ides.iter().filter_map(|ide| settings_modified(&ide.config).map(|time| (ide, time))).collect();
+    used.sort_by(|(a, at), (b, bt)| {
+        bt.cmp(at).then_with(|| a.label.cmp(&b.label)).then_with(|| a.config.cmp(&b.config))
+    });
+    used.into_iter()
+        .map(|(ide, _)| InstalledIdeSettings { ide: ide.label.clone(), path: ide.config.clone().into() })
+        .collect()
+}
+
+fn settings_modified(config: &Path) -> Option<std::time::SystemTime> {
+    let options = config.join("options");
+    // Match the folder reader: never count links or walk below the settings directories.
+    if !config.symlink_metadata().ok()?.is_dir() || !options.symlink_metadata().ok()?.is_dir() {
+        return None;
+    }
+    let mut modified = None;
+    let mut customised = false;
+    for entry in std::fs::read_dir(&options).ok()?.flatten() {
+        let path = entry.path();
+        if !entry.file_type().is_ok_and(|t| t.is_file())
+            || !path.extension().is_some_and(|e| e.eq_ignore_ascii_case("xml"))
+        {
+            continue;
+        }
+        let Ok(meta) = entry.metadata() else { continue };
+        modified = modified.max(meta.modified().ok());
+        // Startup bookkeeping can exist before the user has changed any settings.
+        let name = entry.file_name();
+        customised |= meta.len() > 0
+            && !matches!(
+                name.to_str(),
+                Some(
+                    "other.xml"
+                        | "nonRoamable.xml"
+                        | "early-access-registry.xml"
+                        | "applicationInfo.xml"
+                        | "updates.xml"
+                        | "usage.statistics.xml"
+                )
+            );
+    }
+    customised |= ["keymaps", "codestyles", "colors", "templates", "inspection"].iter().any(|sub| {
+        let dir = config.join(sub);
+        dir.symlink_metadata().is_ok_and(|m| m.is_dir())
+            && std::fs::read_dir(dir).into_iter().flatten().flatten().any(|entry| {
+                entry.file_type().is_ok_and(|t| t.is_file())
+                    && entry.metadata().is_ok_and(|m| m.len() > 0)
+                    && entry
+                        .path()
+                        .extension()
+                        .is_some_and(|e| e.eq_ignore_ascii_case("xml") || e.eq_ignore_ascii_case("icls"))
+            })
+    });
+    customised.then(|| modified.or_else(|| options.metadata().ok()?.modified().ok()).unwrap_or(std::time::UNIX_EPOCH))
 }

 fn read(path: &Path) -> Result<IntellijThemeSource, String> {
@@ -422,8 +499,7 @@ struct IdeDir {
    plugins: PathBuf,
 }

-/// The settings folders of JetBrains IDEs and Android Studio (2020.1 and later), newest first, one
-/// per product: its newest version's (an upgrade leaves the older ones behind).
+/// The settings folders of JetBrains IDEs and Android Studio (2020.1 and later), newest version first.
 fn ide_dirs(layout: Layout, home: &Path, env: impl Fn(&str) -> Option<OsString>) -> Vec<IdeDir> {
    let var = |key: &str| env(key).filter(|v| !v.is_empty()).map(PathBuf::from);
    let (config_root, data_root) = match layout {
@@ -463,11 +539,16 @@ fn ide_dirs(layout: Layout, home: &Path, env: impl Fn(&str) -> Option<OsString>)
        }
    }
    out.sort_by(|a, b| b.version.cmp(&a.version).then_with(|| a.label.cmp(&b.label)));
-    let mut products = std::collections::HashSet::new();
-    out.retain(|ide| products.insert(ide.product.clone()));
    out
 }

+/// Theme discovery only uses the newest version of each product.
+fn latest_product_versions(mut ides: Vec<IdeDir>) -> Vec<IdeDir> {
+    let mut products = std::collections::HashSet::new();
+    ides.retain(|ide| products.insert(ide.product.clone()));
+    ides
+}
+
 /// `IntelliJIdea2025.2` → (`IntelliJIdea`, (2025, 2), `2025.2`).
 fn product_dir(name: &str) -> Option<(&str, (u32, u32), &str)> {
    let at = name.find(|c: char| c.is_ascii_digit())?;
@@ -787,15 +868,16 @@ mod tests {
        };
        let mac = mk(home.join("Library/Application Support/JetBrains/IntelliJIdea2025.2"));
        mk(home.join("Library/Application Support/JetBrains/Toolbox"));
-        // An upgrade leaves the older version's folder behind: only the newest of a product counts.
+        // Settings import keeps every version; theme discovery uses only the newest.
        mk(home.join("Library/Application Support/JetBrains/IntelliJIdea2024.3"));
        mk(home.join("Library/Application Support/JetBrains/IntelliJIdea2025.10"));
        let dirs = ide_dirs(Layout::Mac, home, |_| None);
-        assert_eq!(dirs.len(), 1);
+        assert_eq!(dirs.len(), 3);
        assert_eq!(dirs[0].label, "IntelliJ IDEA 2025.10");
+        assert_eq!(latest_product_versions(dirs).len(), 1);
        std::fs::remove_dir(home.join("Library/Application Support/JetBrains/IntelliJIdea2025.10")).unwrap();
        let dirs = ide_dirs(Layout::Mac, home, |_| None);
-        assert_eq!(dirs.len(), 1);
+        assert_eq!(dirs.len(), 2);
        assert_eq!(dirs[0].label, "IntelliJ IDEA 2025.2");
        assert_eq!((dirs[0].config.clone(), dirs[0].plugins.clone()), (mac.clone(), mac.join("plugins")));

@@ -881,4 +963,109 @@ mod tests {
        assert_eq!(found, [theme("shallow-id", "Shallow", false, true), theme("deep-sea-id", "Deep Sea", true, false)]);
        assert!(find_installed(&[]).is_empty());
    }
+
+    #[test]
+    fn unused_newer_versions_do_not_hide_settings() {
+        let tmp = tempfile::tempdir().unwrap();
+        for (layout, root) in [
+            (Layout::Mac, "Library/Application Support"),
+            (Layout::Windows, "AppData/Roaming"),
+            (Layout::Xdg, ".config"),
+        ] {
+            let root = tmp.path().join(root).join("JetBrains");
+            let used = root.join("IntelliJIdea2024.3");
+            let fresh = root.join("IntelliJIdea2025.2");
+            write(&used.join("options/editor.xml"), b"<application><component name=\"EditorSettings\"/></application>");
+            std::fs::create_dir_all(&fresh).unwrap();
+            let expected = vec![InstalledIdeSettings { ide: "IntelliJ IDEA 2024.3".into(), path: used.into() }];
+            assert_eq!(settings_folders(&ide_dirs(layout, tmp.path(), |_| None)), expected);
+            write(&fresh.join("options/other.xml"), b"<application/>");
+            write(&fresh.join("options/early-access-registry.xml"), b"<application/>");
+            assert_eq!(settings_folders(&ide_dirs(layout, tmp.path(), |_| None)), expected);
+        }
+    }
+
+    #[test]
+    fn settings_candidates_keep_used_versions_and_sort_by_options_modification() {
+        let tmp = tempfile::tempdir().unwrap();
+        let root = tmp.path().join("Library/Application Support/JetBrains");
+        let put = |product: &str, file: &str, seconds| {
+            let path = root.join(product).join(file);
+            write(&path, b"<application/>");
+            std::fs::File::options()
+                .write(true)
+                .open(path)
+                .unwrap()
+                .set_modified(std::time::UNIX_EPOCH + std::time::Duration::from_secs(seconds))
+                .unwrap();
+        };
+        put("IntelliJIdea2025.2", "options/editor.xml", 100);
+        put("IntelliJIdea2024.3", "options/editor.xml", 200);
+        put("IntelliJIdea2024.3", "options/editor-font.xml", 400);
+        put("PyCharm2025.1", "options/editor.xml", 300);
+        // Directory times and unrelated files do not change options-file ordering.
+        write(&root.join("IntelliJIdea2025.2/options/README.txt"), b"recent");
+        let dirs = ide_dirs(Layout::Mac, tmp.path(), |_| None);
+        let found = settings_folders(&dirs);
+        assert_eq!(
+            found.iter().map(|s| s.ide.as_str()).collect::<Vec<_>>(),
+            ["IntelliJ IDEA 2024.3", "PyCharm 2025.1", "IntelliJ IDEA 2025.2"]
+        );
+        assert_eq!(found[0].path, root.join("IntelliJIdea2024.3"));
+        assert_eq!(latest_product_versions(dirs).len(), 2);
+    }
+
+    #[test]
+    fn skips_empty_and_startup_only_settings_but_keeps_custom_schemes() {
+        let tmp = tempfile::tempdir().unwrap();
+        let config = tmp.path();
+        assert!(settings_modified(config).is_none());
+        std::fs::create_dir(config.join("options")).unwrap();
+        assert!(settings_modified(config).is_none());
+        for file in ["other", "nonRoamable", "early-access-registry", "applicationInfo", "updates", "usage.statistics"]
+        {
+            write(
+                &config.join(format!("options/{file}.xml")),
+                b"<application><component name=\"Startup\"/></application>",
+            );
+        }
+        write(&config.join("options/editor.xml"), b"");
+        write(&config.join("options/nested/editor.xml"), b"<application/>");
+        for sub in ["keymaps", "codestyles", "colors", "templates", "inspection"] {
+            std::fs::create_dir(config.join(sub)).unwrap();
+            write(&config.join(sub).join("README.txt"), b"not settings");
+        }
+        assert!(settings_modified(config).is_none());
+        for (sub, file) in [
+            ("keymaps", "custom.xml"),
+            ("codestyles", "custom.xml"),
+            ("colors", "custom.icls"),
+            ("templates", "custom.xml"),
+            ("inspection", "custom.xml"),
+        ] {
+            let path = config.join(sub).join(file);
+            write(&path, b"<custom/>");
+            assert!(settings_modified(config).is_some(), "{sub} is a user setting");
+            std::fs::remove_file(path).unwrap();
+        }
+    }
+
+    #[test]
+    fn lists_the_settings_folders_of_ides_that_have_been_run() {
+        let tmp = tempfile::tempdir().unwrap();
+        let ide = |label: &str, product: &str, version: (u32, u32)| {
+            let config = tmp.path().join(format!("{product}{}.{}", version.0, version.1));
+            IdeDir { label: label.into(), product: product.into(), version, config: config.clone(), plugins: config }
+        };
+        let used = ide("IntelliJ IDEA 2025.2", "IntelliJIdea", (2025, 2));
+        let fresh = ide("PyCharm 2025.1", "PyCharm", (2025, 1));
+        let used_config = used.config.clone();
+        write(&used_config.join("options/editor.xml"), b"<application/>");
+        std::fs::create_dir_all(&fresh.config).unwrap();
+        assert_eq!(
+            settings_folders(&[used, fresh]),
+            [InstalledIdeSettings { ide: "IntelliJ IDEA 2025.2".into(), path: used_config.into() }]
+        );
+        assert!(settings_folders(&[]).is_empty());
+    }
 }
@@ -19,6 +19,7 @@ mod api;
 mod auth;
 pub mod commit;
 mod database;
+mod dependencies;
 pub(crate) mod diagnostics;
 pub mod endpoints;
 mod event_paths;
@@ -143,6 +144,8 @@ struct Meta {
    retry_at: Option<Instant>,
    /// The component exports `syntax-provider` (known once activated).
    has_syntax: bool,
+    /// Known before activation can publish target registrations.
+    has_run_target_validation: bool,
    /// Next `on-schedule` activation.
    next_schedule: Option<Instant>,
    /// The trusted publisher of a signed installed package.
@@ -164,6 +167,7 @@ impl Meta {
            failures: 0,
            retry_at: None,
            has_syntax: false,
+            has_run_target_validation: false,
            publisher: None,
            next_schedule: None,
        }
@@ -366,6 +370,8 @@ pub struct PluginHost {
    sink: Arc<dyn PluginEventSink>,
    limits: Limits,
    registry: Arc<ExtensionRegistry>,
+    /// Extension points (declared by plugins) whose contributions changed, until their owners are told.
+    extension_changes: dependencies::PendingChanges,
    ui: Arc<UiStore>,
    languages: Arc<PluginLanguages>,
    run_detectors: Arc<run_detectors::RunDetectors>,
@@ -377,7 +383,7 @@ pub struct PluginHost {
    diagnostic_projects: Mutex<Vec<diagnostics::ProjectState>>,
    /// Validated UI declarations of installed packages (start-up reuses them).
    index: Arc<ContributionIndex>,
-    ledger: Mutex<Ledger>,
+    ledger: Arc<Mutex<Ledger>>,
    plugins: RwLock<BTreeMap<String, Arc<LoadedPlugin>>>,
    state: Mutex<PersistedState>,
    /// What every plugin's [`api::PluginApi`] shares: sink, registry,
@@ -433,6 +439,11 @@ impl PluginHost {
            .and_then(|s| serde_json::from_str(&s).ok())
            .unwrap_or_default();
        let registry = Arc::new(ExtensionRegistry::new());
+        let extension_changes: dependencies::PendingChanges = Arc::default();
+        let changes = extension_changes.clone();
+        registry.set_change_listener(Arc::new(move |point, _owner| {
+            changes.lock().insert(point.to_owned());
+        }));
        let ui = UiStore::new();
        let index = Arc::new(ContributionIndex::new(
            plugins_dir.join(".cache").join("contributions"),
@@ -449,7 +460,15 @@ impl PluginHost {
        languages.set_process_policy(Arc::new(move |plugin, cap| {
            policy_pins.read().get(&(plugin.to_owned(), cap.to_string())).cloned()
        }));
-        let shared = api::Shared::new(sink.clone(), plugins_dir.join(".data"), pins.clone(), ui.clone());
+        let ledger = Arc::new(Mutex::new(Ledger::load(&plugins_dir)));
+        let shared = api::Shared::new(
+            sink.clone(),
+            plugins_dir.join(".data"),
+            pins.clone(),
+            ui.clone(),
+            ledger.clone(),
+            registry.clone(),
+        );
        let official_keys = market::built_in_official_keys();
        let market = RwLock::new(Self::load_market_index(&plugins_dir, &official_keys));
        let host = Self {
@@ -460,11 +479,12 @@ impl PluginHost {
            updates: Mutex::default(),
            project_policy: RwLock::new(Arc::new(|_| false)),
            engine: PluginEngine::new().map_err(IdeError::internal)?,
-            ledger: Mutex::new(Ledger::load(&plugins_dir)),
+            ledger,
            plugins_dir,
            sink,
            limits,
            registry,
+            extension_changes,
            ui,
            languages,
            run_detectors,
@@ -551,16 +571,22 @@ impl PluginHost {
        }
        let dirs = package_dirs(&self.plugins_dir);
        self.migrate_grants(&dirs);
+        // Every package is listed before any starts: a plugin's requirements are
+        // decided against all of them, and each starts after the plugins it needs.
+        let mut to_start = Vec::new();
        for dir in dirs {
            if !self.is_loaded_from(&dir) {
-                self.load_dir(&dir, PluginSource::Installed, None);
+                to_start.extend(self.register_dir(&dir, PluginSource::Installed, None).1);
            }
        }
        for dir in self.links().paths {
            if !self.is_loaded_from(&dir) && dir.join(MANIFEST_FILE).is_file() {
-                self.load_dir(&dir, PluginSource::Linked, None);
+                to_start.extend(self.register_dir(&dir, PluginSource::Linked, None).1);
            }
        }
+        for plugin in self.in_start_order(to_start) {
+            self.start(&plugin);
+        }
        let (done, cv) = &self.initial_load;
        *done.lock() = true;
        cv.notify_all();
@@ -737,6 +763,7 @@ impl PluginHost {
            }
        }
        if changed {
+            self.reconcile();
            self.changed();
        }
    }
@@ -803,6 +830,11 @@ impl PluginHost {
        Ok(self.ui.assets_with_prefix(id, prefix).into_iter().map(|(k, v)| (k, v.to_string())).collect())
    }

+    /// Keeps hosts allowed through `net:ask` in memory for this host's lifetime.
+    pub fn set_net_hosts_session_only(&self) {
+        self.shared.net_hosts_session_only.store(true, std::sync::atomic::Ordering::Relaxed);
+    }
+
    /// The UI language windows run in, as `locale()` reports it to plugin code.
    pub fn set_ui_locale(&self, tag: &str) {
        *self.shared.locale.write() = tag.to_owned();
@@ -831,6 +863,11 @@ impl PluginHost {
        } else {
            plugin.meta.lock().status = PluginStatus::Disabled;
        }
+        // Plugins that need this one stop or start with it.
+        self.reconcile();
+        if enabled {
+            self.restart_optional_dependents(id);
+        }
        self.changed();
        Ok(())
    }
@@ -843,6 +880,7 @@ impl PluginHost {
        let (dir, source, root) = (plugin.dir().to_path_buf(), plugin.source, plugin.dev_root.clone());
        self.unload(id);
        let new_id = self.load_dir(&dir, source, root);
+        self.settle_dependents(&new_id);
        self.changed();
        self.info_of(&new_id)
    }
@@ -961,6 +999,7 @@ impl PluginHost {
                .map(|p| p.meta.lock().error.clone().unwrap_or_else(|| "it failed to load".into()));
            if let Some(reason) = failed {
                self.roll_back(&id, &previous, &version, old_grant);
+                self.settle_dependents(&id);
                self.changed();
                return Err(IdeError::invalid(format!(
                    "{} {version} could not start ({reason}); version {previous} was restored",
@@ -973,6 +1012,7 @@ impl PluginHost {
            }
        }
        install::prune(&root);
+        self.settle_dependents(&id);
        self.changed();
        self.info_of(&id)
    }
@@ -1072,23 +1112,47 @@ impl PluginHost {
        if !self.state.lock().disabled.contains(id) {
            self.start(&plugin);
        }
+        // Plugins that need this one follow it: running again, or blocked while it can't run.
+        self.settle_dependents(id);
        self.changed();
        self.info_of(id)
    }

-    /// Grants or revokes one capability (Settings › Plugins › Permissions).
+    /// Revokes one exact host remembered through `net:ask`.
+    pub fn revoke_net_host(&self, id: &str, host: &str) -> IdeResult<PluginInfo> {
+        let _guard = self.lifecycle.lock();
+        let plugin = self.get(id)?;
+        self.check_not_uninstalling(&plugin)?;
+        {
+            let mut ledger = self.ledger.lock();
+            if !ledger.forget_net_host(&plugin.subject(), host) {
+                return Err(IdeError::invalid("host is not remembered for this plugin"));
+            }
+            self.save_ledger(&ledger);
+        }
+        self.stop(&plugin);
+        if !self.state.lock().disabled.contains(id) {
+            self.start(&plugin);
+        }
+        // Plugins that need this one follow it: running again, or blocked while it can't run.
+        self.settle_dependents(id);
+        self.changed();
+        self.info_of(id)
+    }
+
+    /// Grants or revokes one declared capability (Settings › Plugins › Permissions).
    /// Revoking a required one stops the plugin until consent is given again.
    pub fn set_capability(&self, id: &str, capability: &str, granted: bool) -> IdeResult<PluginInfo> {
        let _guard = self.lifecycle.lock();
        let plugin = self.get(id)?;
        self.check_not_uninstalling(&plugin)?;
        let cap: Capability = capability.parse().map_err(IdeError::invalid)?;
-        if !plugin.manifest().declares(&cap) && !plugin.meta.lock().declared_extra.contains(&cap) {
-            return Err(IdeError::invalid(format!("plugin {id:?} does not declare {cap}")));
-        }
        {
            let mut ledger = self.ledger.lock();
            let subject = plugin.subject();
+            if !plugin.manifest().declares(&cap) && !plugin.meta.lock().declared_extra.contains(&cap) {
+                return Err(IdeError::invalid(format!("plugin {id:?} does not declare {cap}")));
+            }
            if ledger.get(&subject).is_none() {
                return Err(IdeError::invalid(format!("plugin {id:?} has not been confirmed yet")));
            }
@@ -1107,6 +1171,8 @@ impl PluginHost {
        if !self.state.lock().disabled.contains(id) {
            self.start(&plugin);
        }
+        // Plugins that need this one follow it: running again, or blocked while it can't run.
+        self.settle_dependents(id);
        self.changed();
        self.info_of(id)
    }
@@ -1178,6 +1244,8 @@ impl PluginHost {
        if !self.state.lock().disabled.contains(id) {
            self.start(&plugin);
        }
+        // Plugins that need this one follow it: running again, or blocked while it can't run.
+        self.settle_dependents(id);
        self.changed();
        self.info_of(id)
    }
@@ -1286,6 +1354,7 @@ impl PluginHost {
            return Err(e.into());
        }
        self.unload(id);
+        self.reconcile();
        self.changed();
        Ok(())
    }
@@ -1432,6 +1501,20 @@ impl PluginHost {
        cancel: Option<&ide_core::CancellationToken>,
        f: impl Fn(&mut Runtime, Invocation) -> Result<R, CallError> + Clone + Send + 'static,
    ) -> IdeResult<R> {
+        self.code_call_with_budget(id, invocation, what, cancel, None, f)
+    }
+
+    fn code_call_with_budget<R: Send + 'static>(
+        &self,
+        id: &str,
+        invocation: Invocation,
+        what: &str,
+        cancel: Option<&ide_core::CancellationToken>,
+        budget: Option<Duration>,
+        f: impl Fn(&mut Runtime, Invocation) -> Result<R, CallError> + Clone + Send + 'static,
+    ) -> IdeResult<R> {
+        let deadline = budget.map(|budget| Instant::now() + budget);
+        let fallback = ide_core::CancellationToken::new();
        let plugin = self.get(id)?;
        let client = invocation.client.clone();
        {
@@ -1440,7 +1523,7 @@ impl PluginHost {
                PluginStatus::Disabled => Some(format!("plugin {id:?} is disabled")),
                PluginStatus::Static => Some(format!("plugin {id:?} has no code")),
                PluginStatus::NeedsConsent => Some(format!("plugin {id:?} is waiting for your permission")),
-                PluginStatus::Failed => {
+                PluginStatus::Failed | PluginStatus::Blocked => {
                    Some(format!("plugin {id:?} is not running: {}", meta.error.as_deref().unwrap_or("failed")))
                }
                PluginStatus::Active | PluginStatus::Inactive => None,
@@ -1472,10 +1555,25 @@ impl PluginHost {
            }
            let started = Instant::now();
            let (call, inv) = (f.clone(), invocation.clone());
-            let result = match cancel {
-                Some(cancel) => actor.call_cancellable(cancel, Duration::from_millis(50), move |rt| call(rt, inv)),
-                None => actor.call(None, move |rt| call(rt, inv)),
+            let result = match (deadline, cancel) {
+                (Some(deadline), cancel) => actor.call_bounded(
+                    cancel.unwrap_or(&fallback),
+                    Duration::from_millis(50),
+                    deadline.saturating_duration_since(Instant::now()),
+                    move |rt| call(rt, inv),
+                ),
+                (None, Some(cancel)) => {
+                    actor.call_cancellable(cancel, Duration::from_millis(50), move |rt| call(rt, inv))
+                }
+                (None, None) => actor.call(None, move |rt| call(rt, inv)),
            };
+            if deadline.is_some() && matches!(result, Err(ActorError::SoftTimeout)) {
+                self.reap(&plugin, &actor, client.as_deref());
+                return Err(IdeError::new(
+                    ide_core::error::ErrorKind::TimedOut,
+                    format!("plugin {id:?} timed out while {what}"),
+                ));
+            }
            if matches!(result, Err(ActorError::Cancelled)) {
                self.reap(&plugin, &actor, client.as_deref());
                return Err(IdeError::cancelled());
@@ -1799,6 +1897,15 @@ impl PluginHost {
                        let keys = self.shared.changed_settings(&p.pkg, client);
                        (!keys.is_empty()).then_some(WorkbenchEvent::SettingsChanged(keys))
                    }
+                    // Only the plugin that declares a point hears about its contributions.
+                    WorkbenchEvent::ExtensionsChanged(points) => {
+                        let own: Vec<String> = points
+                            .iter()
+                            .filter(|point| self.registry.point_owner(point).as_deref() == Some(p.id()))
+                            .cloned()
+                            .collect();
+                        (!own.is_empty()).then_some(WorkbenchEvent::ExtensionsChanged(own))
+                    }
                    _ => Some(e.clone()),
                })
                .collect();
@@ -2329,6 +2436,21 @@ impl PluginHost {

    /// Loads one package and starts it unless disabled. Returns the plugin id.
    fn load_dir(&self, dir: &Path, source: PluginSource, dev_root: Option<PathBuf>) -> String {
+        let (id, to_start) = self.register_dir(dir, source, dev_root);
+        if let Some(plugin) = to_start {
+            self.start(&plugin);
+        }
+        id
+    }
+
+    /// Reads one package and lists it as a plugin. Returns its id and the plugin
+    /// when it is to be started (valid, enabled, not already loaded).
+    fn register_dir(
+        &self,
+        dir: &Path,
+        source: PluginSource,
+        dev_root: Option<PathBuf>,
+    ) -> (String, Option<Arc<LoadedPlugin>>) {
        let (manifest, error) = match Manifest::load(dir) {
            Ok(m) => (m, None),
            Err(e) => {
@@ -2371,7 +2493,7 @@ impl PluginHost {
                    dir.display(),
                    existing.dir().display()
                );
-                return id;
+                return (id, None);
            }
            plugins.insert(id.clone(), plugin.clone());
        }
@@ -2380,10 +2502,10 @@ impl PluginHost {
            let mut meta = plugin.meta.lock();
            meta.status = PluginStatus::Failed;
            meta.error = Some(e);
-        } else if !self.state.lock().disabled.contains(&id) {
-            self.start(&plugin);
+            return (id, None);
        }
-        id
+        let enabled = !self.state.lock().disabled.contains(&id);
+        (id, enabled.then_some(plugin))
    }

    fn unload(&self, id: &str) {
@@ -2410,6 +2532,9 @@ impl PluginHost {
            }
            return;
        }
+        if let Some(reason) = self.blocked_reason(plugin) {
+            return self.set_blocked(plugin, &reason);
+        }
        self.registry.dispose_plugin(plugin.id());
        self.clear_provider_diagnostics(plugin.id());
        if plugin.source == PluginSource::Installed
@@ -2505,6 +2630,7 @@ impl PluginHost {
            plugin_id: plugin.id().to_owned(),
            version: plugin.manifest().version.clone(),
            granted,
+            subject: plugin.subject(),
            host: api,
            limits: self.limits,
        };
@@ -2523,6 +2649,7 @@ impl PluginHost {
                return Err(IdeError::internal(format!("plugin {:?} {e}", plugin.id())));
            }
        };
+        plugin.meta.lock().has_run_target_validation = rt.has_run_target_validation();
        let crash = match rt.activate() {
            Ok(_) => None,
            Err(CallError::Trap(e)) => Some(format!("activation {e}")),
@@ -2710,6 +2837,7 @@ impl PluginHost {
            self.refresh_pins(&ledger);
        }
        self.emit(None, PluginEvent::CommandsChanged);
+        self.flush_extension_changes();
        let languages = self.languages.revision();
        if self.announced_languages.swap(languages, Ordering::AcqRel) != languages {
            self.emit(None, PluginEvent::LanguagesChanged);
@@ -2868,6 +2996,8 @@ impl PluginHost {
    }

    fn info(&self, p: &LoadedPlugin) -> PluginInfo {
+        // Before `meta` below: this reads the other plugins' statuses.
+        let (depends, dependents, extension_points) = self.relations(p);
        let m = p.manifest();
        // The ledger before a plugin's `meta`, as everywhere (`refresh_pins` holds the
        // ledger and locks each plugin's): the other order deadlocks.
@@ -2881,6 +3011,13 @@ impl PluginHost {
                capabilities.push(CapabilityInfo::new(extra, true, granted(extra)));
            }
        }
+        // Hosts remembered through `net:ask` are grants of their own: listed
+        // separately so the user can revoke them one by one.
+        let net_hosts = grant
+            .as_ref()
+            .filter(|g| g.confirmed && g.has(&Capability::NetAsk) && m.declares(&Capability::NetAsk))
+            .map(|g| g.net_hosts.iter().cloned().collect())
+            .unwrap_or_default();
        PluginInfo {
            id: m.id.clone(),
            name: m.name.clone(),
@@ -2897,6 +3034,7 @@ impl PluginHost {
            error: meta.error.clone(),
            has_code: m.wasm.is_some(),
            capabilities,
+            net_hosts,
            contributions: self.registry.contributions(&m.id),
            activation: m.activation.iter().map(ToString::to_string).collect(),
            warnings: meta.warnings.clone(),
@@ -2905,6 +3043,9 @@ impl PluginHost {
            previous_version: (p.source == PluginSource::Installed)
                .then(|| install::previous_version(&self.plugins_dir.join(&m.id)))
                .flatten(),
+            depends,
+            dependents,
+            extension_points,
        }
    }
 }
@@ -3006,6 +3147,8 @@ fn placeholder_manifest(dir: &Path) -> Manifest {
        wasm: None,
        activation: Vec::new(),
        capabilities: Default::default(),
+        depends: Vec::new(),
+        extension_points: Vec::new(),
        contributes: Default::default(),
    }
 }
@@ -292,6 +292,7 @@ impl RemotePlugins {
            }
        };
        let host = Arc::new(PluginHost::new(data_dir.join(PLUGINS_DIR), Arc::new(sink), Limits::default())?);
+        host.set_net_hosts_session_only();
        projects.set_plugin_host(&host);
        host.set_workspace(Some(Arc::new(HostWorkspace(Arc::downgrade(projects)))));
        host.set_secret_store(Arc::new(ClientSecrets { peer: peer.clone(), runtime: projects.runtime.clone() }));
@@ -21,15 +21,6 @@ fn selector(plugin: &str, id: &str) -> String {
    format!("plugin-target:{}:{plugin}{id}", plugin.len())
 }
 impl Shared {
-    fn targets_changed(&self) {
-        if let Some(host) = self.workspace().and_then(|w| w.database_host()) {
-            for project in host.projects() {
-                project.lsp.reconfigure_soon();
-            }
-        }
-        self.sink.emit(None, PluginEvent::RunTargetsChanged);
-    }
-
    fn target_answer_file(&self, root: &Path, id: &str) -> PathBuf {
        let key = format!("{}\0{id}", root.display());
        self.data_dir.join(".run-target-answers").join(blake3::hash(key.as_bytes()).to_hex().as_str())
@@ -40,7 +31,7 @@ impl Shared {
        targets.retain(|(r, _), t| !(plugin.is_none_or(|p| p == t.plugin_id) && root.is_none_or(|path| path == r)));
        if before != targets.len() {
            drop(targets);
-            self.targets_changed();
+            self.sink.emit(None, PluginEvent::RunTargetsChanged);
        }
    }
 }
@@ -79,12 +70,12 @@ impl PluginApi {
        );
        drop(targets);
        drop(blocked);
-        self.shared.targets_changed();
+        self.shared.sink.emit(None, PluginEvent::RunTargetsChanged);
        Ok(())
    }
    pub(super) fn unregister_target(&self, root: &Path, id: &str) {
        if self.shared.run_targets.lock().remove(&(root.into(), selector(self.pkg.id(), id))).is_some() {
-            self.shared.targets_changed();
+            self.shared.sink.emit(None, PluginEvent::RunTargetsChanged);
        }
    }
 }
@@ -96,11 +87,14 @@ impl PluginHost {
    pub fn run_targets(&self, root: &Path) -> Vec<RegisteredRunTarget> {
        self.shared.run_targets.lock().iter().filter(|((r, _), _)| r == root).map(|(_, t)| t.clone()).collect()
    }
-    pub fn prepare_run_target(
+    /// Prepares a user launch, including the optional plugin validation gate.
+    pub fn prepare_run_target_launch(
        &self,
        root: &Path,
        id: &str,
        config: &ide_run::RunConfig,
+        operation: ide_plugin::RunTargetOperation,
+        cancel: &ide_core::CancellationToken,
    ) -> IdeResult<ide_run::RunConfig> {
        if !self.shared.workspace().is_some_and(|w| w.trusted(root)) {
            return Err(IdeError::new(ide_core::error::ErrorKind::PermissionDenied, "project is not trusted"));
@@ -113,7 +107,47 @@ impl PluginHost {
            .cloned()
            .ok_or_else(|| IdeError::not_found("plugin run target is no longer available"))?;
        let program = self.program_for_project(&target.plugin_id, &target.target.program, Some(root))?;
-        ide_remote::plugin_target::prepare(root, &target.target, &program, config)
+        let wrapped = ide_remote::plugin_target::prepare(root, &target.target, &program, config)?;
+        if self.get(&target.plugin_id)?.meta.lock().has_run_target_validation {
+            if cancel.is_cancelled() {
+                return Err(IdeError::cancelled());
+            }
+            let info = ide_plugin::RunTargetLaunch {
+                operation,
+                program: ide_run::wrap::program_name(&config.command),
+                cwd: wrapped.cwd.as_ref().unwrap().to_string_lossy().into_owned(),
+            };
+            let project_root = root.to_path_buf();
+            let invocation =
+                ide_plugin::Invocation { workspace_root: Some(project_root.clone()), ..Default::default() };
+            let (target_id, timeout) = (target.target.id.clone(), self.limits.timeout);
+            let result = self.code_call_with_budget(
+                &target.plugin_id,
+                invocation,
+                "validating the run target",
+                Some(cancel),
+                Some(timeout),
+                move |rt, _| {
+                    rt.validate_run_target(
+                        project_root.to_string_lossy().into_owned(),
+                        target_id.clone(),
+                        info.clone(),
+                        timeout,
+                    )
+                },
+            );
+            match result {
+                Ok(Ok(())) => {}
+                Ok(Err(message)) => return Err(IdeError::invalid(format!("{}: {message}", target.plugin_name))),
+                Err(error) if error.kind == ide_core::error::ErrorKind::Cancelled => return Err(error),
+                Err(error) => return Err(IdeError::unavailable(format!("{}: {error}", target.plugin_name))),
+            }
+            if cancel.is_cancelled() {
+                return Err(IdeError::cancelled());
+            }
+            self.program_for_project(&target.plugin_id, &target.target.program, Some(root))?;
+        }
+        Ok(wrapped)
    }
 }

@@ -43,6 +43,9 @@ pub enum PluginStatus {
    NeedsConsent,
    /// Failed to load, or failed repeatedly and was stopped for this session (see `error`).
    Failed,
+    /// A plugin it requires is missing, disabled, the wrong version or cannot run
+    /// (`error` says which); it starts when that is resolved.
+    Blocked,
 }

 impl PluginStatus {
@@ -72,6 +75,9 @@ pub struct PluginInfo {
    pub has_code: bool,
    /// Declared capabilities with risk and grant state.
    pub capabilities: Vec<CapabilityInfo>,
+    /// HTTPS hosts the user allowed through `net:ask` ("always allow"),
+    /// none of them declared by the manifest; each can be revoked.
+    pub net_hosts: Vec<String>,
    /// What it contributes while live (point + label).
    pub contributions: Vec<ContributionInfo>,
    /// `activation` events of the manifest.
@@ -84,6 +90,45 @@ pub struct PluginInfo {
    pub publisher: Option<String>,
    /// The version an update replaced, to roll back to.
    pub previous_version: Option<String>,
+    /// `[[depends]]`, each with how it stands now.
+    pub depends: Vec<DependencyInfo>,
+    /// Plugins that need this one, directly or through others.
+    pub dependents: Vec<DependentInfo>,
+    /// `[[extension-points]]` this plugin declares while it is live.
+    pub extension_points: Vec<ExtensionPointInfo>,
+}
+
+/// A plugin another one requires.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct DependencyInfo {
+    pub id: String,
+    /// The installed plugin's name, when it is installed.
+    pub name: Option<String>,
+    /// The requirement as written (`^0.2`).
+    pub version: Option<String>,
+    pub optional: bool,
+    pub state: ide_extension::DependencyState,
+}
+
+/// A plugin that needs another one.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct DependentInfo {
+    pub id: String,
+    pub name: String,
+    /// Switched off by the user: disabling the plugin it needs changes nothing for it.
+    pub enabled: bool,
+}
+
+/// An extension point a plugin declared.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[serde(rename_all = "camelCase")]
+pub struct ExtensionPointInfo {
+    pub id: String,
+    pub description: String,
+    /// Plugin ids contributing to it now.
+    pub contributors: Vec<String>,
 }

 #[derive(Clone, Copy, Debug, Default, Serialize, Deserialize, Type)]