Merge remote-tracking branch 'origin/main' into fix/agents-shift-selection

# Conflicts:
#	src/features/agents/AgentsView.tsx

.agents/skills/issue-fix/SKILL.md

@@ -1,91 +0,0 @@
----
-name: issue-fix
-description: Triage and fix a GitHub issue (or a user-reported bug) end to end — reproduce, find the root cause, generalise it to every sibling case, fix the class rather than the instance, verify, and open one PR. Use when given an issue URL/number or asked to fix a reported bug and open a PR ("看看这个 issue", "修一下这个 bug", "提 pr").
----
-
-# Fix an issue: from one case to the whole class
-
-The reported case is one sample of a defect class. A fix that only makes the
-screenshot go away is not done: the next question is always "does this break for other
-languages / platforms / entry points too?". Answer that before anyone asks.
-
-## 1. Read and reproduce
-
-- `gh issue view <n> --comments` (repo `l0ng-ai/openidea`). Read attached logs/screenshots
-  closely: OS, language, toolchain versions, exact error text.
-- Locate the code path and confirm the claim in code, with `file:line` evidence.
-  Say plainly whether it is a real bug, a missing feature, or user environment.
-- Reproduce locally when possible (`fixtures/` projects, `/verify` for runtime). If the
-  reporter's platform (often Windows/Linux) can't be reproduced here, say so up front.
-- Do not ask for a generic environment/log checklist before trying the flow and inspecting the code.
-  Record the attempt and result; ask only for a fact that actually blocks the next diagnostic step.
-  Missing fields, limited time, or unavailable automation are not by themselves reasons to ask the reporter.
-- Treat a maintainer-confirmed bug as an investigation task even if local reproduction fails. Distinguish
-  “not reproduced here” from “not a bug”, and do not require the reporter to prove its existence again.
-
-## 2. Name the root cause as a class
-
-Write one sentence of the form "<mechanism> is missing/wrong, so any <X> hits it",
-not "<this button> is broken". Typical classes in this codebase:
-
-- Per-language config handled for one language only (`languages/*.toml`, `ide-sdk`).
-- Platform gaps: paths, executables, shells, `.cmd`/`.exe`, separators — macOS-only code.
-- Toolchain/version discovery: one probe location, no version check, no rescan.
-- Two features each implementing half a flow and never joined (feature isolation →
-  should go through an action/service).
-- State not reset on project switch / window reuse; events not scoped per window.
-- Failure surfaced as raw stderr/stack trace or retried until "crashed" instead of a
-  clear status with an action.
-- UI: same primitive styled differently in N places.
-
-## 3. Sweep for siblings
-
-Search systematically, not by memory:
-
-- Same pattern elsewhere: `git grep` the function, the config key, the error string,
-  the hard-coded path/flag. Check every `languages/*.toml` entry and every platform branch.
-- Same flow for other languages/runtimes (Java ↔ Kotlin/Gradle, Python ↔ venv/uv,
-  Node ↔ Deno/Bun, Go, Rust …): would they fail the same way?
-- Other callers/entry points of the same flow (menu, context menu, gutter, shortcut, CLI arg).
-- Neighbouring failure modes of the same mechanism (not installed / wrong version /
-  installed but crashes / slow start / installed mid-session).
-  For broad sweeps spawn one Explore agent with the class description, not the instance.
-
-## 4. Decide the fix at the right altitude
-
-- Fix the mechanism once (shared helper, action, config hook) so siblings are fixed
-  by construction; don't patch each call site.
-- Respect `AGENTS.md` rules (crate boundaries, no cross-feature imports, `IdeResult`,
-  UTF-16). If the right fix breaks a rule, pick the rule-respecting design and say why.
-- Compare with how established IDEs solve it when relevant; prefer the established answer.
-- Present: root cause, sibling table, proposed fix, what's deferred. When the user leaves
-  the choice to you, go ahead without asking again.
-
-## 5. Implement and test the class
-
-- Tests cover the class: table-driven over languages/platforms/states, not just the
-  reported input. Include the reporter's case verbatim.
-- Run the scoped checks (`pnpm vitest run <path>`, `cargo nextest run -p <crate>`), then
-  `/verify` in the app for UI or runtime behaviour.
-
-## 6. PR
-
-- One branch `fix/<slug>`, one PR unless the user asks otherwise; `Fixes #<n>` in the body.
-- Don't stage untracked IDE-state dirs (`.ideal/`, `.openidea/`) or screenshots.
-- PR body follows `.github/pull_request_template.md`: `Closes #<n>`, then
-  **What and why** (user-visible change + root cause at class level, 2–4 sentences),
-  **How it was verified** (commands run and results, siblings fixed/deferred, what could break and how
-  it was checked, what was not verified, e.g. "Windows not tested"; for UI changes the before/after
-  screenshot paths from `/verify`), **Review focus** (optional). Short and plain.
-
-## Report format
-
-Reply in the user's language:
-
-```
-Root cause: <one sentence, class level>
-Sibling sweep:
-| Location / case | Affected? | Action |
-Fixed / not covered (why) / not verified (platform)
-PR: <url>
-```

.agents/skills/verify/SKILL.md

@@ -1,57 +0,0 @@
----
-name: verify
-description: Build, launch and drive the OpenIDEA desktop app through the Tauri MCP bridge to verify a change at runtime.
----
-
-# Verify OpenIDEA in the running app
-
-## Launch
-
-- Run the app from the worktree that holds the change: `pnpm tauri dev` in the background, logging
-  into your task's scratch subdirectory. Use `pnpm dev:app` instead when your checks call
-  `window.__TAURI__` from `execute_js`. The wrapper gives each worktree its own app identity, data,
-  settings and Vite port, so other worktrees and the installed app don't interfere. If it reports a
-  session already running for this worktree, reuse that one.
-- Once the app is up, `pnpm dev:status` lists this worktree's MCP bridges. Pass the reported
-  `appIdentifier` (the port) on every `mcp__tauri__*` call. The MCP server is shared between
-  sessions: never `driver_session stop` without an `appIdentifier`, and re-check `document.title` /
-  `location.href` before acting if anything looks off.
-- Make sure the binary contains the change: a session already running for this worktree may be an
-  older build. Restart it after Rust changes; frontend changes reload through Vite.
-- After the app restarts, `driver_session start` again for your port (a stale session says "Already connected").
-- If the `pnpm tauri dev` process exits while the app window stays open, Vite is gone and any webview
-  reload shows an empty `#root`. Stop that app and start the session again.
-- Stop everything you started when done and nothing else; never use process-name kills.
-
-## Driving
-
-- `manage_window focus` before screenshots / timing-sensitive steps: a background window throttles timers
-  (debounced LSP / VCS refreshes stall, `setTimeout` promises in `execute_js` time out) and native
-  screenshots come back black.
-- Settings is a separate native window `settings-main`; pass `windowId`, focus it before screenshotting.
-- CodeMirror / xterm ignore MCP `type`. Focus the element, then `document.execCommand('insertText', false, text)`.
-  For xterm Enter, dispatch a `keydown` (`key: 'Enter', keyCode: 13`) on `.xterm-helper-textarea`.
-- MCP clicks arrive with `event.detail === 0`; CodeMirror treats them as line-select clicks. Set the caret
-  through the view instead: `document.querySelector('.cm-content').cmTile.view`.
-- MCP `text` strategy can resolve to a hidden node; prefer coordinates (CSS px = image px × 0.9) or CSS selectors.
-- CSS-module edits often trigger a full page reload in dev: dialogs close, Run sessions and terminal
-  scrollback reset, and each reload spawns a fresh shell. Re-open what you were testing.
-
-## Evidence
-
-- For UI or interaction changes, capture `before.png` (on `main` or with the fix reverted) and
-  `after.png` at the same state and window size, into your task's scratch subdirectory. Multi-step
-  flows: a numbered series (`after-1.png`, `after-2.png`, ...).
-- Report the absolute paths; they go into the PR's **How it was verified** section and the triage
-  acceptance entry. Never commit screenshots to the feature branch.
-
-## Fixture
-
-`fixtures/` has sample projects (go-app, rust-app, ts-app, kotlin-gradle, polyglot). Copy one into
-your scratch directory before editing it, and don't commit the IDE state it creates (`.openidea/`).
-
-## Flows worth driving
-
-⌘⇧O Goto File · ⌘⇧F Find in Files (preview scroll + highlight) · ⌘⇧A Find Action · editor edit/undo/autosave ·
-Terminal (Unicode, venv) · Commit view at the default narrow width · Problems · Run → Stop · Project view
-New / Delete (nested `a/b.txt` names) · ⌘, Settings search (+ Keymap filter) · Git Log on a repo without commits.

.claude/skills/issue-fix

@@ -1 +0,0 @@
-../../.agents/skills/issue-fix

.claude/skills/verify

@@ -1 +0,0 @@
-../../.agents/skills/verify

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,75 +0,0 @@
-name: Bug report
-description: Something in OpenIDEA doesn't work as expected
-labels: [bug]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for reporting! Keep logs and error messages exactly as they appear.
-
-        One problem per issue, please. If you have several, open one issue for each.
-  - type: checkboxes
-    id: checks
-    attributes:
-      label: Before you start
-      options:
-        - label: I searched [existing issues](https://github.com/l0ng-ai/openidea/issues?q=is%3Aissue) and this hasn't been reported yet.
-          required: true
-        - label: I'm on the [latest release](https://github.com/l0ng-ai/openidea/releases/latest), or I noted below that I can't update.
-          required: true
-  - type: textarea
-    id: environment
-    attributes:
-      label: Environment
-      description: |
-        Open **About OpenIDEA** (macOS: OpenIDEA menu; Windows/Linux: Help menu), click **Copy Info**, and paste it here. Also mention the project type if it matters (e.g. Gradle multi-module, Spring Boot, Go workspace) and whether you use remote development.
-      render: text
-      placeholder: |
-        About OpenIDEA
-        Version: 0.1.33
-        Build: ...
-        Platform: macOS aarch64
-    validations:
-      required: true
-  - type: textarea
-    id: steps
-    attributes:
-      label: Steps to reproduce
-      description: Start from opening OpenIDEA or a project. A small sample project or snippet helps a lot.
-      placeholder: |
-        1. Open a Gradle project whose settings.gradle includes modules in a loop
-        2. Open the Gradle tool window
-        3. ...
-    validations:
-      required: true
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Minimal reproduction
-      description: A link to a small public repository, or the smallest files/snippet that trigger the problem. Optional, but it's the fastest way to get a fix.
-      placeholder: https://github.com/you/repro-project
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected behavior
-    validations:
-      required: true
-  - type: textarea
-    id: actual
-    attributes:
-      label: Actual behavior
-      description: What happened instead. Screenshots or a recording are welcome.
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Logs
-      description: |
-        Use **Help → Show Log in Finder / Explorer / Files** to find `openidea.log` and paste the lines around the problem, or attach the file. Include console output or error messages too. Check for tokens or passwords before posting.
-      render: text
-  - type: textarea
-    id: extra
-    attributes:
-      label: Additional context
-      description: Anything else, such as whether it worked in an earlier version.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-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.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,48 +0,0 @@
-name: Feature request
-description: Suggest a new feature or an improvement
-labels: [enhancement]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        One request per issue, please.
-  - type: checkboxes
-    id: checks
-    attributes:
-      label: Before you start
-      options:
-        - label: I searched [existing issues](https://github.com/l0ng-ai/openidea/issues?q=is%3Aissue) and this hasn't been requested yet.
-          required: true
-  - type: textarea
-    id: problem
-    attributes:
-      label: Problem
-      description: What are you trying to do, and what gets in the way today?
-    validations:
-      required: true
-  - type: textarea
-    id: proposal
-    attributes:
-      label: Proposed solution
-      description: How you'd like it to work. Mockups or examples from other tools are welcome.
-    validations:
-      required: true
-  - type: textarea
-    id: acceptance
-    attributes:
-      label: Acceptance criteria
-      description: How we'll know it's done. One observable behavior per line.
-      placeholder: |
-        - [ ] Right-clicking a test class shows "Run with Coverage"
-        - [ ] Coverage results open in the Coverage tool window
-    validations:
-      required: true
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Alternatives and workarounds
-      description: Other approaches you considered, or what you do now instead.
-  - type: textarea
-    id: extra
-    attributes:
-      label: Additional context

.github/pull_request_template.md

@@ -1,17 +0,0 @@
-Closes #
-
-## What and why
-
-<!-- 2–4 sentences: the change a user notices, and the root cause.
-     If it doesn't fit, the PR is probably too big; split it. -->
-
-## How it was verified
-
-<!-- Required. Commands you actually ran and their results; what else this could
-     affect and how you checked it still works.
-     UI changes: before/after screenshots. Multi-step interactions: a recording.
-     Backend changes: logs or command output. -->
-
-## Review focus
-
-<!-- Optional: anything you want reviewers to look at closely. -->

.github/workflows/ci.yml

@@ -3,8 +3,6 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main]
-    types: [opened, synchronize, reopened]
   workflow_dispatch:
 
 concurrency:
@@ -71,66 +69,6 @@ jobs:
       - run: cargo build --locked -p ide-host --bin openidea-server --target x86_64-unknown-linux-musl
       - run: target/x86_64-unknown-linux-musl/debug/openidea-server --version
 
-  # The plugin SDK, the official plugins and the test fixtures build in their
-  # own workspaces (the root excludes them), so the jobs above don't see them.
-  plugins:
-    name: Plugins (SDK, official, fixtures)
-    runs-on: ubuntu-22.04
-    env:
-      CARGO_TARGET_DIR: ${{ github.workspace }}/target-plugins
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-        with: { targets: wasm32-wasip2, components: "clippy, rustfmt" }
-      - uses: Swatinem/rust-cache@v2
-        with:
-          key: plugins
-          cache-directories: target-plugins
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-      - name: Format, lint (host and wasm) and test each crate
-        shell: bash
-        run: |
-          set -euo pipefail
-          for dir in sdk/rust/openidea-plugin plugins/official/*/ crates/ide-plugin/tests/fixtures/*/; do
-            [ -f "$dir/Cargo.toml" ] || continue
-            echo "::group::$dir"
-            cargo fmt --check --manifest-path "$dir/Cargo.toml"
-            cargo clippy --locked --all-targets --manifest-path "$dir/Cargo.toml" -- -D warnings
-            cargo clippy --locked --target wasm32-wasip2 --manifest-path "$dir/Cargo.toml" -- -D warnings
-            cargo test --locked --manifest-path "$dir/Cargo.toml"
-            echo "::endgroup::"
-          done
-      - uses: pnpm/action-setup@v4
-        with: { version: 11 }
-      - uses: actions/setup-node@v4
-        with: { node-version: 22 }
-      # Plugin web pages (`web-src/`, their own pnpm projects): typecheck and test.
-      - name: Web pages typecheck and test
-        shell: bash
-        run: |
-          set -euo pipefail
-          for dir in plugins/official/*/web-src/; do
-            [ -f "$dir/package.json" ] || continue
-            echo "::group::$dir"
-            pnpm --dir "$dir" install --frozen-lockfile --ignore-workspace
-            pnpm --dir "$dir" exec tsc --noEmit
-            pnpm --dir "$dir" test
-            echo "::endgroup::"
-          done
-      # The host's tests run the checked-in components: they must be built from these sources.
-      # Web pages aren't checked in: this builds them and checks the result.
-      - name: Checked-in components are up to date, web pages build
-        run: plugins/build.sh --check
-
-  deny:
-    name: Cargo deny
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: taiki-e/install-action@cargo-deny
-      - run: cargo deny check
-
   frontend:
     name: Frontend
     runs-on: ubuntu-22.04
@@ -144,7 +82,6 @@ jobs:
       - run: pnpm typecheck
       - run: pnpm lint
       - run: pnpm format:check
-      - run: pnpm knip
       - run: pnpm test
       - run: pnpm build
 

.github/workflows/pr-check.yml

@@ -1,69 +0,0 @@
-name: PR check
-on:
-  # pull_request_target so the check can label PRs from forks. It never checks out
-  # or runs PR code: it only reads the PR title and description.
-  pull_request_target:
-    types: [opened, edited, reopened, ready_for_review]
-
-permissions:
-  issues: write
-  pull-requests: write
-
-concurrency:
-  group: pr-check-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
-
-jobs:
-  check:
-    if: github.event.pull_request.user.type != 'Bot' && !github.event.pull_request.draft
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v7
-        with:
-          script: |
-            const pr = context.payload.pull_request;
-            const LABEL = 'needs-info';
-            const MARKER = '<!-- pr-check -->';
-            // Docs, CI and pure refactors may skip the linked issue.
-            const NO_ISSUE_TYPES = /^(docs|ci|build|chore|refactor|style|test)(\(.+\))?!?:/;
-
-            const body = (pr.body || '').replace(/<!--[\s\S]*?-->/g, '');
-            const problems = [];
-
-            const linksIssue =
-              /\b(close[sd]?|fix(e[sd])?|resolve[sd]?)\s*:?\s+(#\d+|https:\/\/github\.com\/[\w.-]+\/[\w.-]+\/issues\/\d+)/i.test(body);
-            if (!linksIssue && !NO_ISSUE_TYPES.test(pr.title)) {
-              problems.push('Link the issue this PR resolves, e.g. `Closes #123`.');
-            }
-
-            const verified = body.match(/^##+\s*How it was verified\s*$([\s\S]*?)(?=^##+\s|(?![\s\S]))/im);
-            if (!verified || !verified[1].trim()) {
-              problems.push('Fill in **How it was verified**: the commands you ran and their results. UI changes need before/after screenshots.');
-            }
-
-            const { owner, repo } = context.repo;
-            const issue_number = pr.number;
-            const comments = await github.paginate(github.rest.issues.listComments, { owner, repo, issue_number });
-            const existing = comments.find(c => c.user.type === 'Bot' && c.body.includes(MARKER));
-            const labeled = pr.labels.some(l => l.name === LABEL);
-
-            if (problems.length) {
-              const text = `${MARKER}\nThanks for the PR. Before review, please update the description (see [CONTRIBUTING.md](https://github.com/${owner}/${repo}/blob/main/CONTRIBUTING.md)):\n\n${problems.map(p => `- ${p}`).join('\n')}\n\nThis check reruns when you edit the description.`;
-              if (existing) {
-                await github.rest.issues.updateComment({ owner, repo, comment_id: existing.id, body: text });
-              } else {
-                await github.rest.issues.createComment({ owner, repo, issue_number, body: text });
-              }
-              if (!labeled) {
-                await github.rest.issues.addLabels({ owner, repo, issue_number, labels: [LABEL] });
-              }
-              return;
-            }
-
-            // Only undo what this check did: the label is cleared only when our comment exists.
-            if (existing) {
-              await github.rest.issues.deleteComment({ owner, repo, comment_id: existing.id });
-              if (labeled) {
-                await github.rest.issues.removeLabel({ owner, repo, issue_number, name: LABEL }).catch(() => {});
-              }
-            }

.github/workflows/release.yml

@@ -70,12 +70,6 @@ jobs:
           - 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
@@ -180,69 +174,6 @@ jobs:
           if command -v sha256sum >/dev/null; then sha256sum "$ASSET"; else shasum -a 256 "$ASSET"; fi > "$ASSET.sha256"
           gh release upload "$TAG" "$ASSET" "$ASSET.sha256" --clobber
 
-  # The official plugins, signed, and the marketplace index released apps read
-  # (releases/latest/download/plugins-index.json). They are not in the
-  # installers: users install them from Settings › Plugins. Without the
-  # signing key (secret PLUGIN_SIGNING_KEY: the file `openidea-plugin keygen`
-  # writes) nothing is published and the release goes on.
-  plugins:
-    needs: create-release
-    name: Official plugins
-    runs-on: ubuntu-22.04
-    env:
-      SIGNING_KEY: ${{ secrets.PLUGIN_SIGNING_KEY }}
-    steps:
-      - id: key
-        run: |
-          if [ -z "$SIGNING_KEY" ]; then
-            echo "::warning::PLUGIN_SIGNING_KEY is not set: the official plugins are not published"
-            echo "skip=true" >> "$GITHUB_OUTPUT"
-          fi
-      - uses: actions/checkout@v4
-        if: steps.key.outputs.skip != 'true'
-        with: { ref: "${{ env.TAG }}" }
-      - uses: dtolnay/rust-toolchain@stable
-        if: steps.key.outputs.skip != 'true'
-        with: { targets: wasm32-wasip2 }
-      - uses: Swatinem/rust-cache@v2
-        if: steps.key.outputs.skip != 'true'
-        with: { key: release-plugins }
-      - uses: pnpm/action-setup@v4
-        if: steps.key.outputs.skip != 'true'
-        with: { version: 11 }
-      - uses: actions/setup-node@v4
-        if: steps.key.outputs.skip != 'true'
-        with: { node-version: 22 }
-      # Builds the web pages; fails when a checked-in component isn't built from these sources.
-      - name: Build
-        if: steps.key.outputs.skip != 'true'
-        run: |
-          plugins/build.sh --check
-          cargo build --release --locked -p ide-host --bin openidea-plugin
-      - name: Pack, index and upload
-        if: steps.key.outputs.skip != 'true'
-        shell: bash
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          set -euo pipefail
-          tool="$PWD/target/release/openidea-plugin"
-          key="$RUNNER_TEMP/openidea.key"
-          out="$RUNNER_TEMP/market"
-          (umask 077 && printf '%s' "$SIGNING_KEY" > "$key")
-          trap 'rm -f "$key"' EXIT
-          mkdir -p "$out"
-          for dir in plugins/official/*/; do
-            id="$(sed -n 's/^id *= *"\(.*\)".*/\1/p' "$dir/plugin.toml" | head -1)"
-            version="$(sed -n 's/^version *= *"\(.*\)".*/\1/p' "$dir/plugin.toml" | head -1)"
-            "$tool" pack "$dir" --key "$key" --publisher openidea --out "$out/$id-$version.oiplugin"
-          done
-          # The published index's revocations and earlier keys carry over.
-          curl -fsSL "https://github.com/$GITHUB_REPOSITORY/releases/latest/download/plugins-index.json" \
-            -o "$out/plugins-index.json" || rm -f "$out/plugins-index.json"
-          "$tool" index "$out" --publisher openidea --name OpenIDEA --key "$key" --out "$out/plugins-index.json"
-          gh release upload "$TAG" "$out"/*.oiplugin "$out/plugins-index.json" --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:
@@ -265,16 +196,11 @@ jobs:
             }
             // 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"]],
             ];
@@ -306,7 +232,7 @@ jobs:
             core.info(`latest.json: ${Object.keys(platforms).sort().join(", ")}`);
 
   publish:
-    needs: [create-release, build, server, plugins, updater-manifest]
+    needs: [create-release, build, server, updater-manifest]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/github-script@v7

.gitignore

@@ -10,9 +10,6 @@ lerna-debug.log*
 node_modules
 dist
 dist-ssr
-# Plugin components are checked in (plugins/build.sh --check keeps them current).
-!plugins/official/*/dist
-!crates/ide-plugin/tests/fixtures/*/dist
 *.local
 
 # Editor directories and files
@@ -33,13 +30,9 @@ target/
 test-results/
 playwright-report/
 
-# Local AI agent files. Shared skills live in .agents/skills; .claude/skills links to them.
-CLAUDE.local.md
-.claude/*
-!.claude/skills/
-.claude/skills/*
-!.claude/skills/verify
-!.claude/skills/issue-fix
+# Local AI agent files
+CLAUDE.md
+.claude/
 
 # Local reference screenshots
 pycharm-screenshots/

.oxfmtrc.json

@@ -9,14 +9,10 @@
     "dist",
     "target",
     "src/bindings.ts",
-    "src/editor/core/cm/angular/parser*.ts",
-    "src/editor/core/cm/jsp/parser*.ts",
     "docs/plugins/themes.md",
     "pnpm-lock.yaml",
     "**/*.toml",
     "fixtures",
-    "plugins/*/web",
-    "plugins/official/*/web",
     "crates/**/tests/fixtures"
   ],
   "overrides": [

.oxlintrc.json

@@ -13,7 +13,6 @@
     "src-tauri",
     "crates",
     "src/bindings.ts",
-    "src/editor/core/cm/angular/parser*.ts",
     "fixtures",
     "plugins",
     "test-results",

AGENTS.md

@@ -1,118 +0,0 @@
-# OpenIDEA — contributor guide
-
-Rust + Tauri 2 desktop IDE with full-featured, multi-language code intelligence.
-Visual style: dark, low-contrast greys, one cool accent
-(`src/styles/tokens.css` is the source of truth for colours and metrics).
-
-## Layout
-
-- `crates/ide-*` — backend crates; one domain each. Depend on `ide-core` for shared
-  types; never reach into another crate's internals.
-- `src-tauri/` — glue only: `state.rs` (AppState / Project), `commands/<domain>.rs`
-  (thin typed IPC adapters), `events.rs`. No domain logic here.
-- `src/bindings.ts` — generated by tauri-specta (`pnpm gen:bindings`). Never edit.
-- `src/platform/` — ipc (`call`, `onIdeEvent`, `nextRequestId`), actions registry,
-  keymap + dispatcher, context keys / `when` clauses, project store.
-- `src/workbench/contributions.ts` — extension points (tool windows, status items,
-  overlays, editor kinds) and cross-feature services (editor, tool windows, notifications).
-- `src/ui/` — design-system primitives. `src/features/<name>/` — one feature each,
-  exporting `activate()` registered in `src/features/index.ts`.
-- `languages/<id>.toml` — language definitions (detection, comments, LSP, DAP).
-- `crates/ide-host` — the `openidea-server` binary for remote development.
-- `wit/` — plugin interface definitions; `plugins/` — sample and bundled plugins;
-  `templates/` — plugin starter templates.
-- `e2e/` — Playwright UI tests (`pnpm e2e`). `fixtures/` — sample projects per language
-  for manual and automated testing.
-
-## Rules
-
-- IPC coordinates: 0-based lines, **UTF-16** columns/offsets everywhere (`ide-core::text`).
-- Every command returns `IdeResult<T>`; convert internal errors at the crate edge.
-- Streaming → `tauri::ipc::Channel<T>`; cancellable → UI-allocated `RequestId` +
-  `cancel_request`. Backend → UI notifications → `IdeEvent` via `EventSink`.
-- Long work never blocks the UI thread or a Tauri command thread: use
-  `spawn_blocking`/rayon, honour `CancellationToken`.
-- Frontend features never import each other; communicate via actions, contributions
-  and services. All user-invocable behaviour is an action with a stable id; default
-  shortcuts live in `src/platform/keymaps/`.
-- Styling: CSS Modules + tokens only (no hex literals in components). Inline SVG
-  icons from `src/ui/icons.tsx`, never emoji. Real `<button>`/`<input>`; `aria-label` on icon buttons.
-- User-visible text goes through the text catalog: add every new string to both
-  `src/platform/locales/text/en.json` and `zh.json` (`textCatalog.test.ts` enforces it).
-- Keep comments sparse and purposeful; match surrounding style.
-- For GUI verification, prefer Tauri MCP; use Computer Use only when Tauri MCP is
-  unavailable or cannot cover the required checks.
-
-## Issues & PRs
-
-Follow `CONTRIBUTING.md` and `.github/pull_request_template.md`: one issue per PR with
-`Closes #<n>`, reproduce first, keep the diff focused, short plain description, and a
-**How it was verified** section with commands run, results and (for UI) before/after screenshots.
-Unclear product decisions → `needs-decision` and stop.
-
-## Skills
-
-Shared agent skills live in `.agents/skills/` (`.claude/skills/` links to them):
-`verify` drives the running app through Tauri MCP and captures screenshot evidence;
-`issue-fix` takes an issue from reproduction to one PR.
-
-## Commands
-
-- `pnpm tauri dev` — run the app with worktree isolation (Node 22.18+).
-  `pnpm dev:app` also enables the global Tauri API. `pnpm dev:status` reports
-  this worktree's running MCP bridges and actual ports.
-- `pnpm build` — typecheck + bundle frontend.
-- `cargo nextest run --workspace` (or `cargo test`), `cargo clippy --workspace --all-targets -- -D warnings`, `cargo fmt --all`.
-- `pnpm test`, `pnpm e2e`, `pnpm lint`, `pnpm format:check`, `pnpm knip`, `pnpm typecheck`,
-  `pnpm gen:bindings`.
-- `pnpm perf` (UI interaction latency / frames / leaks), `pnpm perf:rust` (criterion
-  benches vs budgets). Budgets: `perf/budgets.json`.
-
-## Before opening a PR
-
-Run what CI runs for the parts you touched:
-
-- Rust: `cargo fmt --all --check`, `cargo clippy --workspace --all-targets -- -D warnings`,
-  `cargo nextest run --workspace`. After changing IPC types, run `pnpm gen:bindings` and
-  commit `src/bindings.ts`; CI fails if it differs.
-- Frontend: `pnpm typecheck`, `pnpm lint`, `pnpm format:check`, `pnpm knip`, `pnpm test`,
-  `pnpm build`, and `pnpm e2e` for UI flows.
-- UI or runtime behaviour: verify in the running app (`.agents/skills/verify`).
-
-## Pitfalls
-
-- Run a subset of frontend tests with `pnpm vitest run <path>`. `pnpm test -- <path>` ignores
-  the filter and runs the whole suite, which takes several minutes.
-- Don't run clippy while iterating: `pnpm tauri dev` compiles anyway. Run
-  `cargo fmt --all` + `cargo clippy -p <crate> --all-targets -- -D warnings` once, right
-  before committing. A cold build cache can take around 5 minutes. Run long checks one at
-  a time, not chained in one shell call that may hit the 10-minute tool timeout.
-- `pnpm tauri dev` does a full debug build. Clippy only checks the code, so a passing clippy
-  doesn't make the first launch fast.
-
-## Parallel worktrees
-
-Several worktrees can be developed and run side by side.
-
-- Create one per task: `git worktree add ../<name> -b <branch> origin/main`, then
-  `pnpm install` in it.
-- Launch with `pnpm tauri dev` / `pnpm dev:app`, not the raw `pnpm exec tauri dev` CLI. The
-  wrapper starts Vite on a worktree-derived port (advancing if occupied), passes its actual
-  URL to Tauri, and reports an existing launcher instead of starting another for the same
-  worktree. HMR uses the Vite port.
-- Debug app identity, data, settings, logs and single-instance scope follow the canonical
-  worktree path captured at build time, independent of launch cwd. Launching the same debug
-  binary again focuses its existing instance and forwards its path argument. Different
-  worktrees and the installed release can coexist. `--release` uses normal release identity
-  and bypasses the development wrapper.
-- MCP bridge ports are dynamic (9223–9322). Use `pnpm dev:status`, connect to the reported
-  port, verify identifier/cwd, and pass `appIdentifier: <port>` explicitly. Do not assume the
-  default MCP session belongs to this worktree.
-- Keep each worktree's Cargo output directory separate; do not point `CARGO_TARGET_DIR` or
-  `target` symlinks at a shared directory.
-- Each worktree's first build is cold (around 5 minutes) and its Cargo output takes
-  15–30 GB. Avoid running several heavy builds on one machine at the same time.
-- Stop only processes started for the current worktree/session. Never use broad
-  process-name kills such as `pkill openidea`.
-- When done: stop that worktree's app and dev session, delete its build output, then
-  `git worktree remove ../<name>`.

CLAUDE.md

@@ -1 +0,0 @@
-AGENTS.md

CONTRIBUTING.md

@@ -1,35 +0,0 @@
-# Contributing to OpenIDEA
-
-These rules apply to everyone, and to any coding agent working on their behalf.
-Project layout, coding rules, commands and checks are in [AGENTS.md](AGENTS.md).
-
-## Issues
-
-- One problem or request per issue. Use the issue forms.
-- Bugs: steps that reproduce the problem from a fresh start. A minimal sample
-  project is the fastest way to get a fix.
-- Features: state the problem and the acceptance criteria. A feature is ready to
-  build once a maintainer labels it `planned`.
-- Labels track status: `needs-info` waits on the reporter, `needs-decision` waits
-  on a maintainer, `planned` is accepted, `needs-acceptance` has a fix waiting to be
-  checked.
-
-## Pull requests
-
-- One issue per PR, linked with `Closes #123`. Feature PRs need a `planned` issue.
-  Docs, CI and pure refactors may skip the issue.
-- Reproduce the problem first, or write a test that fails before the fix.
-- Fix the cause, and check whether the same cause breaks anything nearby.
-- Keep the diff focused. Unrelated refactors go in their own PR.
-- Title: [Conventional Commits](https://www.conventionalcommits.org/), e.g.
-  `fix(editor): keep the caret visible after folding`.
-- Fill in the template. Keep the description short and in plain words. If it
-  doesn't fit in a few sentences, the PR is probably too big.
-- **How it was verified** is required: the commands you ran and their results,
-  and what else the change could affect. UI changes need before/after screenshots;
-  multi-step interactions need a recording.
-- If a change needs a product decision you can't make, ask in the issue and stop
-  rather than guessing.
-
-A check on each PR adds `needs-info` when the issue link or the verification
-section is missing, and removes it once they're filled in.

Cargo.toml

@@ -1,11 +1,9 @@
 [workspace]
 resolver = "3"
 members = ["crates/*", "src-tauri"]
-# Plugins and the guest SDK build for wasm32-wasip2 in their own workspaces.
-exclude = ["sdk", "plugins"]
 
 [workspace.package]
-version = "0.1.35"
+version = "0.1.24"
 edition = "2024"
 rust-version = "1.96"
 license = "Apache-2.0"
@@ -42,9 +40,6 @@ ide-fonts = { path = "crates/ide-fonts" }
 ide-ssh = { path = "crates/ide-ssh" }
 ide-remote = { path = "crates/ide-remote" }
 ide-host = { path = "crates/ide-host" }
-ide-notebook = { path = "crates/ide-notebook" }
-ide-extension = { path = "crates/ide-extension" }
-ide-plugin = { path = "crates/ide-plugin" }
 
 # serialization & IPC typing
 serde = { version = "1", features = ["derive"] }
@@ -73,7 +68,6 @@ ropey = "1.6"
 encoding_rs = "0.8"
 chardetng = "0.1"
 ignore = "0.4"
-base64 = "0.22"
 globset = "0.4"
 notify = "8"
 notify-debouncer-full = "0.6"
@@ -81,7 +75,6 @@ trash = "5"
 blake3 = "1"
 dunce = "1"
 dirs = "6"
-zip = { version = "9", default-features = false, features = ["deflate"] }
 
 # search, index, language
 grep-searcher = "0.1"
@@ -92,9 +85,6 @@ redb = "4"
 tree-sitter = "0.25"
 
 # protocols & integrations
-jupyter-zmq-client = { version = "=2.0.0", default-features = false, features = ["tokio-runtime", "ring"] }
-jupyter-protocol = "=2.0.3"
-zeromq = { version = "0.6", default-features = false, features = ["tokio-runtime", "tcp-transport"] }
 lsp-types = "0.97"
 gix = { version = "0.89", default-features = false }
 portable-pty = "0.9"
@@ -102,8 +92,6 @@ reqwest = { version = "0.13", default-features = false, features = ["rustls-no-p
 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"] }
-tiberius = { version = "0.13", default-features = false, features = ["tds73", "rustls", "sql-browser-tokio"] }
-bb8 = "0.9"
 uuid = { version = "1", features = ["v4"] }
 
 # testing

README.md

@@ -14,7 +14,7 @@
    · 
   <a href="#benchmark">Benchmark</a>
   &nbsp;·&nbsp;
-  <a href="https://discord.gg/2Zy4yn7gP">Discord</a>
+  <a href="#build">Build</a>
 </p>
 
 https://github.com/user-attachments/assets/234dd54c-1255-4b3a-b35c-533d78d737c0
@@ -45,6 +45,15 @@ IDEA analyses Python more deeply, so "ready" doesn't mean the same work on
 both sides. Both are measured from the outside, the same way: see
 [`perf/compare`](perf/compare) to run it on your machine and projects.
 
+## Build
+
+```sh
+pnpm install
+pnpm tauri dev
+```
+
+Rust 1.96, Node 22, pnpm and the [Tauri prerequisites](https://v2.tauri.app/start/prerequisites/).
+
 ## License
 
 [Apache 2.0](LICENSE). Bundled third-party assets are listed in [`THIRD_PARTY_LICENSES.md`](THIRD_PARTY_LICENSES.md).

THIRD_PARTY_LICENSES.md

@@ -1,14 +1,5 @@
 # Third-party licenses
 
-## Project Lombok
-
-`plugins/lombok/lombok-1.18.48-openidea.2.jar` contains Project Lombok v1.18.48 with the Equinox
-classloader fix from [projectlombok/lombok#4059](https://github.com/projectlombok/lombok/pull/4059)
-and the ECJ constructor-call fix from [projectlombok/lombok#4089](https://github.com/projectlombok/lombok/pull/4089).
-Copyright (C) 2009-2021 The Project Lombok Authors. MIT license and bundled component
-notices are retained in [plugins/lombok/LICENSE](plugins/lombok/LICENSE) and inside the jar.
-Source tag, patch commits and build instructions: [plugins/lombok/README.md](plugins/lombok/README.md).
-
 ## JetBrains IntelliJ Platform icons
 
 `src/ui/expui/**` contains SVG icons from the IntelliJ Platform "new UI" (expui)
@@ -21,13 +12,12 @@ icon set, copied unmodified (some renamed) from JetBrains' open-source repositor
   `python/python-requirements` (`fileTypes/requirements`); `python/pipenv`
   (`fileTypes/pipenv`); `python/python-pyproject` (`expui/toml.svg` →
   `fileTypes/pyprojectToml`); `plugins/kotlin/base` (`fileTypes/kotlin`,
-  `kotlinScript`, `kotlinGradleScript`, `icons/expui/objectKotlin` → `kotlin/objectKotlin`); `java/openapi` (`fileTypes/maven`);
+  `kotlinScript`, `kotlinGradleScript`); `java/openapi` (`fileTypes/maven`);
   `plugins/markdown` (`fileTypes/markdown`); `plugins/toml` (`fileTypes/toml`);
   `plugins/terminal` (`toolwindows/terminal`); `plugins/maven`
   (`images/expui/toolwindow/maven` → `toolwindows/maven`, `images/expui/build/maven*`
   → `maven/`); `plugins/gradle` (`icons/expui/gradle` → `toolwindows/gradle`,
-  `icons/expui/gradleLoadChanges` → `build/gradleLoadChanges`,
-  `icons/expui/gradle`, `icons/gradleSubproject` → `gradle/`);
+  `icons/expui/gradleLoadChanges` → `build/gradleLoadChanges`);
   `platform/external-system-impl` (`icons/newui/task` → `externalSystem/task`).
   Copyright 2000-2026 JetBrains s.r.o. and contributors. Apache License 2.0 (below).
 - [intellij-plugins](https://github.com/JetBrains/intellij-plugins) (each plugin
@@ -36,20 +26,6 @@ icon set, copied unmodified (some renamed) from JetBrains' open-source repositor
   `fileTypes/hashiCorp`, Apache-2.0); `makefile` (`expui/makefile` →
   `fileTypes/makefile`, MIT, Copyright (c) 2016 Victor Kropp — full text below).
 
-The read/write usage filter assets (`actions/showReadAccess{,_dark}.svg` and
-`actions/showWriteAccess{,_dark}.svg`) are copied unmodified from
-`platform/icons/src/expui/actions/` at intellij-community commit
-[`e992ff4750b4c36afe2caadfa8b191a8f36fb7a2`](https://github.com/JetBrains/intellij-community/tree/e992ff4750b4c36afe2caadfa8b191a8f36fb7a2/platform/icons/src/expui/actions).
-Their original copyright headers and Apache-2.0 licensing are retained.
-
-- [intellij-rust](https://github.com/intellij-rust/intellij-rust) (MIT):
-  `src/main/resources/icons/expui/rustFile{,_dark}.svg` →
-  `src/ui/expui/fileTypes/rust{,_dark}.svg`;
-  `src/main/resources/icons/expui/cargo{,_dark}.svg` and `cargoLock{,_dark}.svg` →
-  `src/ui/expui/fileTypes/cargo{,_dark}.svg` and `cargoLock{,_dark}.svg`.
-  Copyright (c) 2015 Aleksey Kladov, Evgeny Kurbatsky, Alexey Kudinkin and contributors;
-  Copyright (c) 2016 JetBrains. MIT licence, full text below.
-
 At render time `src/ui/icons.tsx` may recolour monochrome icons to `currentColor`.
 
 ## JetBrains IntelliJ Platform diff algorithm
@@ -65,13 +41,8 @@ from its tests (`LineComparisonUtilTest`, `WordComparisonUtilTest`,
 `SplitComparisonUtilTest`). Modified from the originals. Copyright 2000-2026
 JetBrains s.r.o. and contributors. Apache License 2.0 (below).
 
-`src/features/vcs/mergeDiff3.ts`, `chunkOptimizer.ts` and `mergeModel.ts` also adapt
-the IntelliJ Platform merge implementation (`MergeRangeUtil`, `MergeResolveUtil`,
-`ChunkOptimizer.LineChunkOptimizer` and `MergeConflictModel`). Modified from the
-originals. Copyright 2000-2026 JetBrains s.r.o. and contributors. Apache License 2.0 (below).
-
 `src/ui/openidea/**` holds OpenIDEA's own file-type icons drawn in the expui style for
-languages whose JetBrains icons are not open source (Go, Ruby, Dart, Lua, Zig,
+languages whose JetBrains icons are not open source (Go, Rust, Ruby, Dart, Lua, Zig,
 Svelte, …). Those using the page-with-corner-badge layout (`goMod`, `goWork`,
 `dotenv`, `readme`, `lock`, `license`) reuse the page outline of the Apache-2.0
 expui `fileTypes/h.svg`; that outline is modified from the original by JetBrains.
@@ -82,31 +53,6 @@ The lettering in `src-tauri/icons/source/openidea-wordmark*.svg` is outlined fro
 Inter Tight (Copyright 2022 The Inter Project Authors, SIL Open Font License 1.1,
 https://github.com/rsms/inter-tight).
 
-### MIT License (Rust and Cargo icons)
-
-The MIT License (MIT)
-
-Copyright (c) 2015 Aleksey Kladov, Evgeny Kurbatsky, Alexey Kudinkin and contributors
-Copyright (c) 2016 JetBrains
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 ### MIT License (makefile icon)
 
 Copyright (c) 2016 Victor Kropp
@@ -165,18 +111,6 @@ shell and css dictionaries of [cspell-dicts](https://github.com/streetsidesoftwa
 (October 2026): lowercased, filtered and merged by OpenIDEA. Copyright Street Side Software;
 MIT licence, full text in `crates/ide-spell/src/dict/LICENSE-cspell-dicts`.
 
-## CodeMirror Angular template language
-
-`src/editor/core/cm/angular/` (`angular.grammar`, `tokens.ts`, `index.ts` and the
-`parser.ts` generated from them) is derived from
-[@codemirror/lang-angular](https://github.com/codemirror/lang-angular) 0.1.4
-(commit `ecc5038f`). Copyright (C) 2018-2021 by Marijn Haverbeke and others; MIT
-licence, full text in `src/editor/core/cm/angular/LICENSE`. Modifications by
-OpenIDEA: control-flow blocks (`@if`, `@for`, `@switch`, `@defer`, ...) and `@let`
-declarations, key and animation binding names (`(keydown.enter)`, `[@fade]`,
-`(@fade.done)`), runs of text that entities split (`a && b`) parsed as one, and one
-token for `{` and `}`.
-
 ## nvim-treesitter queries
 
 `crates/ide-syntax/queries/<grammar>/locals.scm` are derived from the `locals.scm`

crates/ide-agent/Cargo.toml

@@ -6,8 +6,6 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
-encoding_rs.workspace = true
-ide-vfs.workspace = true
 ide-core.workspace = true
 ide-jsonrpc.workspace = true
 ide-vcs.workspace = true

crates/ide-agent/src/acp/e2e.rs

@@ -147,7 +147,6 @@ async fn a_task_runs_on_a_v2_agent_and_resumes_its_session() {
     let mgr = manager(tmp.path(), agent.clone());
     let task = mgr
         .create(NewAgentTask {
-            project_root: None,
             prompt: text("Use the TodoWrite tool"),
             provider: "claude-acp".into(),
             config: vec![AgentConfigChoice { id: "model".into(), value: "haiku".into() }],

crates/ide-agent/src/config.rs

@@ -1,9 +1,7 @@
 //! Session settings (model, mode, thinking effort…), slash commands and context use, as
 //! the agent reports them over ACP.
 
-use crate::model::{
-    AgentCommand, AgentConfigOption, AgentConfigValue, AgentConfigVia, AgentCost, AgentLimit, AgentUsage,
-};
+use crate::model::{AgentCommand, AgentConfigOption, AgentConfigValue, AgentConfigVia, AgentUsage};
 use serde_json::{Value, json};
 
 /// Cursor exposes execution modes over ACP, but leaves approval policy to its client.
@@ -39,16 +37,6 @@ pub(crate) fn bypass_approvals(provider: &str, config: &[AgentConfigOption]) ->
     provider == "cursor" && config.iter().any(|o| o.id == CURSOR_APPROVAL && o.current.as_deref() == Some("bypass"))
 }
 
-/// The mode that approves everything without asking (`bypassPermissions`, `yolo`, `full-access`…), if the agent has one.
-pub(crate) fn bypass_mode(options: &[AgentConfigOption]) -> Option<(&AgentConfigOption, &AgentConfigValue)> {
-    let option = options.iter().find(|o| o.category.as_deref() == Some("mode"))?;
-    let value = option.values.iter().find(|v| {
-        let m: String = v.value.to_lowercase().chars().filter(char::is_ascii_lowercase).collect();
-        m.contains("bypass") || m == "yolo" || m.contains("fullaccess") || m == "dangerous"
-    })?;
-    Some((option, value))
-}
-
 /// The settings in a `session/new` or `session/load` result: its select `configOptions`,
 /// plus the older `modes` / `models` fields for what those don't cover.
 pub(crate) fn options_of(result: &Value) -> Vec<AgentConfigOption> {
@@ -152,27 +140,7 @@ pub(crate) fn commands_of(update: &Value) -> Vec<AgentCommand> {
 /// `usage_update`: `{ used, size }`.
 pub(crate) fn usage_of(update: &Value) -> Option<AgentUsage> {
     let tokens = |key: &str| update.get(key)?.as_f64().map(|n| n.clamp(0.0, f64::from(u32::MAX)) as u32);
-    let cost = update.get("cost").and_then(|c| {
-        Some(Box::new(AgentCost {
-            amount: c.get("amount")?.as_f64().filter(|a| a.is_finite() && *a >= 0.0)?,
-            currency: c.get("currency")?.as_str().filter(|c| !c.is_empty())?.to_owned(),
-        }))
-    });
-    Some(AgentUsage { used: tokens("used")?, size: tokens("size").filter(|s| *s > 0)?, cost })
-}
-
-/// The usage-limit windows a [`crate::LIMITS_UPDATE`] carries; malformed entries are skipped.
-pub(crate) fn limits_of(update: &Value) -> Vec<AgentLimit> {
-    let limits = update.get("limits").and_then(Value::as_array).into_iter().flatten();
-    limits
-        .filter_map(|l| {
-            Some(AgentLimit {
-                window: l.get("window")?.as_str().filter(|w| !w.is_empty())?.to_owned(),
-                used_percent: l.get("usedPercent")?.as_f64().filter(|p| p.is_finite())?.clamp(0.0, 100.0),
-                resets_ms: l.get("resetsMs").and_then(Value::as_f64),
-            })
-        })
-        .collect()
+    Some(AgentUsage { used: tokens("used")?, size: tokens("size").filter(|s| *s > 0)? })
 }
 
 fn legacy(

crates/ide-agent/src/lib.rs

@@ -23,13 +23,12 @@ pub use model::*;
 use conversation::{Conversation, SavedSubagent, Session};
 use ide_core::{IdeError, IdeResult, IpcPath};
 use ide_jsonrpc::{Framing, Handler, Peer, RpcError, codes};
-use ide_vcs::Repo;
 use parking_lot::{Mutex, RwLock};
 use serde::{Deserialize, Serialize};
 use serde_json::{Value, json};
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet, VecDeque};
 use std::path::{Path, PathBuf};
-use std::sync::atomic::{AtomicBool, AtomicU32, AtomicU64, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
 use std::sync::{Arc, Weak};
 use std::time::Duration;
 
@@ -44,16 +43,11 @@ const REPLAY_GRACE: Duration = Duration::from_millis(300);
 /// can trail its `session/prompt` response by this much.
 const TURN_GRACE: Duration = Duration::from_millis(100);
 const STDERR_LINES: usize = 20;
-/// An agent idle this long after its turn is stopped when it can reload its session
-/// (`session/load`): the next message starts it again where it left off.
-const IDLE_RELEASE: Duration = Duration::from_secs(5 * 60);
 /// Updates of a session's state rather than its conversation.
 const SESSION_STATE: [&str; 5] =
     ["session_info_update", "config_option_update", "current_mode_update", "available_commands_update", "usage_update"];
 /// A native agent's own update: it is about to retry a failed API request (see [`AgentRetry`]).
 pub(crate) const RETRY_UPDATE: &str = "openidea_retry";
-/// A native agent's own update: the usage limits of its account (see [`AgentLimit`]).
-pub(crate) const LIMITS_UPDATE: &str = "openidea_limits";
 /// Referenced files up to this size are embedded in the prompt (when the agent takes it).
 const MAX_EMBED: u64 = 256 * 1024;
 /// How long a probe waits for the agent to answer `initialize`.
@@ -95,8 +89,6 @@ struct Shared {
     providers: RwLock<Vec<provider::ProviderSpec>>,
     /// Last probe of each provider.
     probes: Mutex<HashMap<String, AgentProbe>>,
-    /// [`IDLE_RELEASE`], in milliseconds (shorter in tests).
-    idle_release_ms: AtomicU64,
 }
 
 /// What an agent offered in its last session, for the New Task page.
@@ -124,13 +116,9 @@ impl Shared {
     fn known_config(&self, provider: &str) -> Vec<AgentConfigOption> {
         let mut config = self.known.lock().get(provider).map(|k| k.config.clone()).unwrap_or_default();
         config::add_client_options(provider, &mut config);
-        if let Some((o, v)) = config::bypass_mode(&config).map(|(o, v)| (o.id.clone(), v.value.clone()))
-            && let Some(o) = config.iter_mut().find(|c| c.id == o)
-        {
-            o.current = Some(v);
-        }
+        // Approval bypass belongs to the conversation, never to another new task.
         if let Some(o) = config.iter_mut().find(|o| o.id == config::CURSOR_APPROVAL) {
-            o.current = Some("bypass".into());
+            o.current = Some("ask".into());
         }
         config
     }
@@ -212,8 +200,6 @@ struct Live {
     capabilities: AgentCapabilities,
     /// `promptCapabilities.embeddedContext`: referenced files are sent with their text.
     embedded: bool,
-    /// `session/load`: the process can be stopped between turns and the session reloaded.
-    resumable: bool,
 }
 
 struct Task {
@@ -235,8 +221,6 @@ struct Task {
     cancel_pending: AtomicBool,
     /// The agent reported something for the current turn.
     turn_started: AtomicBool,
-    /// Turns sent so far: an idle release scheduled before the latest one is void.
-    turns: AtomicU64,
     /// Settings already sent this session (`(option, value)`), so a refusal is not retried.
     config_sent: Mutex<HashSet<(String, String)>>,
     dirty: Mutex<BTreeSet<(Session, usize)>>,
@@ -247,11 +231,6 @@ struct Task {
 }
 
 impl AgentManager {
-    #[cfg(test)]
-    fn set_idle_release(&self, delay: Duration) {
-        self.shared.idle_release_ms.store(delay.as_millis() as u64, Ordering::Relaxed);
-    }
-
     /// Loads the project's saved tasks. Spawned work runs on `runtime`.
     pub fn new(paths: AgentPaths, runtime: tokio::runtime::Handle) -> Self {
         let connector: Connector = Arc::new(|spec, cwd, client, on_stderr| match spec.driver {
@@ -276,7 +255,6 @@ impl AgentManager {
             known: Mutex::new(known),
             providers,
             probes: Mutex::new(HashMap::new()),
-            idle_release_ms: AtomicU64::new(IDLE_RELEASE.as_millis() as u64),
         });
         let mut tasks = HashMap::new();
         for file in std::fs::read_dir(&shared.paths.store_dir).into_iter().flatten().flatten() {
@@ -318,44 +296,26 @@ impl AgentManager {
         let specs = provider::load(self.shared.paths.custom_agents_dir.as_deref());
         let list = specs
             .iter()
-            .map(|p| {
-                let mut info = provider::describe(p);
-                info.config = self.shared.known_config(&p.id);
-                info.commands = self.shared.known_commands(&p.id);
-                info
+            .map(|p| AgentProvider {
+                id: p.id.clone(),
+                name: p.name.clone(),
+                command: std::iter::once(p.command.as_str())
+                    .chain(p.args.iter().map(String::as_str))
+                    .collect::<Vec<_>>()
+                    .join(" "),
+                installed: provider::installed(&p.command),
+                config: self.shared.known_config(&p.id),
+                commands: self.shared.known_commands(&p.id),
+                source: p.source.clone(),
             })
             .collect();
-        let mut prev = self.shared.providers.write();
-        let mut probes = self.shared.probes.lock();
-        probes.retain(|id, _| {
-            let old = prev.iter().find(|p| &p.id == id);
-            let new = specs.iter().find(|p| &p.id == id);
-            matches!((old, new), (Some(a), Some(b)) if a.command == b.command && a.args == b.args && a.env == b.env)
-        });
-        *prev = specs;
+        *self.shared.providers.write() = specs;
         list
     }
 
-    /// Overrides built-in `id`'s command with `command` (the driver and arguments stay
-    /// the built-in's) through its agent file, or returns it to auto-detection with `None`.
-    pub fn set_builtin_command(&self, id: &str, command: Option<String>) -> IdeResult<()> {
-        let Some(dir) = self.shared.paths.custom_agents_dir.clone() else {
-            return Err(IdeError::unavailable("there is no custom agents directory"));
-        };
-        provider::set_builtin_command(&dir, id, command.as_deref())
-    }
-
-    /// Re-reads configured/installed agents, drops cached probes, and notifies subscribers.
-    pub fn reload_providers(&self) {
-        let specs = provider::load(self.shared.paths.custom_agents_dir.as_deref());
-        *self.shared.providers.write() = specs;
-        self.shared.probes.lock().clear();
-        self.shared.emit(AgentEvent::Providers);
-    }
-
     /// 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.
+    /// in the project: what the agent offered last time there, plus, for Claude Code, the
+    /// skills and custom commands on disk it has not listed.
     pub async fn commands(&self, provider: &str, task: Option<&str>) -> IdeResult<Vec<AgentCommand>> {
         let (provider, offered, cwd) = match task {
             Some(id) => {
@@ -365,14 +325,6 @@ impl AgentManager {
             }
             None => (provider.to_owned(), self.shared.known_commands(provider), self.shared.paths.project_root.clone()),
         };
-        // Commands the agent implements itself and never lists (its CLI builtins):
-        // merged without duplicating what `availableCommands` or the disk offer.
-        let mut offered = offered;
-        for &(name, description) in builtin_commands(&provider) {
-            if !offered.iter().any(|c| c.name == name) {
-                offered.push(AgentCommand { name: name.to_owned(), description: description.to_owned(), hint: None });
-            }
-        }
         if provider != "claude" && provider != "claude-acp" {
             return Ok(offered);
         }
@@ -401,16 +353,9 @@ impl AgentManager {
             .ok_or_else(|| IdeError::invalid(format!("unknown agent {}", req.provider)))?;
         let prompt = clean(req.prompt).ok_or_else(|| IdeError::invalid("describe the task first"))?;
         let title = title_of(&prompt);
-        let root = req.project_root.clone().map(|p| p.0).unwrap_or_else(|| self.shared.paths.project_root.clone());
-        let project_root = Some(IpcPath(root.clone()));
+        let root = self.shared.paths.project_root.clone();
         let (cwd, branch, base, base_commit, before) = match req.isolation {
             Isolation::Worktree => {
-                // The UI offers worktrees for git projects only; state it when it isn't one.
-                if Repo::discover(&root)?.is_none() {
-                    return Err(IdeError::invalid(
-                        "worktrees need a git repository: run the task in the local checkout",
-                    ));
-                }
                 let dir = self.shared.paths.worktrees_dir.clone();
                 let (t, b) = (title.clone(), req.base.clone());
                 let c = blocking(move || worktree::create(&root, &dir, &t, b.as_deref())).await?;
@@ -434,7 +379,6 @@ impl AgentManager {
         }
         let now = now_ms();
         let task = AgentTask {
-            project_root,
             id: uuid::Uuid::new_v4().simple().to_string(),
             title,
             provider: spec.id.clone(),
@@ -595,10 +539,6 @@ impl AgentManager {
                 o.current = Some(value);
             }
             s.task.model = model_of(&s.task.config).or(s.task.model.take());
-            let provider = s.task.provider.clone();
-            let config = s.task.config.clone();
-            drop(s);
-            task.shared.remember(&provider, Some(&config), None);
         }
         task.approve_pending();
         task.persist();
@@ -808,43 +748,19 @@ impl AgentManager {
         Ok(())
     }
 
-    /// Returns an archived task to the active list without starting the agent.
-    pub fn unarchive(&self, id: &str) -> IdeResult<()> {
-        let task = self.task(id)?;
-        {
-            let mut s = task.state.lock();
-            if s.task.status != AgentStatus::Archived {
-                return Ok(());
-            }
-            if s.busy {
-                return Err(IdeError::invalid("the task is still stopping"));
-            }
-            s.task.status = AgentStatus::Ready;
-            s.task.error = None;
-            s.task.updated_ms = now_ms();
-        }
-        task.persist();
-        task.emit_task();
-        Ok(())
-    }
-
     /// Forgets the task; with `remove_worktree` also deletes its worktree (the branch stays).
     pub async fn delete(&self, id: &str, remove_worktree: bool) -> IdeResult<()> {
         let task = self.task(id)?;
         task.kill();
-        let (isolation, cwd, root) = {
+        let (isolation, cwd) = {
             let s = task.state.lock();
-            (
-                s.task.isolation,
-                s.task.cwd.0.clone(),
-                s.task.project_root.clone().map(|p| p.0).unwrap_or_else(|| self.shared.paths.project_root.clone()),
-            )
+            (s.task.isolation, s.task.cwd.0.clone())
         };
         // A copy of the task (a fork) may work in the same worktree.
         let shared = self.tasks.read().values().any(|t| t.id != id && t.state.lock().task.cwd.0 == cwd);
         if remove_worktree && !shared && isolation == Isolation::Worktree && cwd.exists() {
-            let worktrees = self.shared.paths.worktrees_dir.clone();
-            blocking(move || worktree::remove(&root, &worktrees, &cwd)).await?;
+            let root = self.shared.paths.project_root.clone();
+            blocking(move || worktree::remove(&root, &cwd)).await?;
         }
         self.tasks.write().remove(id);
         *task.deleted.lock() = true;
@@ -903,7 +819,6 @@ impl Task {
             send_now: AtomicBool::new(false),
             cancel_pending: AtomicBool::new(false),
             turn_started: AtomicBool::new(false),
-            turns: AtomicU64::new(0),
             config_sent: Mutex::new(HashSet::new()),
             dirty: Mutex::new(BTreeSet::new()),
             flush_scheduled: AtomicBool::new(false),
@@ -1046,42 +961,12 @@ impl Task {
             }
             match (next, result) {
                 (Some(queued), _) => prompt = queued.prompt,
-                (None, Ok(_)) => {
-                    self.set_status(AgentStatus::Ready, None);
-                    return self.release_when_idle();
-                }
+                (None, Ok(_)) => return self.set_status(AgentStatus::Ready, None),
                 (None, Err(failure)) => return self.fail(failure),
             }
         }
     }
 
-    /// Stops the agent's process once the task has stayed idle for [`IDLE_RELEASE`], so
-    /// finished tasks don't keep an agent (and what it started) running. Only an agent that
-    /// reloads its session: the next message starts it again with the conversation intact.
-    fn release_when_idle(self: &Arc<Self>) {
-        let turn = self.turns.load(Ordering::Acquire);
-        let delay = Duration::from_millis(self.shared.idle_release_ms.load(Ordering::Relaxed));
-        let task = Arc::downgrade(self);
-        self.shared.runtime.spawn(async move {
-            tokio::time::sleep(delay).await;
-            let Some(task) = task.upgrade() else { return };
-            if task.turns.load(Ordering::Acquire) != turn
-                || task.state.lock().busy
-                || !task.permissions.lock().is_empty()
-            {
-                return;
-            }
-            let live = {
-                let mut live = task.live.lock();
-                if live.as_ref().is_some_and(|l| l.resumable && !l.peer.is_closed()) { live.take() } else { None }
-            };
-            if let Some(live) = live {
-                tracing::debug!("agent task {}: idle, stopping the agent until the next message", task.id);
-                live.peer.kill();
-            }
-        });
-    }
-
     /// Ends a turn that failed: nothing it started stays open.
     fn fail(self: &Arc<Self>, failure: Failure) {
         self.cancel_permissions();
@@ -1132,7 +1017,6 @@ impl Task {
         self.push_entry(AgentEntry::User {
             text: prompt.text,
             attachments,
-            images: prompt.images,
             sent_ms: Some(now_ms()),
             done_ms: None,
             steered: true,
@@ -1142,7 +1026,6 @@ impl Task {
 
     /// Sends one prompt, starting the agent first if needed; returns the stop reason.
     async fn turn(self: &Arc<Self>, prompt: &AgentPrompt) -> Result<String, Failure> {
-        self.turns.fetch_add(1, Ordering::AcqRel);
         self.turn_started.store(false, Ordering::Release);
         self.state.lock().task.resets_ms = None;
         let attachments = prompt
@@ -1154,7 +1037,6 @@ impl Task {
         self.push_entry(AgentEntry::User {
             text: prompt.text.clone(),
             attachments,
-            images: prompt.images.clone(),
             sent_ms: Some(now_ms()),
             done_ms: None,
             steered: false,
@@ -1301,6 +1183,7 @@ impl Task {
             (if known { reported } else { s.task.config.clone() }, s.wanted.clone())
         };
         config::add_client_options(&provider_id, &mut options);
+        self.shared.remember(&provider_id, Some(&options), None);
         for choice in &wanted {
             // An option the session doesn't offer yet is set once it does (`apply_late_choices`).
             let Some(o) = options.iter().find(|o| o.id == choice.id).cloned() else { continue };
@@ -1329,7 +1212,6 @@ impl Task {
                 Err(e) => tracing::warn!("agent task {}: setting {} to {} failed: {e}", self.id, o.id, choice.value),
             }
         }
-        self.shared.remember(&provider_id, Some(&options), None);
         {
             let mut s = self.state.lock();
             s.task.model = model_of(&options).or(s.task.model.take());
@@ -1339,7 +1221,7 @@ impl Task {
         }
         self.persist();
         self.emit_task();
-        let live = Live { peer, session: session_id, capabilities, embedded, resumable: can_load };
+        let live = Live { peer, session: session_id, capabilities, embedded };
         *self.live.lock() = Some(live.clone());
         Ok(live)
     }
@@ -1421,13 +1303,6 @@ impl Task {
             }
             return;
         }
-        if kind == LIMITS_UPDATE {
-            if !self.replaying.load(Ordering::Acquire) {
-                let provider = self.state.lock().task.provider.clone();
-                self.shared.emit(AgentEvent::Limits { provider, limits: config::limits_of(update) });
-            }
-            return;
-        }
         if kind == "session_info_update" {
             // The agent's own title for the session replaces the first line of the prompt.
             let title = update.get("title").and_then(Value::as_str).map(str::trim).filter(|t| !t.is_empty());
@@ -1754,16 +1629,6 @@ fn model_of(config: &[AgentConfigOption]) -> Option<String> {
     config.iter().find(|o| o.category.as_deref() == Some("model")).and_then(|o| o.current.clone())
 }
 
-/// Commands the agent implements on its own and never lists in `availableCommands` —
-/// its CLI builtins, passed through as prompt text (e.g. `/compact`). `(name, description)`.
-fn builtin_commands(provider: &str) -> &'static [(&'static str, &'static str)] {
-    match provider {
-        // OpenCode ACP handles `/compact` via session.summarize but omits it from its command list.
-        "opencode" => &[("compact", "compact the conversation")],
-        _ => &[],
-    }
-}
-
 fn file_name(path: &Path) -> String {
     path.file_name().map_or_else(|| path.to_string_lossy().into_owned(), |n| n.to_string_lossy().into_owned())
 }

crates/ide-agent/src/model.rs

@@ -47,9 +47,6 @@ pub enum Isolation {
 #[derive(Clone, Debug, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct AgentTask {
-    /// Original project folder; absent in tasks saved before per-task roots.
-    #[serde(default)]
-    pub project_root: Option<IpcPath>,
     pub id: String,
     pub title: String,
     /// [`AgentProvider::id`].
@@ -154,30 +151,6 @@ pub struct AgentUsage {
     pub used: u32,
     /// Size of the context window.
     pub size: u32,
-    /// What the session has cost so far (ACP `usage_update.cost`), when the agent reports it.
-    // Boxed so that `AgentEvent::Task` stays within clippy's `large_enum_variant` bound on Windows.
-    #[serde(default)]
-    pub cost: Option<Box<AgentCost>>,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct AgentCost {
-    pub amount: f64,
-    /// ISO 4217 code, e.g. `USD`.
-    pub currency: String,
-}
-
-/// One usage-limit window of an agent's account.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct AgentLimit {
-    /// The window as the agent names it: `five_hour`, `seven_day`, `seven_day_opus`…
-    pub window: String,
-    /// Share of the window used, 0–100.
-    pub used_percent: f64,
-    /// When the window resets (ms since the epoch), if the agent said.
-    pub resets_ms: Option<f64>,
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
@@ -267,9 +240,6 @@ pub enum AgentEntry {
         text: String,
         /// Names of the files and images sent with it.
         attachments: Vec<String>,
-        /// The images sent with it, shown in the conversation.
-        #[serde(default)]
-        images: Vec<AgentImage>,
         /// When it was sent (ms since the epoch); `None` in tasks saved before this was kept.
         #[serde(default)]
         sent_ms: Option<f64>,
@@ -346,15 +316,6 @@ pub struct AgentProvider {
     pub name: String,
     /// The command line that starts its ACP server.
     pub command: String,
-    /// Executable and arguments actually launched, without flattening paths containing spaces.
-    pub program: String,
-    pub args: Vec<String>,
-    pub default_program: Option<String>,
-    pub default_args: Vec<String>,
-    pub login_hint: Option<String>,
-    pub command_overridden: bool,
-    pub command_editable: bool,
-    pub command_read_only_reason: Option<AgentCommandReadOnlyReason>,
     /// Whether the command was found (on `PATH`).
     pub installed: bool,
     /// Settings (models, modes…) the agent offered last time it ran; empty before its first session.
@@ -364,15 +325,6 @@ pub struct AgentProvider {
     pub source: AgentSource,
 }
 
-/// Why the executable cannot be changed in built-in agent settings.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub enum AgentCommandReadOnlyReason {
-    PackageRunner,
-    Registry,
-    CustomAgent,
-}
-
 /// Where an agent comes from.
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
 #[serde(tag = "kind", rename_all = "camelCase")]
@@ -409,9 +361,6 @@ pub struct AgentProbe {
 #[derive(Clone, Debug, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct NewAgentTask {
-    /// Validated by the host; defaults to the window project root.
-    #[serde(default)]
-    pub project_root: Option<IpcPath>,
     pub prompt: AgentPrompt,
     pub provider: String,
     /// Settings for the new session (model, mode…).
@@ -455,11 +404,4 @@ pub enum AgentEvent {
         index: u32,
         entry: AgentEntry,
     },
-    /// An agent reported the usage limits of its account (shared by every task of `provider`).
-    Limits {
-        provider: String,
-        limits: Vec<AgentLimit>,
-    },
-    /// The installed or configured agent providers changed.
-    Providers,
 }

crates/ide-agent/src/native/claude/cli.rs

@@ -98,8 +98,6 @@ impl Cli for Process {
         use std::process::Stdio;
         let mut cmd = tokio::process::Command::new(&l.program);
         ide_core::process::prepare(cmd.as_std_mut());
-        // `claude` may be a wrapper (`claude.cmd` → node): stopping it stops what it started.
-        ide_core::process::own_group(cmd.as_std_mut());
         cmd.args(&l.args)
             .current_dir(&l.cwd)
             .envs(ide_core::process::shell_env())
@@ -122,9 +120,6 @@ impl Cli for Process {
             tokio::select! {
                 _ = child.wait() => {}
                 _ = token.cancelled() => {
-                    if let Some(pid) = child.id() {
-                        let _ = tokio::task::spawn_blocking(move || ide_core::process::kill_tree_of(pid)).await;
-                    }
                     let _ = child.start_kill();
                     let _ = child.wait().await;
                 }

crates/ide-agent/src/native/claude/mod.rs

@@ -296,7 +296,7 @@ impl Shim {
         let mut cmd = std::process::Command::new(&self.config.program);
         ide_core::process::prepare(&mut cmd);
         let out = cmd.arg("--version").envs(ide_core::process::shell_env()).output().ok()?;
-        let text = ide_core::output_encoding::decode_tool_output(&out.stdout);
+        let text = String::from_utf8_lossy(&out.stdout);
         text.split_whitespace().next().filter(|v| out.status.success() && !v.is_empty()).map(str::to_owned)
     }
 
@@ -904,7 +904,6 @@ impl Session {
                     if info.get("status").and_then(Value::as_str) == Some("rejected") {
                         st.limit_resets_ms = info.get("resetsAt").and_then(Value::as_f64).map(|s| s * 1000.0);
                     }
-                    updates.extend(st.tr.on_rate_limit(&info));
                 }
                 "command_lifecycle" => {
                     let uuid = msg.get("command_uuid").and_then(Value::as_str);
@@ -916,11 +915,7 @@ impl Session {
                         } else {
                             "end_turn"
                         };
-                        finished = st.turn.take().map(|mut t| {
-                            // Claude Code reports a turn that failed as cancelled here.
-                            let failure = t.failure.take().filter(|_| !t.cancelled);
-                            (t, failure.unwrap_or(TurnEnd::Stop(stop)))
-                        });
+                        finished = st.turn.take().map(|t| (t, TurnEnd::Stop(stop)));
                     }
                 }
                 "assistant" if msg.get("parent_tool_use_id").is_none_or(Value::is_null) => {
@@ -1144,8 +1139,7 @@ where
 /// Whether `result` ends `turn`: it answers the turn's last message, or (stopped) any of
 /// its messages, or names none (the CLI's own error before the turn began).
 fn belongs(turn: &Turn, result: &Value) -> bool {
-    // Prompts are sent with the origin `human`, and their results echo it.
-    if result.get("origin").is_some_and(|o| !o.is_null() && o.get("kind").and_then(Value::as_str) != Some("human")) {
+    if result.get("origin").is_some_and(|o| !o.is_null()) {
         return false;
     }
     let mut uuids = strings(result.get("user_message_uuids"));

crates/ide-agent/src/native/claude/tests.rs

@@ -738,50 +738,6 @@ async fn a_stop_ahead_of_its_prompt_cancels_it() {
     assert!(cli.sent.lock()[0].iter().all(|m| m["type"] != "user"), "nothing was sent");
 }
 
-#[tokio::test(flavor = "multi_thread")]
-async fn a_failed_turn_reports_its_failure() {
-    let text = "Failed to authenticate: OAuth session expired and could not be refreshed";
-    let lifecycle = |uuid: &str, state: &str| {
-        Frame::Cli(json!({ "type": "command_lifecycle", "command_uuid": uuid, "state": state }))
-    };
-    let result = |uuid: &str| {
-        Frame::Cli(json!({
-            "type": "result", "subtype": "success", "is_error": true, "result": text, "stop_reason": "stop_sequence",
-            "terminal_reason": "api_error", "origin": { "kind": "human" }, "user_message_uuids": [uuid],
-        }))
-    };
-    // As Claude Code sends it, and with the turn's end ahead of its result.
-    for lifecycle_first in [false, true] {
-        let mut process = load_fixture("simple").remove(0);
-        process.truncate(6);
-        let Some(Frame::Shim(prompt)) = process.last() else { panic!("the fixture's prompt") };
-        let uuid = prompt["uuid"].as_str().unwrap().to_owned();
-        process.push(Frame::Cli(json!({
-            "type": "assistant", "error": "authentication_failed", "parent_tool_use_id": null,
-            "message": { "id": "m", "model": "<synthetic>", "content": [{ "type": "text", "text": text }] },
-        })));
-        if lifecycle_first {
-            process.extend([lifecycle(&uuid, "cancelled"), result(&uuid)]);
-        } else {
-            process.extend([result(&uuid), lifecycle(&uuid, "cancelled")]);
-        }
-        let cli = Arc::new(Replay {
-            processes: Mutex::new(VecDeque::from([process])),
-            sent: Arc::default(),
-            launched: Mutex::default(),
-            errors: Arc::default(),
-        });
-        let (dir, cwd) = (tempfile::tempdir().unwrap(), tempfile::tempdir().unwrap());
-        let h =
-            Harness::connect(cli.clone(), dir.path().into(), dir.path().join("p"), cwd.path().into(), Vec::new()).await;
-        let s = h.new_session().await;
-        let Err(RpcError::Server { message, .. }) = h.prompt(&s, "hi").await else {
-            panic!("the turn should fail (lifecycle first: {lifecycle_first})");
-        };
-        assert_eq!(message, format!("Claude Code authentication failed: {text}"));
-    }
-}
-
 /// Fork and undo against the real CLI, across connections, in a symlinked directory
 /// (macOS `/tmp`).
 #[tokio::test(flavor = "multi_thread")]
@@ -873,7 +829,6 @@ fn which_result_ends_a_turn() {
     assert!(!belongs(&t, &json!({"user_message_uuids": ["a"]})), "a steer superseded it");
     assert!(belongs(&t, &json!({"subtype": "error_during_execution"})), "names no message");
     assert!(!belongs(&t, &json!({"origin": {"kind": "task-notification"}})), "Claude Code's own turn");
-    assert!(belongs(&t, &json!({"origin": {"kind": "human"}, "user_message_uuids": ["b"]})), "the prompt's own result");
     assert!(belongs(&turn(&["a", "b"], true), &json!({"user_message_uuids": ["a"]})));
 }
 
@@ -1013,39 +968,6 @@ fn streamed_text_is_not_sent_twice() {
     assert_eq!(usage[0].update, json!({"sessionUpdate": "usage_update", "used": 15, "size": 1000}));
 }
 
-#[test]
-fn rate_limits_and_cost() {
-    let mut t = Translator::new("s", PathBuf::from("/w"), false);
-    let info = json!({"status": "allowed", "rateLimitType": "five_hour", "unifiedWindows": {
-        "five_hour": {"utilization": 0.19, "resetsAt": 100, "status": "allowed"},
-        "seven_day": {"utilization": 0.09, "resetsAt": 200, "status": "allowed"},
-    }});
-    let limits = t.on_rate_limit(&info).unwrap();
-    assert_eq!(limits.session, "s");
-    assert_eq!(limits.update["sessionUpdate"], crate::LIMITS_UPDATE);
-    let windows: Vec<(&str, i64, f64)> = limits.update["limits"]
-        .as_array()
-        .unwrap()
-        .iter()
-        .map(|l| {
-            (
-                l["window"].as_str().unwrap(),
-                l["usedPercent"].as_f64().unwrap().round() as i64,
-                l["resetsMs"].as_f64().unwrap(),
-            )
-        })
-        .collect();
-    assert_eq!(windows, [("five_hour", 19, 100_000.0), ("seven_day", 9, 200_000.0)]);
-    // Older versions report the window that applies, alone.
-    let single = t.on_rate_limit(&json!({"rateLimitType": "seven_day", "utilization": 0.5})).unwrap();
-    assert_eq!(single.update["limits"], json!([{"window": "seven_day", "usedPercent": 50.0, "resetsMs": null}]));
-    assert_eq!(t.on_rate_limit(&json!({"status": "allowed", "resetsAt": 100})), None, "no utilization, no update");
-
-    t.used = Some(10);
-    let usage = t.on_result(&json!({"total_cost_usd": 0.5, "modelUsage": {"x": {"contextWindow": 1000}}}));
-    assert_eq!(usage[0].update["cost"], json!({"amount": 0.5, "currency": "USD"}));
-}
-
 #[test]
 fn tool_calls_plans_and_subagents() {
     let mut t = Translator::new("s", PathBuf::from("/w"), true);

crates/ide-agent/src/native/claude/translate.rs

@@ -5,7 +5,7 @@
 //! Agent tool use that launched them: their messages carry it as `parent_tool_use_id`.
 
 use super::tools;
-use crate::{LIMITS_UPDATE, RETRY_UPDATE};
+use crate::RETRY_UPDATE;
 use serde_json::{Value, json};
 use std::collections::{HashMap, VecDeque};
 use std::path::PathBuf;
@@ -58,8 +58,6 @@ pub(super) struct Translator {
     pub used: Option<u64>,
     pub model: Option<String>,
     windows: HashMap<String, u64>,
-    /// The session's cost so far in USD, as the last `result` reported it.
-    cost_usd: Option<f64>,
 }
 
 impl Translator {
@@ -77,7 +75,6 @@ impl Translator {
             used: None,
             model: None,
             windows: HashMap::new(),
-            cost_usd: None,
         }
     }
 
@@ -172,7 +169,7 @@ impl Translator {
                     Some("tool_use") => {
                         // The input streams after this: shown by name until the message has it.
                         let (id, name) = (str_of(&block, "id"), str_of(&block, "name"));
-                        if !(id.is_empty() || tools::is_plan(&name) || tools::is_agent(&name) && self.subagents) {
+                        if !id.is_empty() && !tools::is_plan(&name) && !(tools::is_agent(&name) && self.subagents) {
                             out.extend(self.ensure_call(&id, &name, &json!({}), &session));
                         }
                     }
@@ -546,9 +543,6 @@ impl Translator {
                 self.windows.insert(model.clone(), w);
             }
         }
-        if let Some(cost) = result.get("total_cost_usd").and_then(Value::as_f64).filter(|c| c.is_finite()) {
-            self.cost_usd = Some(cost);
-        }
         self.usage_update().into_iter().collect()
     }
 
@@ -563,33 +557,9 @@ impl Translator {
                     .or_else(|| self.windows.iter().find(|(k, _)| k.starts_with(m.as_str())).map(|(_, v)| v))
             })
             .or_else(|| (self.windows.len() == 1).then(|| self.windows.values().next()).flatten())?;
-        let mut update = json!({ "sessionUpdate": "usage_update", "used": used, "size": size });
-        if let Some(amount) = self.cost_usd {
-            update["cost"] = json!({ "amount": amount, "currency": "USD" });
-        }
-        Some(Update { session: self.root.clone(), update })
-    }
-
-    /// The usage-limit windows a `rate_limit_event` reports, as a [`LIMITS_UPDATE`]: every
-    /// window of `unifiedWindows`, or the single `rateLimitType` window older versions send.
-    pub fn on_rate_limit(&self, info: &Value) -> Option<Update> {
-        let window = |name: &str, w: &Value| {
-            let utilization = w.get("utilization")?.as_f64()?;
-            Some(json!({
-                "window": name,
-                "usedPercent": utilization * 100.0,
-                "resetsMs": w.get("resetsAt").and_then(Value::as_f64).map(|s| s * 1000.0),
-            }))
-        };
-        let limits: Vec<Value> = match info.get("unifiedWindows").and_then(Value::as_object) {
-            Some(windows) => windows.iter().filter_map(|(name, w)| window(name, w)).collect(),
-            None => {
-                info.get("rateLimitType").and_then(Value::as_str).and_then(|t| window(t, info)).into_iter().collect()
-            }
-        };
-        (!limits.is_empty()).then(|| Update {
+        Some(Update {
             session: self.root.clone(),
-            update: json!({ "sessionUpdate": LIMITS_UPDATE, "limits": limits }),
+            update: json!({ "sessionUpdate": "usage_update", "used": used, "size": size }),
         })
     }
 }

crates/ide-agent/src/native/codex/mod.rs

@@ -199,12 +199,7 @@ fn invalid(message: impl Into<String>) -> ResponseError {
 fn from_codex(e: RpcError) -> ResponseError {
     match e {
         RpcError::Server { code, message, data } => {
-            // Protocol errors can list method names containing "auth"; they are not sign-in failures.
-            let protocol = matches!(
-                code,
-                codes::PARSE_ERROR | codes::INVALID_REQUEST | codes::METHOD_NOT_FOUND | codes::INVALID_PARAMS
-            );
-            let code = if !protocol && message.to_lowercase().contains("auth") { AUTH_REQUIRED } else { code };
+            let code = if message.to_lowercase().contains("auth") { AUTH_REQUIRED } else { code };
             ResponseError { code, message, data }
         }
         RpcError::Closed => error(codes::INTERNAL_ERROR, "Codex exited"),
@@ -431,48 +426,10 @@ impl CodexShim {
     async fn rollback(&self, params: &Value) -> Result<Value, ResponseError> {
         let session = str_param(params, "sessionId")?;
         let turns = params.get("turns").and_then(Value::as_u64).filter(|n| *n > 0).ok_or_else(|| invalid("turns"))?;
-        match self.call("thread/rollback", json!({ "threadId": session, "numTurns": turns })).await {
-            Ok(_) => {}
-            Err(e)
-                if e.code == codes::METHOD_NOT_FOUND
-                    || (e.code == codes::INVALID_REQUEST
-                        && e.message.contains("unknown variant `thread/rollback`")) =>
-            {
-                self.revert(session, turns).await?;
-            }
-            Err(e) => return Err(e),
-        }
+        self.call("thread/rollback", json!({ "threadId": session, "numTurns": turns })).await?;
         Ok(json!({}))
     }
 
-    /// New Codex versions replace rollback counts with an exclusive turn id.
-    async fn revert(&self, session: &str, mut remaining: u64) -> Result<(), ResponseError> {
-        let mut cursor = Value::Null;
-        let mut seen = HashSet::new();
-        loop {
-            let page = self
-                .call(
-                    "thread/turns/list",
-                    json!({ "threadId": session, "sortDirection": "desc", "limit": remaining.min(100), "cursor": cursor }),
-                )
-                .await?;
-            let turns = page.get("data").and_then(Value::as_array).ok_or_else(|| invalid("Codex returned no turns"))?;
-            if remaining <= turns.len() as u64 {
-                let before = str_param(&turns[remaining as usize - 1], "id")?;
-                self.call("thread/revert", json!({ "threadId": session, "beforeTurnId": before })).await?;
-                return Ok(());
-            }
-            remaining -= turns.len() as u64;
-            let next = page.get("nextCursor").and_then(Value::as_str);
-            let Some(next) = next.filter(|next| seen.insert((*next).to_owned())) else {
-                return Err(invalid(
-                    "Codex history has fewer turns than the conversation; reload the task before editing",
-                ));
-            };
-            cursor = json!(next);
-        }
-    }
-
     /// Stops following the session's thread (codex unloads it once nothing follows it).
     async fn close(&self, params: &Value) -> Result<Value, ResponseError> {
         let session = str_param(params, "sessionId")?;

crates/ide-agent/src/native/codex/tests.rs

@@ -593,104 +593,6 @@ async fn resume_replays_history_then_forks_and_rolls_back() {
     assert_eq!(sent(&frames, "thread/unsubscribe")[0]["params"], json!({"threadId": thread}));
 }
 
-async fn rollback_replies(turns: u32, replies: Vec<(&str, Value)>) -> (Result<Value, RpcError>, Vec<Value>) {
-    let frames = replies
-        .into_iter()
-        .enumerate()
-        .flat_map(|(i, (method, mut reply))| {
-            let id = i + 1;
-            reply["id"] = json!(id);
-            [(true, json!({ "id": id, "method": method })), (false, reply)]
-        })
-        .collect();
-    let transcript = Transcript { meta: Value::Null, frames };
-    let (ours, theirs) = tokio::io::duplex(1 << 16);
-    let acp = attach(Arc::new(Client::default()), |events| {
-        let (read, write) = tokio::io::split(ours);
-        Ok(Peer::connect_framed(read, write, events, Framing::Lines))
-    })
-    .unwrap();
-    let (read, write) = tokio::io::split(theirs);
-    let player = tokio::spawn(async move { play(&transcript, read, write).await });
-    let result = request(&acp, "_openidea/rollback", json!({ "sessionId": "s", "turns": turns })).await;
-    let (sent, _read, _write) = player.await.unwrap();
-    acp.kill();
-    (result, sent)
-}
-
-fn removed_rollback() -> Value {
-    json!({ "error": { "code": -32600, "message": "Invalid request: unknown variant `thread/rollback`, expected one of `thread/revert`, `account/gatewayOAuth/read`, `getAuthStatus`" } })
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn removed_rollback_reverts_before_the_target_turn_across_pages() {
-    let (result, frames) = rollback_replies(
-        3,
-        vec![
-            ("thread/rollback", removed_rollback()),
-            (
-                "thread/turns/list",
-                json!({ "result": { "data": [{ "id": "last" }, { "id": "middle" }], "nextCursor": "older" } }),
-            ),
-            (
-                "thread/turns/list",
-                json!({ "result": { "data": [{ "id": "edited" }, { "id": "retained" }], "nextCursor": null } }),
-            ),
-            ("thread/revert", json!({ "result": { "thread": { "id": "s", "turns": [] } } })),
-        ],
-    )
-    .await;
-    assert_eq!(result.unwrap(), json!({}));
-    let pages = sent(&frames, "thread/turns/list");
-    assert_eq!(pages[0]["params"], json!({ "threadId": "s", "sortDirection": "desc", "limit": 3, "cursor": null }));
-    assert_eq!(pages[1]["params"]["cursor"], "older");
-    assert_eq!(pages[1]["params"]["limit"], 1);
-    assert_eq!(sent(&frames, "thread/revert")[0]["params"], json!({ "threadId": "s", "beforeTurnId": "edited" }));
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn method_not_found_reverts_the_latest_turn() {
-    let (result, frames) = rollback_replies(
-        1,
-        vec![
-            ("thread/rollback", json!({ "error": { "code": -32601, "message": "Method not found" } })),
-            ("thread/turns/list", json!({ "result": { "data": [{ "id": "last" }], "nextCursor": null } })),
-            ("thread/revert", json!({ "result": {} })),
-        ],
-    )
-    .await;
-    assert_eq!(result.unwrap(), json!({}));
-    assert_eq!(sent(&frames, "thread/revert")[0]["params"]["beforeTurnId"], "last");
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn rollback_refusals_are_not_retried_as_revert() {
-    let (result, frames) = rollback_replies(
-        1,
-        vec![("thread/rollback", json!({ "error": { "code": -32600, "message": "a turn is still running" } }))],
-    )
-    .await;
-    assert!(result.unwrap_err().to_string().contains("a turn is still running"));
-    assert_eq!(frames.len(), 1);
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn incomplete_or_repeated_history_pages_do_not_revert_the_wrong_turn() {
-    for next in [Value::Null, json!("older")] {
-        let (result, frames) = rollback_replies(
-            3,
-            vec![
-                ("thread/rollback", removed_rollback()),
-                ("thread/turns/list", json!({ "result": { "data": [{ "id": "last" }], "nextCursor": "older" } })),
-                ("thread/turns/list", json!({ "result": { "data": [], "nextCursor": next } })),
-            ],
-        )
-        .await;
-        assert!(result.unwrap_err().to_string().contains("reload the task"));
-        assert!(sent(&frames, "thread/revert").is_empty());
-    }
-}
-
 #[tokio::test(flavor = "multi_thread")]
 async fn steering_adds_to_the_running_turn() {
     let (results, _client, frames, _) = replay(Scenario::Steer).await;

crates/ide-agent/src/native/mod.rs

@@ -21,27 +21,18 @@ use std::sync::Arc;
 /// The newest install of `command` on the `PATH` a child sees, by its `--version`.
 /// Several installs are common (npm, Homebrew, the vendor's own installer), and the first
 /// on `PATH` is often an old one that the service no longer serves the current models to.
-/// A path, or a name not found on `PATH`, is used as it is; a single match returns its
-/// resolved path so Windows `PATHEXT` shims (`claude.cmd`, `codex.cmd`) start.
+/// A path, or a name found once (or not at all), is used as it is.
 pub(crate) fn newest_install(command: &str) -> String {
-    let path = ide_core::process::host_var_os("PATH")
-        .or_else(|| ide_core::process::shell_env().find(|(k, _)| *k == "PATH").map(|(_, v)| v.to_owned()))
-        .unwrap_or_default();
-    // Windows: read afresh, so a tool the user installed since the IDE started is found too.
-    newest_install_in(command, &ide_core::process::with_user_path(&path))
-}
-
-fn newest_install_in(command: &str, search: &std::ffi::OsStr) -> String {
-    if Path::new(command).components().count() > 1 || Path::new(command).is_absolute() {
+    if Path::new(command).components().count() > 1 {
         return command.to_owned();
     }
-    let pathext = ide_core::process::host_var_os("PATHEXT");
-    let names =
-        ide_core::process::executable_names(command, cfg!(windows), pathext.as_deref().and_then(|p| p.to_str()));
+    let path = ide_core::process::host_var_os("PATH")
+        .or_else(|| ide_core::process::shell_env().find(|(k, _)| *k == "PATH").map(|(_, v)| v.to_owned()));
     let mut seen = Vec::new();
-    let candidates: Vec<PathBuf> = std::env::split_paths(search)
-        .filter(|d| !d.as_os_str().is_empty())
-        .flat_map(|dir| names.iter().map(move |n| dir.join(n)))
+    let candidates: Vec<PathBuf> = path
+        .iter()
+        .flat_map(std::env::split_paths)
+        .map(|dir| dir.join(command))
         .filter(|p| p.is_file())
         .filter(|p| {
             let real = dunce::canonicalize(p).unwrap_or_else(|_| p.clone());
@@ -51,7 +42,7 @@ fn newest_install_in(command: &str, search: &std::ffi::OsStr) -> String {
         })
         .collect();
     if candidates.len() < 2 {
-        return candidates.into_iter().next().map_or_else(|| command.to_owned(), |p| p.to_string_lossy().into_owned());
+        return command.to_owned();
     }
     candidates
         .into_iter()
@@ -65,7 +56,7 @@ fn version_of(program: &Path) -> Option<Vec<u64>> {
     let mut cmd = std::process::Command::new(program);
     ide_core::process::prepare(&mut cmd);
     let out = cmd.arg("--version").envs(ide_core::process::shell_env()).output().ok()?;
-    parse_version(&ide_core::output_encoding::decode_tool_output(&out.stdout))
+    parse_version(&String::from_utf8_lossy(&out.stdout))
 }
 
 fn parse_version(text: &str) -> Option<Vec<u64>> {
@@ -75,6 +66,16 @@ fn parse_version(text: &str) -> Option<Vec<u64>> {
     })
 }
 
+#[cfg(test)]
+#[test]
+fn versions_are_read_from_either_side_of_the_name() {
+    assert_eq!(parse_version("codex-cli 0.164.0\n"), Some(vec![0, 164, 0]));
+    assert_eq!(parse_version("2.1.312 (Claude Code)"), Some(vec![2, 1, 312]));
+    assert_eq!(parse_version("v1.2"), Some(vec![1, 2]));
+    assert_eq!(parse_version("no version here"), None);
+    assert!(parse_version("codex-cli 0.164.0") > parse_version("codex-cli 0.147.0"));
+}
+
 /// The agent side of an in-process ACP connection.
 pub(crate) trait Shim: Handler {
     /// Called once, before any message arrives: the connection to the client, for
@@ -93,56 +94,3 @@ pub(crate) fn serve<S: Shim>(shim: Arc<S>, client: Arc<dyn Handler>) -> Peer {
     shim.attach(to_client);
     Peer::connect_framed(or, ow, client, Framing::Lines)
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn versions_are_read_from_either_side_of_the_name() {
-        assert_eq!(parse_version("codex-cli 0.164.0\n"), Some(vec![0, 164, 0]));
-        assert_eq!(parse_version("2.1.312 (Claude Code)"), Some(vec![2, 1, 312]));
-        assert_eq!(parse_version("v1.2"), Some(vec![1, 2]));
-        assert_eq!(parse_version("no version here"), None);
-        assert!(parse_version("codex-cli 0.164.0") > parse_version("codex-cli 0.147.0"));
-    }
-
-    #[test]
-    fn newest_install_resolves_single_candidate_and_keeps_missing_or_paths() {
-        let dir = tempfile::tempdir().unwrap();
-        let a = dir.path().join("a");
-        let b = dir.path().join("b");
-        std::fs::create_dir_all(&a).unwrap();
-        std::fs::create_dir_all(&b).unwrap();
-        std::fs::write(a.join("claude"), "#!/bin/sh\n").unwrap();
-        std::fs::write(b.join("claude.cmd"), "@echo off\n").unwrap();
-        let search = std::env::join_paths([&a, &b]).unwrap();
-        if cfg!(windows) {
-            assert_eq!(newest_install_in("claude", &search), b.join("claude.cmd").to_string_lossy());
-        } else {
-            assert_eq!(newest_install_in("claude", &search), a.join("claude").to_string_lossy());
-        }
-        assert_eq!(newest_install_in("nope", &search), "nope");
-        assert_eq!(newest_install_in("bin/claude", &search), "bin/claude");
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn newest_install_compares_versions_across_path_entries() {
-        use std::os::unix::fs::PermissionsExt;
-
-        let dir = tempfile::tempdir().unwrap();
-        let old = dir.path().join("old");
-        let new = dir.path().join("new");
-        for (path, version) in [(&old, "2.9.0"), (&new, "2.10.0")] {
-            std::fs::create_dir_all(path).unwrap();
-            let executable = path.join("agent");
-            std::fs::write(&executable, format!("#!/bin/sh\necho {version}\n")).unwrap();
-            std::fs::set_permissions(&executable, std::fs::Permissions::from_mode(0o755)).unwrap();
-        }
-        for paths in [[&old, &new], [&new, &old]] {
-            let search = std::env::join_paths(paths).unwrap();
-            assert_eq!(newest_install_in("agent", &search), new.join("agent").to_string_lossy());
-        }
-    }
-}

crates/ide-agent/src/provider.rs

@@ -2,8 +2,7 @@
 //! `<config>/agents/<id>.toml` (written by hand, or by installing one from the ACP
 //! Registry, see `registry`).
 
-use crate::{AgentCommandReadOnlyReason, AgentProvider, AgentSource};
-use ide_core::{IdeError, IdeResult};
+use crate::AgentSource;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
@@ -81,92 +80,9 @@ fn builtins() -> Vec<ProviderSpec> {
         .collect()
 }
 
-/// Whether `id` names a built-in agent that needs no registry install (native drivers
-/// and `npx -y` adapters). CLI built-ins (`copilot`, `gemini`, …) can be installed and
-/// updated from the ACP Registry into `<config>/agents/<id>.toml`.
+/// Whether `id` names a built-in agent.
 pub(crate) fn is_builtin(id: &str) -> bool {
-    BUILTIN.iter().any(|&(bid, _, driver, cmd, _)| bid == id && (driver != Driver::Acp || cmd.first() == Some(&"npx")))
-}
-
-/// Display name of a built-in agent, when `id` is one.
-pub(crate) fn builtin_name(id: &str) -> Option<&'static str> {
-    BUILTIN.iter().find(|&&(bid, _, _, _, _)| bid == id).map(|&(_, name, _, _, _)| name)
-}
-
-/// The built-in spec of `id`.
-pub(crate) fn builtin_spec(id: &str) -> Option<ProviderSpec> {
-    builtins().into_iter().find(|s| s.id == id)
-}
-
-/// 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);
-    let reason = if matches!(spec.source, AgentSource::Registry { .. }) {
-        Some(AgentCommandReadOnlyReason::Registry)
-    } else if let Some(default) = &builtin {
-        matches!(default.command.as_str(), "npx" | "bunx" | "uvx").then_some(AgentCommandReadOnlyReason::PackageRunner)
-    } else {
-        Some(AgentCommandReadOnlyReason::CustomAgent)
-    };
-    AgentProvider {
-        id: spec.id.clone(),
-        name: spec.name.clone(),
-        command: std::iter::once(spec.command.as_str())
-            .chain(spec.args.iter().map(String::as_str))
-            .collect::<Vec<_>>()
-            .join(" "),
-        program: spec.command.clone(),
-        args: spec.args.clone(),
-        default_program: builtin.as_ref().map(|b| b.command.clone()),
-        default_args: builtin.as_ref().map(|b| b.args.clone()).unwrap_or_default(),
-        login_hint: Some(spec.login_hint.clone()),
-        command_overridden: builtin.as_ref().is_some_and(|b| b.command != spec.command),
-        command_editable: reason.is_none(),
-        command_read_only_reason: reason,
-        installed: installed(&spec.command),
-        config: vec![],
-        commands: vec![],
-        source: spec.source.clone(),
-    }
-}
-
-/// Overrides built-in `id`'s command through its agent file, preserving other
-/// customizations. `None` restores the built-in command and removes a redundant file.
-pub(crate) fn set_builtin_command(custom_dir: &Path, id: &str, command: Option<&str>) -> IdeResult<()> {
-    let Some(builtin) = builtin_spec(id) else {
-        return Err(IdeError::invalid(format!("{id} is not a built-in agent")));
-    };
-    let file = custom_dir.join(format!("{id}.toml"));
-    let mut agent = if file.try_exists()? {
-        CustomAgent::read(&file).map_err(IdeError::invalid)?
-    } else {
-        CustomAgent {
-            name: Some(builtin.name.clone()),
-            driver: builtin.driver,
-            command: builtin.command.clone(),
-            args: builtin.args.clone(),
-            env: BTreeMap::new(),
-            registry: None,
-        }
-    };
-    if agent.registry.is_some() {
-        return Err(IdeError::invalid(format!("{id} is installed from the ACP Registry")));
-    }
-    if command.is_none()
-        && agent.name.as_deref() == Some(builtin.name.as_str())
-        && agent.driver == builtin.driver
-        && agent.args == builtin.args
-        && agent.env.is_empty()
-    {
-        match std::fs::remove_file(&file) {
-            Err(e) if e.kind() != std::io::ErrorKind::NotFound => return Err(e.into()),
-            _ => {}
-        }
-        return Ok(());
-    }
-    agent.command = command.unwrap_or(&builtin.command).to_owned();
-    agent.write(&file)?;
-    Ok(())
+    BUILTIN.iter().any(|b| b.0 == id)
 }
 
 /// An agent file, `<config>/agents/<id>.toml`.
@@ -246,7 +162,7 @@ pub(crate) fn load(custom_dir: Option<&Path>) -> Vec<ProviderSpec> {
             Some(r) => AgentSource::Registry { version: r.version, update: None },
             None => AgentSource::Custom,
         };
-        let mut spec = ProviderSpec {
+        let spec = ProviderSpec {
             name: agent.name.unwrap_or_else(|| id.clone()),
             driver: agent.driver,
             command: agent.command,
@@ -257,13 +173,7 @@ pub(crate) fn load(custom_dir: Option<&Path>) -> Vec<ProviderSpec> {
             id,
         };
         match specs.iter_mut().find(|s| s.id == spec.id) {
-            Some(existing) => {
-                spec.login_hint = existing.login_hint.clone();
-                if spec.source == AgentSource::Custom {
-                    spec.source = AgentSource::Builtin;
-                }
-                *existing = spec;
-            }
+            Some(existing) => *existing = spec,
             None => specs.push(spec),
         }
     }
@@ -301,54 +211,6 @@ fn is_executable(p: &Path) -> bool {
 mod tests {
     use super::*;
 
-    #[test]
-    fn launch_metadata_distinguishes_defaults_overrides_and_read_only_agents() {
-        let dir = tempfile::tempdir().unwrap();
-        let list = || load(Some(dir.path())).iter().map(describe).collect::<Vec<_>>();
-        let defaults = list();
-        let codex = defaults.iter().find(|p| p.id == "codex").unwrap();
-        assert_eq!(codex.program, "codex");
-        assert_eq!(codex.default_program.as_deref(), Some("codex"));
-        assert_eq!(codex.args, ["app-server"]);
-        assert_eq!(codex.default_args, codex.args);
-        assert_eq!(codex.command, "codex app-server");
-        assert_eq!(codex.login_hint.as_deref(), Some("Run `codex login` in a terminal."));
-        assert!(!codex.command_overridden);
-        assert!(codex.command_editable);
-        for p in &defaults {
-            assert_eq!(p.source, AgentSource::Builtin);
-            assert!(p.default_program.is_some());
-            assert_eq!(p.command_editable, !p.id.ends_with("-acp"));
-            assert_eq!(
-                p.command_read_only_reason,
-                p.id.ends_with("-acp").then_some(AgentCommandReadOnlyReason::PackageRunner)
-            );
-        }
-        set_builtin_command(dir.path(), "codex", Some("/path with spaces/codex")).unwrap();
-        let overridden = list().into_iter().find(|p| p.id == "codex").unwrap();
-        assert_eq!(overridden.program, "/path with spaces/codex");
-        assert_eq!(overridden.args, codex.args);
-        assert_eq!(overridden.default_program, codex.default_program);
-        assert!(overridden.command_overridden && overridden.command_editable);
-        assert_eq!(overridden.source, AgentSource::Builtin);
-        set_builtin_command(dir.path(), "codex", Some("codex")).unwrap();
-        assert!(!list().iter().find(|p| p.id == "codex").unwrap().command_overridden);
-        std::fs::write(
-            dir.path().join("gemini.toml"),
-            "command = \"/registry/gemini\"\n[registry]\nid = \"gemini\"\nversion = \"1.0\"\n",
-        )
-        .unwrap();
-        let registry = list().into_iter().find(|p| p.id == "gemini").unwrap();
-        assert_eq!(registry.default_program.as_deref(), Some("gemini"));
-        assert!(!registry.command_editable);
-        assert_eq!(registry.command_read_only_reason, Some(AgentCommandReadOnlyReason::Registry));
-        assert!(matches!(registry.source, AgentSource::Registry { .. }));
-        std::fs::write(dir.path().join("mine.toml"), "command = \"mine\"\n").unwrap();
-        let custom = list().into_iter().find(|p| p.id == "mine").unwrap();
-        assert_eq!(custom.default_program, None);
-        assert_eq!(custom.command_read_only_reason, Some(AgentCommandReadOnlyReason::CustomAgent));
-    }
-
     #[test]
     fn custom_agents_extend_and_override_the_builtins() {
         let dir = tempfile::tempdir().unwrap();
@@ -368,90 +230,6 @@ mod tests {
         assert!(installed("sh"));
     }
 
-    #[test]
-    fn set_builtin_command_overrides_and_clears_a_builtin() {
-        let dir = tempfile::tempdir().unwrap();
-        set_builtin_command(dir.path(), "not-a-builtin", Some("/x")).unwrap_err();
-        set_builtin_command(dir.path(), "claude", Some("/opt/claude")).unwrap();
-        let claude = load(Some(dir.path())).into_iter().find(|s| s.id == "claude").unwrap();
-        assert_eq!((claude.command.as_str(), claude.driver), ("/opt/claude", Driver::Claude));
-        assert!(claude.args.is_empty());
-        // A registry install is neither overwritten nor removed by a command override.
-        let path = dir.path().join("codex.toml");
-        CustomAgent {
-            name: None,
-            driver: Driver::Acp,
-            command: "amp".into(),
-            args: vec![],
-            env: BTreeMap::new(),
-            registry: Some(RegistryRef { id: "amp-acp".into(), version: "1.0.0".into() }),
-        }
-        .write(&path)
-        .unwrap();
-        set_builtin_command(dir.path(), "codex", Some("/x")).unwrap_err();
-        set_builtin_command(dir.path(), "codex", None).unwrap_err();
-        assert!(path.exists());
-        // Clearing (twice) returns the built-in to auto-detection.
-        set_builtin_command(dir.path(), "claude", None).unwrap();
-        set_builtin_command(dir.path(), "claude", None).unwrap();
-        assert!(!dir.path().join("claude.toml").exists());
-        assert_eq!(load(Some(dir.path())).iter().find(|s| s.id == "claude").unwrap().command, "claude");
-    }
-
-    #[test]
-    fn set_builtin_command_preserves_other_customizations_on_save_and_reset() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("claude.toml");
-        for field in ["name", "driver", "args", "env", "unnamed"] {
-            let mut agent = CustomAgent {
-                name: Some("Claude Code".into()),
-                driver: Driver::Claude,
-                command: "/old/claude".into(),
-                args: vec![],
-                env: BTreeMap::new(),
-                registry: None,
-            };
-            match field {
-                "name" => agent.name = Some("My Claude".into()),
-                "driver" => agent.driver = Driver::Acp,
-                "args" => agent.args.push("--verbose".into()),
-                "env" => {
-                    agent.env.insert("K".into(), "v".into());
-                }
-                "unnamed" => agent.name = None,
-                _ => unreachable!(),
-            }
-            agent.write(&path).unwrap();
-
-            set_builtin_command(dir.path(), "claude", Some("/new/claude")).unwrap();
-            agent.command = "/new/claude".into();
-            assert_eq!(CustomAgent::read(&path).unwrap(), agent, "{field}");
-
-            set_builtin_command(dir.path(), "claude", None).unwrap();
-            agent.command = "claude".into();
-            assert_eq!(CustomAgent::read(&path).unwrap(), agent, "{field}");
-        }
-    }
-
-    #[test]
-    fn resetting_a_command_only_override_removes_the_file() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("codex.toml");
-        std::fs::write(
-            &path,
-            "name = \"Codex\"\ndriver = \"codex\"\ncommand = \"/custom/codex\"\nargs = [\"app-server\"]\n",
-        )
-        .unwrap();
-
-        set_builtin_command(dir.path(), "codex", None).unwrap();
-
-        assert!(!path.exists());
-        assert_eq!(
-            load(Some(dir.path())).into_iter().find(|s| s.id == "codex").unwrap(),
-            builtin_spec("codex").unwrap()
-        );
-    }
-
     #[test]
     fn agent_files_round_trip_with_their_registry_table() {
         let dir = tempfile::tempdir().unwrap();

crates/ide-agent/src/registry.rs

@@ -165,13 +165,6 @@ fn parse(text: &str) -> IdeResult<Vec<Entry>> {
         .into_iter()
         .filter_map(|v| serde_json::from_value::<Entry>(v).ok())
         .filter(|e| safe_segment(&e.id) && safe_segment(&e.version))
-        .map(|mut e| {
-            e.id = canonical_id(&e.id).to_owned();
-            if let Some(name) = provider::builtin_name(&e.id) {
-                e.name = name.to_owned();
-            }
-            e
-        })
         .collect())
 }
 
@@ -229,26 +222,14 @@ fn choose<'a>(entry: &'a Entry, platform: Platform, on_path: &dyn Fn(&str) -> bo
     {
         return Some(Choice::Uvx(p));
     }
-    // Last resort: npx and uvx run natively, this one under OS emulation.
-    if platform.os == Os::Windows
-        && platform.arch == Arch::Arm64
-        && let Some(b) = d.binary.get("windows-x86_64")
-    {
-        return Some(Choice::Binary(b));
-    }
     None
 }
 
-/// Registry ids that map to a shorter built-in provider id (`<config>/agents/<id>.toml`).
-const BUILTIN_ALIASES: &[(&str, &str)] =
-    &[("github-copilot-cli", "copilot"), ("qwen-code", "qwen"), ("mistral-vibe", "vibe")];
-
-fn canonical_id(id: &str) -> &str {
-    BUILTIN_ALIASES.iter().find_map(|&(alias, canonical)| (alias == id).then_some(canonical)).unwrap_or(id)
-}
+/// Registry agents that are built-in ones under another id.
+const BUILTIN_ALIASES: &[&str] = &["github-copilot-cli", "qwen-code", "mistral-vibe"];
 
 fn is_builtin(id: &str) -> bool {
-    provider::is_builtin(canonical_id(id))
+    provider::is_builtin(id) || BUILTIN_ALIASES.contains(&id)
 }
 
 fn on_path(command: &str) -> bool {
@@ -354,7 +335,7 @@ pub fn mark_updates(paths: &RegistryPaths, providers: &mut [AgentProvider]) {
 
 /// HTTPS only, redirects included. Tests serve downloads over `file://`.
 fn http() -> IdeResult<Http> {
-    let http = Http::new(&ide_core::tool_path::search_path())?;
+    let http = Http::new(&ide_tools::default_search_path())?;
     Ok(if cfg!(test) { http } else { http.https_only() })
 }
 
@@ -399,7 +380,6 @@ fn write_atomic(path: &Path, bytes: &[u8]) -> std::io::Result<()> {
 /// Installs (or updates to) the registry's current version of `id`, streaming progress
 /// through `emit`, and points the agent file at it.
 pub fn install(paths: &RegistryPaths, id: &str, cancel: &CancellationToken, emit: Emit) -> IdeResult<()> {
-    let id = canonical_id(id);
     // The saved index is what the user picked from; fetch only when there is none.
     let text = match fs::read_to_string(&paths.cache_file) {
         Ok(text) => text,
@@ -631,7 +611,6 @@ fn install_uv(
 
 /// Deletes a registry agent's file and installed files.
 pub fn remove(paths: &RegistryPaths, id: &str) -> IdeResult<()> {
-    let id = canonical_id(id);
     if !safe_segment(id) {
         return Err(IdeError::invalid(format!("invalid agent id {id}")));
     }
@@ -710,20 +689,6 @@ mod tests {
     const LINUX: Platform = Platform { os: Os::Linux, arch: Arch::X64 };
     const WINDOWS: Platform = Platform { os: Os::Windows, arch: Arch::X64 };
 
-    #[test]
-    fn windows_arm_binary_prefers_native_then_x64() {
-        let mut entry = parse(INDEX).unwrap().remove(0);
-        let arm = Platform { os: Os::Windows, arch: Arch::Arm64 };
-        assert!(matches!(choose(&entry, arm, &|_| false), Some(Choice::Binary(_))));
-        assert!(choose(&entry, Platform { os: Os::Linux, arch: Arch::Arm64 }, &|_| false).is_none());
-        entry.distribution.npx = Some(serde_json::from_str(r#"{"package":"amp-acp"}"#).unwrap());
-        assert!(matches!(choose(&entry, arm, &|_| true), Some(Choice::Npx(_))));
-        let mut native = entry.distribution.binary["windows-x86_64"].clone();
-        native.cmd = "native.exe".into();
-        entry.distribution.binary.insert("windows-aarch64".into(), native);
-        assert!(matches!(choose(&entry, arm, &|_| false), Some(Choice::Binary(b)) if b.cmd == "native.exe"));
-    }
-
     const INDEX: &str = r#"{"version":"1.0.0","agents":[
         {"id":"amp-acp","name":"Amp","version":"0.10.0","description":"Amp over ACP",
          "repository":"https://github.com/x/amp-acp","authors":["x"],"license":"Apache-2.0",
@@ -826,7 +791,15 @@ mod tests {
         let mut providers: Vec<AgentProvider> = provider::load(Some(&p.agents_dir))
             .into_iter()
             .filter(|s| s.id == "amp-acp")
-            .map(|s| provider::describe(&s))
+            .map(|s| AgentProvider {
+                id: s.id,
+                name: s.name,
+                command: s.command,
+                installed: false,
+                config: vec![],
+                commands: vec![],
+                source: s.source,
+            })
             .collect();
         mark_updates(&p, &mut providers);
         assert_eq!(
@@ -952,56 +925,4 @@ mod tests {
         assert!(remove(&p, "amp-acp").is_err());
         assert!(p.agent_file("amp-acp").exists());
     }
-
-    #[test]
-    fn maps_github_copilot_cli_to_builtin_copilot_and_tracks_updates() {
-        let dir = tempfile::tempdir().unwrap();
-        let p = paths(dir.path());
-        let index = r#"{"agents":[
-            {"id":"github-copilot-cli","name":"Copilot","version":"1.0.105",
-             "description":"GitHub's AI pair programmer",
-             "distribution":{"npx":{"package":"@github/[email protected]","args":["--acp"]}}}
-        ]}"#;
-        let entries = parse(index).unwrap();
-        assert_eq!(entries.len(), 1);
-        assert_eq!((entries[0].id.as_str(), entries[0].name.as_str()), ("copilot", "GitHub Copilot"));
-
-        let shown = visible(&p, &entries, MAC_ARM, &|c| c == "npm" || c == "node");
-        assert_eq!(shown.len(), 1);
-        assert_eq!(
-            (shown[0].id.as_str(), shown[0].name.as_str(), shown[0].installed.as_deref()),
-            ("copilot", "GitHub Copilot", None)
-        );
-
-        CustomAgent {
-            name: Some("GitHub Copilot".into()),
-            driver: Driver::Acp,
-            command: "/data/tools/copilot/1.0.104/node_modules/.bin/copilot".into(),
-            args: vec!["--acp".into()],
-            env: BTreeMap::new(),
-            registry: Some(RegistryRef { id: "copilot".into(), version: "1.0.104".into() }),
-        }
-        .write(&p.agent_file("copilot"))
-        .unwrap();
-
-        let shown = visible(&p, &entries, MAC_ARM, &|c| c == "npm" || c == "node");
-        assert_eq!((shown[0].installed.as_deref(), shown[0].update), (Some("1.0.104"), true));
-
-        write_atomic(&p.cache_file, index.as_bytes()).unwrap();
-        let spec = provider::load(Some(&p.agents_dir)).into_iter().find(|s| s.id == "copilot").unwrap();
-        assert_eq!(spec.name, "GitHub Copilot");
-        assert_eq!(spec.login_hint, "Run `copilot` in a terminal and sign in.");
-        assert_eq!(spec.source, AgentSource::Registry { version: "1.0.104".into(), update: None });
-
-        let mut providers = vec![provider::describe(&spec)];
-        mark_updates(&p, &mut providers);
-        assert_eq!(
-            providers[0].source,
-            AgentSource::Registry { version: "1.0.104".into(), update: Some("1.0.105".into()) }
-        );
-
-        remove(&p, "github-copilot-cli").unwrap();
-        let fallback = provider::load(Some(&p.agents_dir)).into_iter().find(|s| s.id == "copilot").unwrap();
-        assert_eq!(fallback.source, AgentSource::Builtin);
-    }
 }

crates/ide-agent/src/replay.rs

@@ -185,23 +185,7 @@ pub(crate) fn recorder(out: PathBuf) -> Connector {
     let file = Arc::new(Mutex::new(String::new()));
     let connections = Arc::new(Mutex::new(0u32));
     Arc::new(move |spec, cwd, client, on_stderr| {
-        let program = {
-            let path = Path::new(&spec.command);
-            if path.components().count() > 1 || path.is_absolute() {
-                path.to_path_buf()
-            } else {
-                let search = spec
-                    .env
-                    .iter()
-                    .find(|(k, _)| k.eq_ignore_ascii_case("PATH"))
-                    .map(|(_, v)| std::ffi::OsString::from(v))
-                    .or_else(|| ide_core::process::shell_env().find(|(k, _)| k == "PATH").map(|(_, v)| v))
-                    .or_else(|| ide_core::process::host_var_os("PATH"))
-                    .unwrap_or_default();
-                ide_core::process::find_executable(&spec.command, &search).unwrap_or_else(|| path.to_path_buf())
-            }
-        };
-        let mut cmd = tokio::process::Command::new(&program);
+        let mut cmd = tokio::process::Command::new(&spec.command);
         ide_core::process::prepare(cmd.as_std_mut());
         let mut child = cmd
             .args(&spec.args)

crates/ide-agent/src/replay_tests.rs

@@ -56,7 +56,6 @@ fn config(provider: &str) -> Vec<AgentConfigChoice> {
 
 async fn create(mgr: &AgentManager, provider: &str, prompt: &str) -> String {
     let req = NewAgentTask {
-        project_root: None,
         prompt: text(prompt),
         provider: provider.into(),
         config: config(provider),

crates/ide-agent/src/tests.rs

@@ -9,8 +9,6 @@ struct FakeAgent {
     /// Every connection's agent side, kept open.
     servers: Mutex<Vec<Peer>>,
     calls: Mutex<Vec<String>>,
-    /// Without `loadSession` (a session lives only as long as its process).
-    no_load: bool,
 }
 
 impl FakeAgent {
@@ -91,7 +89,7 @@ impl Handler for FakeAgent {
                 if params.pointer("/clientCapabilities/subagents").is_some_and(Value::is_object) {
                     self.calls.lock().push("subagents".into());
                 }
-                Ok(json!({"protocolVersion": 1, "agentCapabilities": {"loadSession": !self.no_load,
+                Ok(json!({"protocolVersion": 1, "agentCapabilities": {"loadSession": true,
                     "sessionCapabilities": {"fork": {}}, "_meta": {"openidea": {"rollback": true, "steer": true}}}}))
             }
             "session/new" => Ok(json!({"sessionId": "s1",
@@ -147,16 +145,7 @@ impl Handler for FakeAgent {
                     json!({"sessionUpdate": "available_commands_update",
                     "availableCommands": [{"name": "review", "description": "Review", "input": {"hint": "focus"}}]}),
                 );
-                self.update(
-                    &session,
-                    json!({"sessionUpdate": "usage_update", "used": 50, "size": 1000,
-                    "cost": {"amount": 0.25, "currency": "USD"}}),
-                );
-                self.update(
-                    &session,
-                    json!({"sessionUpdate": LIMITS_UPDATE,
-                    "limits": [{"window": "five_hour", "usedPercent": 19.0, "resetsMs": 5000.0}]}),
-                );
+                self.update(&session, json!({"sessionUpdate": "usage_update", "used": 50, "size": 1000}));
                 self.update(&session, json!({"sessionUpdate": "session_info_update", "title": "Lexer fix"}));
                 self.say(&session, "Hi");
                 self.update(
@@ -221,11 +210,10 @@ async fn commands_are_remembered_per_project_and_merged_with_skills_on_disk() {
     let names = |c: Vec<AgentCommand>| c.into_iter().map(|c| c.name).collect::<Vec<_>>();
 
     let mgr_a = manager_at(&a, &models, Arc::new(FakeAgent::default()));
-    // Before any session: only the skills on disk.
+    // Before any session: the skills on disk.
     assert_eq!(names(mgr_a.commands("claude", None).await.unwrap()), ["triage"]);
     let task = mgr_a
         .create(NewAgentTask {
-            project_root: None,
             prompt: text("Fix the lexer"),
             provider: "claude".into(),
             config: Vec::new(),
@@ -239,8 +227,6 @@ async fn commands_are_remembered_per_project_and_merged_with_skills_on_disk() {
     assert_eq!(names(mgr_a.commands("claude", Some(&task.id)).await.unwrap()), ["review", "triage"]);
     // Other agents get only what they offered.
     assert!(mgr_a.commands("codex", None).await.unwrap().is_empty());
-    mgr_a.cancel(&task.id, None).unwrap();
-    wait_for(&mgr_a, &task.id, AgentStatus::Ready).await;
     mgr_a.shutdown();
 
     // Another project shares the settings but not the commands.
@@ -253,46 +239,6 @@ async fn commands_are_remembered_per_project_and_merged_with_skills_on_disk() {
     assert_eq!(names(mgr_a.providers().into_iter().find(|p| p.id == "claude").unwrap().commands), ["review"]);
 }
 
-#[tokio::test(flavor = "multi_thread")]
-async fn builtin_commands_only_fill_verified_gaps_and_preserve_advertised_metadata() {
-    let tmp = tempfile::tempdir().unwrap();
-    let agent = Arc::new(FakeAgent::default());
-    let mgr = manager_at(tmp.path(), &tmp.path().join("models.json"), agent);
-    for provider in ["claude", "claude-acp", "opencode2", "codex", "custom"] {
-        assert!(mgr.commands(provider, None).await.unwrap().is_empty(), "{provider}");
-    }
-    let commands = mgr.commands("opencode", None).await.unwrap();
-    assert_eq!(commands.iter().map(|c| c.name.as_str()).collect::<Vec<_>>(), ["compact"]);
-    let task = mgr
-        .create(NewAgentTask {
-            project_root: None,
-            prompt: text("Hello"),
-            provider: "opencode".into(),
-            config: Vec::new(),
-            isolation: Isolation::Local,
-            base: None,
-        })
-        .await
-        .unwrap();
-    wait_for(&mgr, &task.id, AgentStatus::NeedsInput).await;
-    let advertised = AgentCommand {
-        name: "compact".into(),
-        description: "Agent supplied description".into(),
-        hint: Some("instructions".into()),
-    };
-    mgr.task(&task.id).unwrap().state.lock().task.commands = vec![advertised.clone()];
-    // The task's provider wins over the caller's provider; metadata is not replaced.
-    let commands = mgr.commands("claude", Some(&task.id)).await.unwrap();
-    assert_eq!(commands.len(), 1);
-    assert_eq!(commands[0].name, advertised.name);
-    assert_eq!(commands[0].description, advertised.description);
-    assert_eq!(commands[0].hint, advertised.hint);
-    // Finish the in-process agent before Tokio stops driving its permission response.
-    mgr.cancel(&task.id, None).unwrap();
-    wait_for(&mgr, &task.id, AgentStatus::Ready).await;
-    mgr.shutdown();
-}
-
 async fn wait_for(mgr: &AgentManager, id: &str, status: AgentStatus) {
     for _ in 0..500 {
         let task = mgr.task(id).unwrap();
@@ -322,7 +268,6 @@ async fn a_task_runs_asks_for_permission_and_survives_a_restart() {
 
     let task = mgr
         .create(NewAgentTask {
-            project_root: None,
             prompt: text("Fix the lexer\nmore detail"),
             provider: "claude".into(),
             config: vec![AgentConfigChoice { id: "model".into(), value: "small".into() }],
@@ -369,10 +314,6 @@ async fn a_task_runs_asks_for_permission_and_survives_a_restart() {
         assert_eq!((modes.via, modes.current.as_deref()), (AgentConfigVia::Mode, Some("ask")));
         assert_eq!(t.commands.iter().map(|c| c.name.as_str()).collect::<Vec<_>>(), ["review"]);
         assert_eq!(t.usage.as_ref().map(|u| (u.used, u.size)), Some((50, 1000)));
-        assert_eq!(
-            t.usage.as_ref().and_then(|u| u.cost.clone()),
-            Some(Box::new(AgentCost { amount: 0.25, currency: "USD".into() }))
-        );
         assert_eq!(t.title, "Lexer fix", "the agent's title replaces the prompt's first line");
     }
     mgr.set_config(&task.id, "mode", "code".into()).await.unwrap();
@@ -385,18 +326,6 @@ async fn a_task_runs_asks_for_permission_and_survives_a_restart() {
         assert!(
             events.iter().any(|e| matches!(e, AgentEvent::Task { task } if task.status == AgentStatus::NeedsInput))
         );
-        let limits = events.iter().find_map(|e| match e {
-            AgentEvent::Limits { provider, limits } => Some((provider.as_str(), limits.clone())),
-            _ => None,
-        });
-        assert_eq!(
-            limits,
-            Some((
-                task.provider.as_str(),
-                vec![AgentLimit { window: "five_hour".into(), used_percent: 19.0, resets_ms: Some(5000.0) }]
-            )),
-            "an agent's usage limits are its provider's"
-        );
         let last_entry = events.iter().rev().find_map(|e| match e {
             AgentEvent::Entry { index, entry, .. } if !matches!(entry, AgentEntry::User { .. }) => {
                 Some((*index, entry.clone()))
@@ -445,7 +374,6 @@ async fn messages_sent_while_busy_are_queued_and_send_now_interrupts() {
     let mgr = manager(tmp.path(), agent.clone());
     let task = mgr
         .create(NewAgentTask {
-            project_root: None,
             prompt: text("wait"),
             provider: "claude".into(),
             config: vec![],
@@ -500,7 +428,6 @@ async fn subagents_get_their_own_conversation() {
     let mgr = manager(tmp.path(), agent.clone());
     let task = mgr
         .create(NewAgentTask {
-            project_root: None,
             prompt: text("delegate"),
             provider: "claude".into(),
             config: vec![],
@@ -594,7 +521,6 @@ async fn cancelling_resolves_the_open_permission_and_delete_forgets_the_task() {
     let mgr = manager(tmp.path(), Arc::new(FakeAgent::default()));
     let task = mgr
         .create(NewAgentTask {
-            project_root: None,
             prompt: text("do it"),
             provider: "codex".into(),
             config: vec![],
@@ -616,7 +542,6 @@ async fn cancelling_resolves_the_open_permission_and_delete_forgets_the_task() {
     assert!(!tmp.path().join("store").join(format!("{}.json", task.id)).exists());
     assert!(
         mgr.create(NewAgentTask {
-            project_root: None,
             prompt: text(" "),
             provider: "codex".into(),
             config: vec![],
@@ -662,7 +587,6 @@ async fn real_claude_task_in_a_worktree() {
     );
     let task = mgr
         .create(NewAgentTask {
-            project_root: None,
             prompt: text("Create a file named hello.txt containing the single word hi. Do nothing else."),
             provider: "claude".into(),
             config: vec![AgentConfigChoice { id: "model".into(), value: "haiku".into() }],
@@ -711,7 +635,6 @@ async fn forks_rollbacks_and_steering() {
     let agent = Arc::new(FakeAgent::default());
     let mgr = manager(tmp.path(), agent.clone());
     let new = |prompt: &str| NewAgentTask {
-        project_root: None,
         prompt: text(prompt),
         provider: "claude".into(),
         config: Vec::new(),
@@ -762,7 +685,6 @@ async fn usage_limits_and_late_settings() {
     let mgr = manager(tmp.path(), agent.clone());
     let task = mgr
         .create(NewAgentTask {
-            project_root: None,
             prompt: text("limit"),
             provider: "claude".into(),
             // `effort` isn't offered until the session runs.
@@ -799,25 +721,12 @@ fn retry_updates_become_a_countdown() {
     assert_eq!(retry_of(&json!({"sessionUpdate": RETRY_UPDATE}), 0.0), None, "no attempt");
 }
 
-#[test]
-fn usage_limits_and_cost_skip_what_is_malformed() {
-    let limits = config::limits_of(&json!({"sessionUpdate": LIMITS_UPDATE, "limits": [
-        {"window": "seven_day", "usedPercent": 140.0},
-        {"window": "", "usedPercent": 10.0},
-        {"window": "five_hour"},
-    ]}));
-    assert_eq!(limits, [AgentLimit { window: "seven_day".into(), used_percent: 100.0, resets_ms: None }]);
-    let usage = config::usage_of(&json!({"used": 1, "size": 2, "cost": {"amount": -1.0, "currency": "USD"}}));
-    assert_eq!(usage.map(|u| u.cost), Some(None), "a negative cost is dropped, the context use kept");
-}
-
 #[tokio::test(flavor = "multi_thread")]
 async fn cursor_approval_switch_resolves_pending_and_survives_restart() {
     let tmp = tempfile::tempdir().unwrap();
     let agent = Arc::new(FakeAgent::default());
     let mgr = manager(tmp.path(), agent.clone());
     let new = || NewAgentTask {
-        project_root: None,
         prompt: text("Fix"),
         provider: "cursor".into(),
         config: Vec::new(),
@@ -843,17 +752,15 @@ async fn cursor_approval_switch_resolves_pending_and_survives_restart() {
     mgr.prompt(&task.id, text("Fix again"), false).await.unwrap();
     wait_for(&mgr, &task.id, AgentStatus::Ready).await;
     assert!(!agent.calls.lock().iter().any(|c| c.contains("bypass")));
-    assert!(config::bypass_approvals("cursor", &mgr.shared.known_config("cursor")));
+    assert!(!config::bypass_approvals("cursor", &mgr.shared.known_config("cursor")));
     mgr.set_config(&task.id, config::CURSOR_APPROVAL, "ask".into()).await.unwrap();
     mgr.prompt(&task.id, text("Fix once more"), false).await.unwrap();
     wait_for(&mgr, &task.id, AgentStatus::NeedsInput).await;
     mgr.cancel(&task.id, None).unwrap();
     wait_for(&mgr, &task.id, AgentStatus::Ready).await;
-    // A task created without choosing approvals still asks; the New Task page sends the default.
+    // An unrelated new conversation still asks, even after the cache was updated.
     let other = mgr.create(new()).await.unwrap();
     wait_for(&mgr, &other.id, AgentStatus::NeedsInput).await;
-    mgr.cancel(&other.id, None).unwrap();
-    wait_for(&mgr, &other.id, AgentStatus::Ready).await;
     mgr.shutdown();
 }
 
@@ -863,7 +770,6 @@ async fn cursor_approval_choice_applies_before_first_prompt() {
     let mgr = manager(tmp.path(), Arc::new(FakeAgent::default()));
     let task = mgr
         .create(NewAgentTask {
-            project_root: None,
             prompt: text("Fix"),
             provider: "cursor".into(),
             config: vec![AgentConfigChoice { id: config::CURSOR_APPROVAL.into(), value: "bypass".into() }],
@@ -875,237 +781,3 @@ async fn cursor_approval_choice_applies_before_first_prompt() {
     wait_for(&mgr, &task.id, AgentStatus::Ready).await;
     mgr.shutdown();
 }
-
-#[tokio::test(flavor = "multi_thread")]
-async fn archived_tasks_can_be_restored_and_continue_their_session() {
-    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("again"),
-            provider: "claude".into(),
-            config: vec![],
-            isolation: Isolation::Local,
-            base: None,
-        })
-        .await
-        .unwrap();
-    wait_for(&mgr, &task.id, AgentStatus::Ready).await;
-    let entries = mgr.entries(&task.id, None).unwrap();
-    mgr.archive(&task.id).unwrap();
-    assert!(mgr.prompt(&task.id, text("again"), false).await.is_err());
-    mgr.unarchive(&task.id).unwrap();
-    assert_eq!(mgr.task(&task.id).unwrap().state.lock().task.status, AgentStatus::Ready);
-    assert!(mgr.task(&task.id).unwrap().live.lock().is_none());
-    assert_eq!(mgr.entries(&task.id, None).unwrap().len(), entries.len());
-    drop(mgr);
-    let mgr = manager(tmp.path(), agent.clone());
-    assert_eq!(mgr.task(&task.id).unwrap().state.lock().task.status, AgentStatus::Ready);
-    mgr.prompt(&task.id, text("again"), false).await.unwrap();
-    wait_for(&mgr, &task.id, AgentStatus::Ready).await;
-    assert!(agent.calls.lock().iter().any(|call| call == "session/load"));
-    assert_eq!(mgr.entries(&task.id, None).unwrap().len(), entries.len() + 2);
-    mgr.unarchive(&task.id).unwrap();
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn task_project_root_controls_local_and_worktree_repositories() {
-    let tmp = tempfile::tempdir().unwrap();
-    let root = dunce::canonicalize(tmp.path()).unwrap();
-    let member = root.join("project-b");
-    std::fs::create_dir(&member).unwrap();
-    let git = |args: &[&str]| {
-        let out = std::process::Command::new("git")
-            .args(["-c", "user.name=t", "-c", "user.email=t@t", "-c", "commit.gpgsign=false"])
-            .args(args)
-            .current_dir(&member)
-            .output()
-            .unwrap();
-        assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
-        String::from_utf8_lossy(&out.stdout).trim().to_owned()
-    };
-    git(&["init", "-q", "-b", "member-main"]);
-    std::fs::write(member.join("file.txt"), "original\n").unwrap();
-    git(&["add", "."]);
-    git(&["commit", "-qm", "initial"]);
-    let mgr = manager(&root, Arc::new(FakeAgent::default()));
-    for isolation in [Isolation::Local, Isolation::Worktree] {
-        let task = mgr
-            .create(NewAgentTask {
-                project_root: Some(IpcPath(member.clone())),
-                prompt: text("member task"),
-                provider: "claude".into(),
-                config: vec![],
-                isolation,
-                base: None,
-            })
-            .await
-            .unwrap();
-        wait_for(&mgr, &task.id, AgentStatus::NeedsInput).await;
-        let permission = mgr
-            .entries(&task.id, None)
-            .unwrap()
-            .iter()
-            .find_map(|e| match e {
-                AgentEntry::Permission { id, .. } => Some(*id),
-                _ => None,
-            })
-            .unwrap();
-        mgr.respond(&task.id, permission, Some("yes".into())).unwrap();
-        wait_for(&mgr, &task.id, AgentStatus::Ready).await;
-        assert_eq!(task.project_root, Some(IpcPath(member.clone())));
-        assert_eq!(task.base.as_deref(), Some("member-main"));
-        if isolation == Isolation::Local {
-            assert_eq!(task.cwd.0, member);
-        } else {
-            assert_ne!(task.cwd.0, member);
-            assert_eq!(std::fs::read_to_string(task.cwd.0.join("file.txt")).unwrap(), "original\n");
-        }
-        std::fs::write(task.cwd.0.join("file.txt"), "changed\n").unwrap();
-        let changes = mgr.changes(&task.id).await.unwrap();
-        assert_eq!(changes.len(), 1);
-        assert_eq!(changes[0].path.0, task.cwd.0.join("file.txt"));
-        assert_eq!(mgr.base_text(&task.id, changes[0].path.0.clone()).await.unwrap().as_deref(), Some("original\n"));
-        let saved = std::fs::read(root.join("store").join(format!("{}.json", task.id))).unwrap();
-        assert!(String::from_utf8(saved).unwrap().contains("projectRoot"));
-        let mut old = serde_json::to_value(&task).unwrap();
-        old.as_object_mut().unwrap().remove("projectRoot");
-        assert!(serde_json::from_value::<AgentTask>(old).unwrap().project_root.is_none());
-        mgr.delete(&task.id, true).await.unwrap();
-        if isolation == Isolation::Worktree {
-            assert!(!task.cwd.0.exists());
-        }
-        std::fs::write(member.join("file.txt"), "original\n").unwrap();
-    }
-    assert_eq!(git(&["worktree", "list", "--porcelain"]).matches("worktree ").count(), 1);
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn reload_providers_updates_registry_install_clears_stale_probes_and_notifies_subscribers() {
-    let tmp = tempfile::tempdir().unwrap();
-    let agents_dir = tmp.path().join("agents");
-    std::fs::create_dir_all(&agents_dir).unwrap();
-    let fake_bin = tmp.path().join(if cfg!(windows) { "copilot.cmd" } else { "copilot" });
-    std::fs::write(&fake_bin, "").unwrap();
-    #[cfg(unix)]
-    {
-        use std::os::unix::fs::PermissionsExt;
-        std::fs::set_permissions(&fake_bin, std::fs::Permissions::from_mode(0o755)).unwrap();
-    }
-
-    let agent = Arc::new(FakeAgent::default());
-    let connector: Connector = {
-        let agent = agent.clone();
-        Arc::new(move |_spec, _cwd, client, _stderr| {
-            let (a, b) = duplex(1 << 20);
-            let (ar, aw) = tokio::io::split(a);
-            let (br, bw) = tokio::io::split(b);
-            let server = Peer::connect_framed(br, bw, agent.clone(), Framing::Lines);
-            agent.servers.lock().push(server);
-            Ok(Peer::connect_framed(ar, aw, client, Framing::Lines))
-        })
-    };
-    let mgr = AgentManager::with_connector(
-        AgentPaths {
-            project_root: tmp.path().to_path_buf(),
-            store_dir: tmp.path().join("store"),
-            worktrees_dir: tmp.path().join("worktrees"),
-            models_file: tmp.path().join("models.json"),
-            custom_agents_dir: Some(agents_dir.clone()),
-            home_dir: None,
-        },
-        tokio::runtime::Handle::current(),
-        connector,
-    );
-
-    // Seed a stale failed probe for copilot before installing its custom TOML.
-    mgr.shared.probes.lock().insert(
-        "copilot".into(),
-        AgentProbe {
-            provider: "copilot".into(),
-            name: None,
-            version: None,
-            protocol: "ACP".into(),
-            capabilities: AgentCapabilities::default(),
-            auth_methods: Vec::new(),
-            error: Some("copilot --acp was not found on PATH.".into()),
-        },
-    );
-
-    let events = Arc::new(Mutex::new(Vec::new()));
-    let events_sink = events.clone();
-    mgr.subscribe(Arc::new(move |ev| events_sink.lock().push(ev)));
-
-    let toml = format!(
-        "name = \"GitHub Copilot\"\ncommand = {:?}\nargs = [\"--acp\", \"--stdio\"]\n",
-        fake_bin.to_string_lossy()
-    );
-    std::fs::write(agents_dir.join("copilot.toml"), toml).unwrap();
-
-    mgr.reload_providers();
-
-    assert!(events.lock().iter().any(|ev| matches!(ev, AgentEvent::Providers)));
-    assert!(!mgr.shared.probes.lock().contains_key("copilot"));
-
-    let copilot = mgr.providers().into_iter().find(|p| p.id == "copilot").unwrap();
-    assert!(copilot.installed);
-    assert!(copilot.command.contains(&*fake_bin.to_string_lossy()));
-
-    let probe = mgr.probe("copilot", false).await.unwrap();
-    assert!(probe.error.is_none());
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn idle_agents_stop_and_resume_their_session_on_the_next_message() {
-    let new = || NewAgentTask {
-        project_root: None,
-        prompt: text("again"),
-        provider: "claude".into(),
-        config: Vec::new(),
-        isolation: Isolation::Local,
-        base: None,
-    };
-    let live =
-        |mgr: &AgentManager, id: &str| mgr.task(id).unwrap().live.lock().as_ref().is_some_and(|l| !l.peer.is_closed());
-
-    let tmp = tempfile::tempdir().unwrap();
-    let agent = Arc::new(FakeAgent::default());
-    let mgr = manager(tmp.path(), agent.clone());
-    mgr.set_idle_release(Duration::from_millis(200));
-    let task = mgr.create(new()).await.unwrap();
-    wait_for(&mgr, &task.id, AgentStatus::Ready).await;
-    assert!(live(&mgr, &task.id));
-    // The process is stopped once the task stays idle…
-    tokio::time::sleep(Duration::from_millis(600)).await;
-    assert!(!live(&mgr, &task.id));
-    assert!(agent.servers.lock()[0].is_closed(), "its connection is closed");
-    assert_eq!(mgr.task(&task.id).unwrap().state.lock().task.status, AgentStatus::Ready, "not an error");
-    // …and the next message starts it again on the same session.
-    mgr.prompt(&task.id, text("again"), false).await.unwrap();
-    wait_for(&mgr, &task.id, AgentStatus::Ready).await;
-    assert!(agent.calls.lock().contains(&"session/load".to_owned()));
-    assert_eq!(
-        mgr.entries(&task.id, None).unwrap().iter().filter(|e| matches!(e, AgentEntry::Agent { .. })).count(),
-        2
-    );
-
-    // A new turn before the delay ran out keeps the agent.
-    mgr.prompt(&task.id, text("again"), false).await.unwrap();
-    tokio::time::sleep(Duration::from_millis(100)).await;
-    wait_for(&mgr, &task.id, AgentStatus::Ready).await;
-    assert!(live(&mgr, &task.id));
-    mgr.shutdown();
-
-    // An agent that can't reload its session keeps running: stopping it would lose the conversation.
-    let tmp = tempfile::tempdir().unwrap();
-    let agent = Arc::new(FakeAgent { no_load: true, ..FakeAgent::default() });
-    let mgr = manager(tmp.path(), agent.clone());
-    mgr.set_idle_release(Duration::from_millis(200));
-    let task = mgr.create(new()).await.unwrap();
-    wait_for(&mgr, &task.id, AgentStatus::Ready).await;
-    tokio::time::sleep(Duration::from_millis(600)).await;
-    assert!(live(&mgr, &task.id));
-    mgr.shutdown();
-}

crates/ide-agent/src/timeline.rs

@@ -446,7 +446,6 @@ mod tests {
         let user = |sent: f64| AgentEntry::User {
             text: "q".into(),
             attachments: vec![],
-            images: vec![],
             sent_ms: Some(sent),
             done_ms: None,
             steered: false,

crates/ide-agent/src/worktree.rs

@@ -48,30 +48,13 @@ pub(crate) fn create(project_root: &Path, worktrees_dir: &Path, title: &str, bas
     Ok(Created { path, branch, base, base_commit })
 }
 
-/// `git worktree remove --force -- <path>`. When git no longer recognizes the
-/// worktree (a pruned registration, a moved repository, a deleted `.git` file)
-/// it fails with "is not a working tree". A folder under `worktrees_dir` is still
-/// ours, so it is removed directly to keep the task deletable (a stale
-/// registration prunes later); anything else keeps git's error.
-pub(crate) fn remove(project_root: &Path, worktrees_dir: &Path, path: &Path) -> IdeResult<()> {
-    let repo = repo_at(project_root)?;
-    let err = match repo.remove_worktree(path, true) {
-        Ok(()) => return Ok(()),
-        Err(e) => e,
-    };
-    if !path.exists() {
-        return Ok(());
-    }
-    if !path.starts_with(worktrees_dir) || path == worktrees_dir {
-        return Err(err);
-    }
-    std::fs::remove_dir_all(path).map_err(|e| IdeError::internal(e.to_string()))
+pub(crate) fn remove(project_root: &Path, path: &Path) -> IdeResult<()> {
+    repo_at(project_root)?.remove_worktree(path, true)
 }
 
 /// Files under `cwd` that differ from `base` (untracked files included), with line counts.
-/// Outside a repository there is nothing to compare against: no changes.
 pub(crate) fn changes(cwd: &Path, base: &str) -> IdeResult<Vec<AgentChange>> {
-    let Some(repo) = Repo::discover(cwd)? else { return Ok(Vec::new()) };
+    let repo = repo_at(cwd)?;
     let root = repo.root().to_path_buf();
     let stats = repo.numstat_with_worktree(base)?;
     let stat = |rel: &str| stats.iter().find(|(p, ..)| p == rel).map_or((0, 0), |&(_, a, r)| (a, r));
@@ -113,12 +96,7 @@ pub(crate) fn without_untouched(changes: Vec<AgentChange>, before: &BTreeMap<Str
 }
 
 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) {
-        Ok(loaded) => encoding_rs::Encoding::for_label(loaded.encoding.as_bytes()).unwrap_or(encoding_rs::UTF_8),
-        Err(_) => ide_vfs::detect_encoding(&repo.file_bytes_at(path, Some(rev))?.unwrap_or_default(), None),
-    };
-    repo.file_at(path, Some(rev), encoding)
+    repo_at(cwd)?.file_at(path, Some(rev))
 }
 
 /// A short ASCII branch-safe name from the task title.
@@ -158,20 +136,6 @@ mod tests {
         assert_eq!(unique_slug("x", |s| s == "x" || s == "x-2"), "x-3");
     }
 
-    #[test]
-    fn outside_a_repository_there_is_nothing_to_compare() {
-        let tmp = tempfile::tempdir().unwrap();
-        let dir = tmp.path().join("plain");
-        std::fs::create_dir(&dir).unwrap();
-        std::fs::write(dir.join("a.txt"), "one\n").unwrap();
-
-        assert!(changes(&dir, "HEAD").unwrap().is_empty());
-        assert!(snapshot(&dir).unwrap().is_empty());
-        assert_eq!(file_at(&dir, &dir.join("a.txt"), "HEAD").unwrap(), None);
-        assert!(create(&dir, &tmp.path().join("wt"), "Edit A", None).is_err());
-        assert!(remove(&dir, tmp.path(), &dir).is_err());
-    }
-
     fn git(dir: &Path, args: &[&str]) {
         let ok = std::process::Command::new("git")
             .args(["-c", "user.name=t", "-c", "user.email=t@t", "-c", "commit.gpgsign=false"])
@@ -218,38 +182,7 @@ mod tests {
 
         // A second task with the same title gets its own worktree.
         assert_eq!(create(&repo, &tmp.path().join("wt"), "Edit A", None).unwrap().branch, "agent/edit-a-2");
-        remove(&repo, &tmp.path().join("wt"), &created.path).unwrap();
+        remove(&repo, &created.path).unwrap();
         assert!(!created.path.exists());
     }
-
-    #[test]
-    fn a_broken_worktree_registration_still_leaves_a_deletable_folder() {
-        let tmp = tempfile::tempdir().unwrap();
-        let repo = tmp.path().join("repo");
-        std::fs::create_dir(&repo).unwrap();
-        git(&repo, &["init", "-q", "-b", "main"]);
-        std::fs::write(repo.join("a.txt"), "one\n").unwrap();
-        git(&repo, &["add", "."]);
-        git(&repo, &["commit", "-q", "-m", "init"]);
-
-        // A pruned registration (the repository moved, `git worktree prune` ran).
-        let created = create(&repo, &tmp.path().join("wt"), "Edit A", None).unwrap();
-        let registration = repo.join(".git/worktrees").join(created.path.file_name().unwrap());
-        std::fs::remove_dir_all(registration).unwrap();
-        remove(&repo, &tmp.path().join("wt"), &created.path).unwrap();
-        assert!(!created.path.exists());
-
-        // A deleted `.git` file in the worktree itself.
-        let created = create(&repo, &tmp.path().join("wt"), "Edit B", None).unwrap();
-        std::fs::remove_file(created.path.join(".git")).unwrap();
-        remove(&repo, &tmp.path().join("wt"), &created.path).unwrap();
-        assert!(!created.path.exists());
-
-        // A folder outside the worktrees directory is never deleted by hand.
-        let elsewhere = tmp.path().join("elsewhere");
-        std::fs::create_dir(&elsewhere).unwrap();
-        std::fs::write(elsewhere.join("keep.txt"), "x\n").unwrap();
-        assert!(remove(&repo, &tmp.path().join("wt"), &elsewhere).is_err());
-        assert!(elsewhere.join("keep.txt").exists());
-    }
 }

crates/ide-build/Cargo.toml

@@ -8,12 +8,14 @@ license.workspace = true
 [dependencies]
 dunce.workspace = true
 ide-core.workspace = true
-zip.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 specta.workspace = true
 tracing.workspace = true
 dirs.workspace = true
 
+[target.'cfg(unix)'.dependencies]
+libc = "0.2"
+
 [dev-dependencies]
 tempfile.workspace = true

crates/ide-build/src/application_update.rs

@@ -1,218 +0,0 @@
-//! Resource processing by the project's build tool, then publishing to the live JVM's output directory.
-use crate::BuildModel;
-use ide_core::{IdeError, IdeResult};
-use std::collections::BTreeMap;
-use std::fs;
-use std::path::{Path, PathBuf};
-
-pub struct ResourceBuild {
-    pub command: String,
-    pub args: Vec<String>,
-    pub cwd: String,
-    pub env: BTreeMap<String, String>,
-    pub kind: &'static str,
-}
-
-fn literal(value: &str) -> String {
-    format!("'{}'", value.replace('\\', "\\\\").replace('\'', "\\'"))
-}
-
-pub fn plan(root: &Path, model: &BuildModel, module: &Path, cache: &Path) -> IdeResult<ResourceBuild> {
-    fs::create_dir_all(cache)?;
-    let manifest = cache.join("resource-output.txt");
-    if manifest.exists() {
-        fs::remove_file(&manifest)?;
-    }
-    let module = dunce::canonicalize(root.join(module))?;
-    if let Some(p) = model.maven.as_ref().and_then(|m| m.projects.iter().find(|p| root.join(&p.dir) == module)) {
-        let mut args = p.options.clone();
-        args.extend([
-            "process-resources".into(),
-            "help:evaluate".into(),
-            "-Dexpression=project.build.outputDirectory".into(),
-            format!("-Doutput={}", manifest.display()),
-        ]);
-        return Ok(ResourceBuild {
-            command: p.command.clone(),
-            args,
-            cwd: p.dir.clone(),
-            env: p.env.clone(),
-            kind: "maven",
-        });
-    }
-    if let Some(g) = &model.gradle
-        && let Some(p) = g.projects.iter().find(|p| root.join(&p.dir) == module)
-    {
-        let script = cache.join("resources.init.gradle");
-        fs::write(
-            &script,
-            format!(
-                r#"gradle.projectsEvaluated {{
-    def p = gradle.rootProject.project({})
-    def resources = p.tasks.named('processResources')
-    p.tasks.register('openideaUpdateResources') {{
-        dependsOn resources
-        doLast {{ new File({}).setText(resources.get().destinationDir.absolutePath, 'UTF-8') }}
-    }}
-}}
-"#,
-                literal(&p.path),
-                literal(&manifest.to_string_lossy())
-            ),
-        )?;
-        return Ok(ResourceBuild {
-            command: g.command.clone(),
-            args: vec![
-                "--init-script".into(),
-                script.to_string_lossy().into_owned(),
-                format!("{}:openideaUpdateResources", p.path.trim_end_matches(':')),
-            ],
-            cwd: g.dir.clone(),
-            env: g.env.clone(),
-            kind: "gradle",
-        });
-    }
-    Err(IdeError::invalid("The Spring Boot module must belong to a linked Maven or Gradle build"))
-}
-
-pub fn publish(root: &Path, cache: &Path, class_paths: &[String], main_class: &str) -> IdeResult<()> {
-    let output = PathBuf::from(fs::read_to_string(cache.join("resource-output.txt"))?.trim());
-    if !output.is_absolute() || !output.is_dir() {
-        return Err(IdeError::invalid("The resource build did not report an output directory"));
-    }
-    let output = dunce::canonicalize(output)?;
-    let paths: Vec<_> = class_paths.iter().filter_map(|p| dunce::canonicalize(root.join(p)).ok()).collect();
-    // A separate resource directory is already on the runtime classpath (e.g. build/resources/main).
-    if paths.contains(&output) {
-        return Ok(());
-    }
-    // jdtls uses bin/main for Gradle, rather than Gradle's build/resources/main.
-    let class_file = main_class.split('.').collect::<PathBuf>().with_extension("class");
-    let destination = paths.iter().find(|p| p.join(&class_file).is_file()).ok_or_else(|| {
-        IdeError::invalid("Cannot find the running main class output directory; restart the application")
-    })?;
-    let previous: Vec<String> = fs::read(cache.join("published-resources.json"))
-        .ok()
-        .and_then(|bytes| serde_json::from_slice(&bytes).ok())
-        .unwrap_or_default();
-    let mut current = Vec::new();
-    copy_resources(&output, &output, destination, &mut current)?;
-    for rel in previous.iter().filter(|p| !current.contains(p)) {
-        let path = destination.join(rel);
-        if path.is_file() {
-            fs::remove_file(path)?;
-        }
-    }
-    fs::write(
-        cache.join("published-resources.json"),
-        serde_json::to_vec(&current).map_err(|e| IdeError::internal(e.to_string()))?,
-    )?;
-    Ok(())
-}
-
-fn copy_resources(root: &Path, from: &Path, to: &Path, copied: &mut Vec<String>) -> IdeResult<()> {
-    for entry in fs::read_dir(from)? {
-        let entry = entry?;
-        let path = entry.path();
-        let kind = entry.file_type()?;
-        if kind.is_symlink() {
-            continue;
-        }
-        if kind.is_dir() {
-            copy_resources(root, &path, to, copied)?;
-        } else if kind.is_file() && path.extension().is_none_or(|e| e != "class") {
-            let rel = path.strip_prefix(root).map_err(|e| IdeError::internal(e.to_string()))?;
-            let dest = to.join(rel);
-            if let Some(parent) = dest.parent() {
-                fs::create_dir_all(parent)?;
-            }
-            fs::copy(&path, dest)?;
-            copied.push(rel.to_string_lossy().into_owned());
-        }
-    }
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn resource_plans_use_the_selected_module_and_build_configuration() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = dunce::canonicalize(tmp.path()).unwrap();
-        fs::create_dir(root.join("app")).unwrap();
-        let mut model = BuildModel {
-            maven: Some(crate::MavenModel {
-                projects: vec![crate::MavenProject {
-                    dir: "app".into(),
-                    command: "/tools/mvnw".into(),
-                    options: vec!["-Pdev".into()],
-                    env: BTreeMap::from([("JAVA_HOME".into(), "/jdk".into())]),
-                    ..Default::default()
-                }],
-                ..Default::default()
-            }),
-            ..Default::default()
-        };
-        let cache = root.join("cache");
-        let maven = plan(&root, &model, Path::new("app"), &cache).unwrap();
-        assert_eq!(maven.command, "/tools/mvnw");
-        assert_eq!(maven.cwd, "app");
-        assert_eq!(maven.args[0..2], ["-Pdev", "process-resources"]);
-        assert!(maven.args.contains(&"-Dexpression=project.build.outputDirectory".into()));
-        assert_eq!(maven.env["JAVA_HOME"], "/jdk");
-        model.maven = None;
-        model.gradle = Some(crate::GradleModel {
-            command: "/tools/gradlew".into(),
-            projects: vec![crate::GradleProject { path: ":app".into(), dir: "app".into(), ..Default::default() }],
-            ..Default::default()
-        });
-        let gradle = plan(&root, &model, Path::new("app"), &cache).unwrap();
-        assert_eq!(gradle.command, "/tools/gradlew");
-        assert_eq!(gradle.args.last().unwrap(), ":app:openideaUpdateResources");
-        let script = fs::read_to_string(cache.join("resources.init.gradle")).unwrap();
-        assert!(script.contains("processResources") && script.contains("destinationDir.absolutePath"));
-        assert!(!script.contains("build/resources/main")); // The task owns custom output locations.
-    }
-
-    #[test]
-    fn publishes_maven_and_gradle_resource_outputs_to_the_runtime_classpath() {
-        for layout in ["target/classes", "build/resources/main", "custom resource output"] {
-            let tmp = tempfile::tempdir().unwrap();
-            let root = tmp.path();
-            let cache = root.join("cache");
-            let output = root.join(layout);
-            let runtime = if layout == "target/classes" { output.clone() } else { root.join("bin/main") };
-            fs::create_dir_all(output.join("static")).unwrap();
-            fs::create_dir_all(runtime.join("example")).unwrap();
-            fs::create_dir_all(&cache).unwrap();
-            fs::write(cache.join("resource-output.txt"), output.to_string_lossy().as_bytes()).unwrap();
-            fs::write(output.join("static/index.html"), "after").unwrap();
-            fs::write(output.join("unrelated.class"), "do not publish").unwrap();
-            fs::write(runtime.join("example/Application.class"), "running").unwrap();
-            publish(root, &cache, &[runtime.to_string_lossy().into_owned()], "example.Application").unwrap();
-            assert_eq!(fs::read_to_string(runtime.join("static/index.html")).unwrap(), "after");
-            assert_eq!(fs::read_to_string(runtime.join("example/Application.class")).unwrap(), "running");
-            if output != runtime {
-                assert!(!runtime.join("unrelated.class").exists());
-                fs::remove_file(output.join("static/index.html")).unwrap();
-                publish(root, &cache, &[runtime.to_string_lossy().into_owned()], "example.Application").unwrap();
-                assert!(!runtime.join("static/index.html").exists());
-            }
-        }
-    }
-
-    #[test]
-    fn leaves_separate_runtime_resource_directories_in_place_and_rejects_jar_only_runs() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        let output = root.join("build/resources/main");
-        let cache = root.join("cache");
-        fs::create_dir_all(&output).unwrap();
-        fs::create_dir(&cache).unwrap();
-        fs::write(cache.join("resource-output.txt"), output.to_string_lossy().as_bytes()).unwrap();
-        publish(root, &cache, &[output.to_string_lossy().into_owned()], "a.Main").unwrap();
-        assert!(publish(root, &cache, &["app.jar".into()], "a.Main").is_err());
-    }
-}

crates/ide-build/src/compile/fingerprint.rs

@@ -1,321 +0,0 @@
-//! Metadata fingerprints for successful Maven launch builds.
-use super::*;
-use std::fs;
-use std::hash::{Hash, Hasher};
-use std::time::SystemTime;
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct LaunchFingerprint {
-    version: u32,
-    parameters: String,
-    files: BTreeMap<PathBuf, Option<(u64, SystemTime)>>,
-}
-
-fn scan(
-    path: &Path,
-    files: &mut BTreeMap<PathBuf, Option<(u64, SystemTime)>>,
-    ancestors: &mut HashSet<PathBuf>,
-    cancel: &CancellationToken,
-) -> IdeResult<()> {
-    if cancel.is_cancelled() {
-        return Err(IdeError::cancelled());
-    }
-    let meta = match fs::metadata(path) {
-        Ok(meta) => meta,
-        Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
-            files.insert(path.to_path_buf(), None);
-            return Ok(());
-        }
-        Err(e) => return Err(e.into()),
-    };
-    if meta.is_dir() {
-        let canonical = dunce::canonicalize(path)?;
-        if !ancestors.insert(canonical.clone()) {
-            return Err(IdeError::internal("cyclic launch input directory"));
-        }
-        // Directory mtimes change on irrelevant JDT writes. File paths detect additions/deletions.
-        files.insert(path.to_path_buf(), None);
-        for entry in fs::read_dir(path)? {
-            scan(&entry?.path(), files, ancestors, cancel)?;
-        }
-        ancestors.remove(&canonical);
-    } else if meta.is_file() {
-        files.insert(path.to_path_buf(), Some((meta.len(), meta.modified()?)));
-    } else {
-        return Err(IdeError::internal("unsupported launch input file"));
-    }
-    Ok(())
-}
-
-/// `None` means an input cannot be resolved safely: build normally without reuse.
-/// All filesystem work belongs on the caller's blocking thread.
-pub fn launch_fingerprint(
-    root: &Path,
-    model: &BuildModel,
-    module: &Path,
-    test: bool,
-    local_repo: Option<PathBuf>,
-    cancel: &CancellationToken,
-) -> IdeResult<Option<LaunchFingerprint>> {
-    let Some(m) = &model.maven else { return Ok(None) };
-    let projects = maven_launch_projects(root, m, module, test);
-    if projects.is_empty() {
-        return Ok(None);
-    }
-    let Some(mut inputs) = maven::launch_inputs(root, &projects, local_repo) else { return Ok(None) };
-    let plan = launch_plan(root, model, module, test)?;
-    let mut environment: BTreeMap<String, String> = std::env::vars()
-        .map(|(key, value)| (key.to_ascii_uppercase(), value))
-        .filter(|(key, _)| {
-            key.starts_with("MAVEN_")
-                || key.starts_with("JAVA_")
-                || key.starts_with("JDK_")
-                || matches!(
-                    key.as_str(),
-                    "PATH" | "HOME" | "LANG" | "LC_ALL" | "_JAVA_OPTIONS" | "M2_HOME" | "MAVEN_HOME"
-                )
-        })
-        .collect();
-    // Explicit step values override the inherited environment just as they do in Command.
-    for step in &plan.steps {
-        environment.extend(step.env.iter().map(|(key, value)| (key.to_ascii_uppercase(), value.clone())));
-        for dir in step.cwd.ancestors() {
-            inputs.extend([dir.join(".mvn"), dir.join("mvnw"), dir.join("mvnw.cmd")]);
-            if dir == root {
-                break;
-            }
-        }
-        let program = process::program_path(&step.program, &step.env);
-        inputs.push(program.clone());
-        // Maven installed via a symlink still reads conf from its distribution.
-        if let Ok(program) = dunce::canonicalize(program)
-            && let Some(home) = program.parent().and_then(Path::parent)
-        {
-            for conf in ["conf", "libexec/conf"] {
-                inputs.extend([home.join(conf).join("settings.xml"), home.join(conf).join("toolchains.xml")]);
-            }
-        }
-        if !environment.contains_key("JAVA_HOME") {
-            let java = process::program_path(if cfg!(windows) { "java.exe" } else { "java" }, &step.env);
-            inputs.push(java.clone());
-            if let Ok(java) = dunce::canonicalize(java)
-                && let Some(home) = java.parent().and_then(Path::parent)
-            {
-                inputs.push(home.join("release"));
-            }
-        }
-        for (i, arg) in step.args.iter().enumerate() {
-            if matches!(arg.as_str(), "-s" | "--settings" | "-gs" | "--global-settings" | "-t" | "--toolchains")
-                && let Some(file) = step.args.get(i + 1)
-            {
-                inputs.push(step.cwd.join(file));
-            }
-            for prefix in ["--settings=", "--global-settings=", "--toolchains="] {
-                if let Some(file) = arg.strip_prefix(prefix) {
-                    inputs.push(step.cwd.join(file));
-                }
-            }
-        }
-    }
-    if let Some(home) = dirs::home_dir() {
-        inputs.extend([home.join(".m2/settings.xml"), home.join(".m2/toolchains.xml")]);
-    }
-    for key in ["MAVEN_HOME", "M2_HOME"] {
-        if let Some(home) = environment.get(key) {
-            inputs.extend([Path::new(home).join("conf/settings.xml"), Path::new(home).join("conf/toolchains.xml")]);
-        }
-    }
-    if let Some(home) = environment.get("JAVA_HOME") {
-        inputs.extend([
-            Path::new(home).join("release"),
-            Path::new(home).join("lib/modules"),
-            Path::new(home).join("lib/tools.jar"),
-            Path::new(home).join(if cfg!(windows) { "bin/java.exe" } else { "bin/java" }),
-        ]);
-    }
-    let steps: Vec<_> =
-        plan.steps.iter().map(|s| (process::program_path(&s.program, &s.env), &s.args, &s.cwd, &s.env)).collect();
-    // Profiles and plugins can read arbitrary environment variables. Keep a signature
-    // of the inherited environment without persisting unrelated credentials.
-    let inherited: BTreeMap<_, _> = std::env::vars_os().collect();
-    let mut inherited_hash = std::hash::DefaultHasher::new();
-    inherited.hash(&mut inherited_hash);
-    let parameters =
-        serde_json::to_string(&(root, module, test, steps, environment, inherited_hash.finish(), projects))
-            .map_err(|e| IdeError::internal(e.to_string()))?;
-    let mut files = BTreeMap::new();
-    for path in inputs {
-        scan(&path, &mut files, &mut HashSet::new(), cancel)?;
-    }
-    // Store project inputs relative to the project, including each file's relative path.
-    let files = files.into_iter().map(|(p, stamp)| (p.strip_prefix(root).unwrap_or(&p).to_path_buf(), stamp)).collect();
-    Ok(Some(LaunchFingerprint { version: 1, parameters, files }))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn write(root: &Path, rel: &str, value: &str) {
-        let path = root.join(rel);
-        fs::create_dir_all(path.parent().unwrap()).unwrap();
-        fs::write(path, value).unwrap();
-    }
-
-    fn fixture(root: &Path) -> BuildModel {
-        write(
-            root,
-            "pom.xml",
-            r#"<project><groupId>demo</groupId><artifactId>parent</artifactId><version>1</version>
-            <packaging>pom</packaging><modules><module>lib</module><module>app</module></modules></project>"#,
-        );
-        write(
-            root,
-            "lib/pom.xml",
-            r#"<project><parent><groupId>demo</groupId><artifactId>parent</artifactId><version>1</version></parent>
-            <artifactId>lib</artifactId><build><sourceDirectory>code</sourceDirectory><resources><resource><directory>conf</directory></resource></resources></build></project>"#,
-        );
-        write(
-            root,
-            "app/pom.xml",
-            r#"<project><parent><groupId>demo</groupId><artifactId>parent</artifactId><version>1</version></parent>
-            <artifactId>app</artifactId><dependencies><dependency><groupId>demo</groupId><artifactId>lib</artifactId><version>1</version></dependency></dependencies></project>"#,
-        );
-        write(root, "lib/src/main/kotlin/Channel.kt", "value");
-        write(root, "app/src/main/resources/app.properties", "key=value");
-        write(root, "lib/conf/custom.properties", "custom=value");
-        write(root, "lib/code/Custom.java", "class Custom {}");
-        BuildModel { maven: Some(maven::load(root)), ..Default::default() }
-    }
-
-    fn fingerprint(root: &Path, model: &BuildModel) -> Option<LaunchFingerprint> {
-        launch_fingerprint(root, model, &root.join("app"), false, None, &CancellationToken::new()).unwrap()
-    }
-
-    #[test]
-    fn unchanged_inputs_match_but_source_resource_pom_add_delete_and_mtime_invalidate() {
-        for rel in [
-            "lib/src/main/kotlin/Channel.kt",
-            "app/src/main/resources/app.properties",
-            "lib/conf/custom.properties",
-            "lib/code/Custom.java",
-            "app/pom.xml",
-            "lib/pom.xml",
-            "pom.xml",
-            ".mvn/maven.config",
-            "lib/src/main/groovy/New.groovy",
-            "app/src/test/scala/Test.scala",
-        ] {
-            let dir = tempfile::tempdir().unwrap();
-            let root = dir.path();
-            let model = fixture(root);
-            let before = fingerprint(root, &model);
-            assert!(before.is_some());
-            assert_eq!(before, fingerprint(root, &model), "unchanged {rel}");
-            let serialized = serde_json::to_vec(&before).unwrap();
-            assert_eq!(before, serde_json::from_slice(&serialized).unwrap());
-            let value = if rel.ends_with("pom.xml") {
-                format!("{}<!-- changed -->", fs::read_to_string(root.join(rel)).unwrap())
-            } else {
-                "changed input".to_owned()
-            };
-            write(root, rel, &value);
-            let changed = fingerprint(root, &model);
-            assert_ne!(before, changed, "changed/added {rel}");
-            let file = fs::OpenOptions::new().write(true).open(root.join(rel)).unwrap();
-            file.set_modified(SystemTime::UNIX_EPOCH + std::time::Duration::from_secs(42)).unwrap();
-            let touched = fingerprint(root, &model);
-            assert_ne!(changed, touched, "mtime-only {rel}");
-            fs::remove_file(root.join(rel)).unwrap();
-            assert_ne!(touched, fingerprint(root, &model), "deleted {rel}");
-        }
-    }
-
-    #[test]
-    fn profile_options_jdk_goal_and_wrapper_invalidate_without_using_class_outputs() {
-        let dir = tempfile::tempdir().unwrap();
-        let root = dir.path();
-        let mut model = fixture(root);
-        let before = fingerprint(root, &model);
-        write(root, "lib/target/classes/Channel.class", "JDT stub");
-        write(root, "app/target/classes/Main.class", "JDT stub");
-        assert_eq!(before, fingerprint(root, &model));
-        let mut previous = before.clone();
-        for option in ["-Pdev", "-Pprod", "-DskipTests", "-o"] {
-            model.maven.as_mut().unwrap().projects[0].options = vec![option.into()];
-            let current = fingerprint(root, &model);
-            assert_ne!(previous, current, "{option}");
-            previous = current;
-        }
-        model.maven.as_mut().unwrap().projects[0].options.clear();
-        model.maven.as_mut().unwrap().projects[0]
-            .env
-            .insert("JAVA_HOME".into(), root.join("jdk").to_string_lossy().into_owned());
-        let jdk = fingerprint(root, &model);
-        assert_ne!(before, jdk);
-        write(root, "jdk/release", "JAVA_VERSION=21");
-        assert_ne!(jdk, fingerprint(root, &model));
-        model.maven.as_mut().unwrap().projects[0].env.clear();
-        let test = launch_fingerprint(root, &model, &root.join("app"), true, None, &CancellationToken::new())
-            .unwrap()
-            .unwrap();
-        assert_ne!(before, Some(test));
-        write(root, "mvnw", "wrapper changed");
-        assert_ne!(before, fingerprint(root, &model));
-    }
-
-    #[test]
-    fn unresolved_roots_and_cancel_never_claim_up_to_date() {
-        let dir = tempfile::tempdir().unwrap();
-        let root = dir.path();
-        let model = fixture(root);
-        write(
-            root,
-            "lib/pom.xml",
-            "<project><artifactId>lib</artifactId><build><sourceDirectory>${unknown}/src</sourceDirectory></build></project>",
-        );
-        assert!(
-            launch_fingerprint(root, &model, &root.join("app"), false, None, &CancellationToken::new())
-                .unwrap()
-                .is_none()
-        );
-        let model = fixture(root);
-        let cancel = CancellationToken::new();
-        cancel.cancel();
-        assert!(launch_fingerprint(root, &model, &root.join("app"), false, None, &cancel).is_err());
-    }
-    #[test]
-    fn external_parent_and_selected_settings_files_invalidate() {
-        let dir = tempfile::tempdir().unwrap();
-        let root = dir.path().join("project");
-        let repo = dir.path().join("repository");
-        write(
-            &repo,
-            "demo/parent/1/parent-1.pom",
-            "<project><groupId>demo</groupId><artifactId>parent</artifactId><version>1</version></project>",
-        );
-        write(
-            &root,
-            "pom.xml",
-            "<project><parent><groupId>demo</groupId><artifactId>parent</artifactId><version>1</version><relativePath/></parent><artifactId>app</artifactId></project>",
-        );
-        let mut model = crate::load(&root, &root.join("cache"), Some(repo.clone()));
-        let settings = dir.path().join("custom-settings.xml");
-        fs::write(&settings, "<settings/>").unwrap();
-        model.maven.as_mut().unwrap().projects[0].options = vec!["-s".into(), settings.to_string_lossy().into_owned()];
-        let get =
-            || launch_fingerprint(&root, &model, &root, false, Some(repo.clone()), &CancellationToken::new()).unwrap();
-        let before = get();
-        assert!(before.is_some());
-        write(
-            &repo,
-            "demo/parent/1/parent-1.pom",
-            "<project><groupId>demo</groupId><artifactId>parent</artifactId><version>1</version><!-- changed --></project>",
-        );
-        let parent = get();
-        assert_ne!(before, parent);
-        fs::write(settings, "<settings><activeProfiles><activeProfile>dev</activeProfile></activeProfiles></settings>")
-            .unwrap();
-        assert_ne!(parent, get());
-    }
-}

crates/ide-build/src/compile/mod.rs

@@ -3,11 +3,8 @@
 //! background with cancellation and parses the compiler output into messages
 //! for the Build tool window, the Problems view and the editor.
 
-mod fingerprint;
 mod parse;
 
-pub use fingerprint::{LaunchFingerprint, launch_fingerprint};
-
 use crate::process::{self, Stream};
 use crate::{BuildModel, maven};
 use ide_core::{CancellationToken, Diagnostic, IdeError, IdeResult, Pos, Range, Severity};
@@ -158,11 +155,8 @@ fn detect_dir(dir: &Path, model: &BuildModel, root: &Path) -> Option<BuildSystem
 }
 
 /// `root/rel`, without a trailing separator for the root itself.
-/// `root` / `rel`, joined per `/`-separated component: on Windows a single join of
-/// `a/b` keeps the `/`, and such a path does not compare equal to the same directory
-/// as other tools (JDT LS) spell it.
 fn subdir(root: &Path, rel: &str) -> PathBuf {
-    rel.split('/').filter(|part| !part.is_empty()).fold(root.to_path_buf(), |path, part| path.join(part))
+    if rel.is_empty() { root.to_path_buf() } else { root.join(rel) }
 }
 
 fn rel_str(root: &Path, dir: &Path) -> String {
@@ -188,10 +182,8 @@ pub fn plan(root: &Path, model: &BuildModel, kind: BuildKind, file: Option<&Path
         None => None,
     };
     let dir = module_dir.clone().unwrap_or_else(|| root.to_path_buf());
-    // A folder of sibling projects has no build file itself; its Maven projects are built one by one.
     let system = detect_dir(&dir, model, root)
         .or_else(|| if model.gradle.is_some() { Some(BuildSystem::Gradle) } else { None })
-        .or_else(|| model.maven.as_ref().filter(|m| !m.projects.is_empty()).map(|_| BuildSystem::Maven))
         .ok_or_else(|| IdeError::not_found("no supported build system (Maven, Gradle, Cargo, Go, TypeScript) found"))?;
     let module = module_dir.as_deref().filter(|d| *d != root);
     let title = match module {
@@ -242,10 +234,12 @@ fn maven_steps(root: &Path, model: &BuildModel, kind: BuildKind, module: Option<
     let Some(module) = module else { return Ok(tops.iter().map(|p| step(p, &[])).collect()) };
     // The reactor root containing the module builds it with what it depends on (`-pl … -am`).
     let rel = rel_str(root, module);
-    if !m.projects.iter().any(|p| p.dir == rel) {
-        return Err(IdeError::not_found("no linked Maven project found for module"));
-    }
-    let top = maven_reactor(m, &rel).ok_or_else(|| IdeError::not_found("no linked Maven project found for module"))?;
+    let top = tops
+        .iter()
+        .filter(|t| t.dir.is_empty() || rel == t.dir || rel.starts_with(&format!("{}/", t.dir)))
+        .max_by_key(|t| t.dir.len())
+        .copied()
+        .unwrap_or(tops[0]);
     let top_dir = subdir(root, &top.dir);
     if module == top_dir {
         return Ok(vec![step(top, &[])]);
@@ -614,90 +608,6 @@ pub fn has_non_java_sources(module: &Path) -> bool {
     walk(&module.join("src"), 12)
 }
 
-fn reactor_projects<'a>(m: &'a maven::MavenModel, top: &'a maven::MavenProject) -> Vec<&'a maven::MavenProject> {
-    let mut projects = Vec::new();
-    let mut pending = vec![top];
-    let mut seen = HashSet::new();
-    while let Some(p) = pending.pop() {
-        if !seen.insert(&p.pom) {
-            continue;
-        }
-        projects.push(p);
-        pending.extend(m.projects.iter().filter(|child| p.modules.contains(&child.pom)));
-    }
-    projects
-}
-
-fn maven_reactor<'a>(m: &'a maven::MavenModel, module: &str) -> Option<&'a maven::MavenProject> {
-    m.projects.iter().filter(|p| !p.aggregated).find(|top| reactor_projects(m, top).iter().any(|p| p.dir == module))
-}
-
-/// Launch module first, followed by its upstream modules in the same Maven reactor.
-/// External artifacts and unrelated linked reactors are never rebuilt for this launch.
-fn maven_launch_projects<'a>(
-    root: &Path,
-    m: &'a maven::MavenModel,
-    module: &Path,
-    test: bool,
-) -> Vec<&'a maven::MavenProject> {
-    let rel = rel_str(root, module);
-    let Some(top) = maven_reactor(m, &rel) else { return Vec::new() };
-    let reactor = reactor_projects(m, top);
-    let Some(start) = reactor.iter().find(|p| p.dir == rel) else { return Vec::new() };
-    let mut pending = vec![*start];
-    let mut seen = HashSet::new();
-    let mut projects = Vec::new();
-    while let Some(p) = pending.pop() {
-        if !seen.insert(&p.pom) {
-            continue;
-        }
-        projects.push(p);
-        for dep in &p.dependencies {
-            if !dep.resolved() || (dep.scope == "test" && (!test || p.pom != start.pom)) {
-                continue;
-            }
-            if let Some(upstream) = reactor.iter().find(|u| {
-                u.group_id == dep.group_id
-                    && u.artifact_id == dep.artifact_id
-                    && dep.version.as_ref().is_none_or(|v| *v == u.version)
-            }) {
-                pending.push(*upstream);
-            }
-        }
-    }
-    projects
-}
-
-/// Whether a launch requires the external JVM compiler. Maven includes upstream
-/// reactor dependencies; adapter selection remains a separate, module-local decision.
-pub fn launch_has_non_java_sources(root: &Path, model: &BuildModel, module: &Path, test: bool) -> bool {
-    if let Some(m) = &model.maven {
-        let projects = maven_launch_projects(root, m, module, test);
-        if !projects.is_empty() {
-            return projects.iter().any(|p| has_non_java_sources(&subdir(root, &p.dir)));
-        }
-    }
-    has_non_java_sources(module)
-}
-
-fn launch_plan(root: &Path, model: &BuildModel, module: &Path, test: bool) -> IdeResult<BuildPlan> {
-    let kind = if model.maven.as_ref().is_some_and(|m| m.projects.iter().any(|p| subdir(root, &p.dir) == module)) {
-        // JDT may have left newer error stubs in Maven's output directories.
-        BuildKind::Rebuild
-    } else {
-        BuildKind::Build
-    };
-    let mut plan = plan(root, model, kind, Some(module))?;
-    if plan.system == BuildSystem::Maven && !test {
-        for step in &mut plan.steps {
-            if let Some(goal) = step.args.last_mut() {
-                *goal = "compile".into();
-            }
-        }
-    }
-    Ok(plan)
-}
-
 /// Compiles the module at `module` with its build system before a JVM launch and
 /// returns the class directories it wrote, to put ahead of the jdtls classpath.
 pub fn build_for_launch(
@@ -707,7 +617,7 @@ pub fn build_for_launch(
     test: bool,
     cancel: &CancellationToken,
 ) -> IdeResult<Vec<PathBuf>> {
-    let plan = launch_plan(root, model, module, test)?;
+    let plan = plan(root, model, BuildKind::Build, Some(module))?;
     let result = run(root, &plan, cancel, &|_| {})?;
     if !result.success {
         let errors: Vec<String> = result
@@ -722,14 +632,6 @@ pub fn build_for_launch(
             .collect();
         return Err(IdeError::internal(format!("Build failed:\n{}", errors.join("\n"))));
     }
-    if plan.system == BuildSystem::Maven
-        && let Some(m) = &model.maven
-    {
-        return Ok(maven_launch_projects(root, m, module, test)
-            .iter()
-            .flat_map(|p| launch_class_dirs(plan.system, &subdir(root, &p.dir), test && subdir(root, &p.dir) == module))
-            .collect());
-    }
     Ok(launch_class_dirs(plan.system, module, test))
 }
 
@@ -740,11 +642,11 @@ fn launch_class_dirs(system: BuildSystem, module: &Path, test: bool) -> Vec<Path
             .iter()
             .flat_map(|s| {
                 ["classes/kotlin", "classes/groovy", "classes/scala", "classes/java", "resources"]
-                    .map(|d| subdir(module, &format!("build/{d}/{s}")))
+                    .map(|d| module.join("build").join(d).join(s))
             })
             .collect(),
-        BuildSystem::Maven if test => vec![subdir(module, "target/test-classes"), subdir(module, "target/classes")],
-        BuildSystem::Maven => vec![subdir(module, "target/classes")],
+        BuildSystem::Maven if test => vec![module.join("target/test-classes"), module.join("target/classes")],
+        BuildSystem::Maven => vec![module.join("target/classes")],
         _ => Vec::new(),
     };
     dirs.into_iter().filter(|d| d.is_dir()).collect()
@@ -754,30 +656,6 @@ fn launch_class_dirs(system: BuildSystem, module: &Path, test: bool) -> Vec<Path
 mod tests {
     use super::*;
 
-    /// Launch outputs use the platform separator throughout, so they compare equal to
-    /// the same directories as JDT LS reports them.
-    #[test]
-    fn launch_dirs_use_one_separator() {
-        let root = tempfile::tempdir().unwrap();
-        let module = subdir(root.path(), "parent/app");
-        for dir in ["target/classes", "target/test-classes", "build/classes/java/main", "build/resources/test"] {
-            std::fs::create_dir_all(subdir(&module, dir)).unwrap();
-        }
-        let foreign = if std::path::MAIN_SEPARATOR == '\\' { '/' } else { '\\' };
-        let dirs = [
-            launch_class_dirs(BuildSystem::Maven, &module, true),
-            launch_class_dirs(BuildSystem::Gradle, &module, true),
-        ]
-        .concat();
-        assert_eq!(dirs.len(), 4, "{dirs:?}");
-        for dir in &dirs {
-            let suffix = dir.strip_prefix(root.path()).unwrap().to_string_lossy().into_owned();
-            assert!(!suffix.contains(foreign), "{suffix}");
-        }
-        assert_eq!(subdir(root.path(), ""), root.path());
-        assert_eq!(subdir(root.path(), "a//b/"), root.path().join("a").join("b"));
-    }
-
     fn write(root: &Path, rel: &str, text: &str) {
         let p = root.join(rel);
         std::fs::create_dir_all(p.parent().unwrap()).unwrap();
@@ -843,17 +721,6 @@ mod tests {
             ("pnpm", &["run".to_owned(), "build".to_owned()][..])
         );
 
-        let siblings = tmp.path().join("siblings");
-        write(&siblings, "core/pom.xml", "<project><artifactId>core</artifactId></project>");
-        write(&siblings, "system/pom.xml", "<project><artifactId>system</artifactId></project>");
-        let model = crate::load(&siblings, &tmp.path().join("cache3"), None);
-        let p = plan(&siblings, &model, BuildKind::Build, None).unwrap();
-        assert_eq!(p.system, BuildSystem::Maven);
-        assert_eq!(
-            p.steps.iter().map(|s| s.cwd.clone()).collect::<Vec<_>>(),
-            [siblings.join("core"), siblings.join("system")]
-        );
-
         let none = tmp.path().join("none");
         std::fs::create_dir_all(&none).unwrap();
         assert!(plan(&none, &BuildModel::default(), BuildKind::Build, None).is_err());
@@ -951,142 +818,6 @@ mod tests {
         }
     }
 
-    fn reactor_model() -> BuildModel {
-        let project = |dir: &str, deps: &[&str]| maven::MavenProject {
-            pom: format!("{dir}/pom.xml"),
-            dir: dir.into(),
-            group_id: "probe".into(),
-            artifact_id: dir.into(),
-            version: "1".into(),
-            aggregated: true,
-            dependencies: deps
-                .iter()
-                .map(|d| maven::MavenDependency {
-                    group_id: "probe".into(),
-                    artifact_id: (*d).into(),
-                    version: Some("1".into()),
-                    scope: "compile".into(),
-                    ..Default::default()
-                })
-                .collect(),
-            ..Default::default()
-        };
-        let mut projects = vec![
-            project("app", &["middle"]),
-            project("middle", &["lib"]),
-            project("lib", &["app"]),
-            project("unrelated", &[]),
-        ];
-        projects.insert(
-            0,
-            maven::MavenProject {
-                pom: "pom.xml".into(),
-                artifact_id: "reactor".into(),
-                command: "mvnw".into(),
-                modules: projects.iter().map(|p| p.pom.clone()).collect(),
-                options: vec!["-s".into(), "settings.xml".into()],
-                env: BTreeMap::from([("JAVA_HOME".into(), "/jdk".into())]),
-                ..Default::default()
-            },
-        );
-        BuildModel { maven: Some(maven::MavenModel { projects, ..Default::default() }), ..Default::default() }
-    }
-
-    #[test]
-    fn mixed_launch_detection_follows_only_reactor_dependencies() {
-        for extension in ["kt", "groovy", "scala"] {
-            let tmp = tempfile::tempdir().unwrap();
-            let root = tmp.path();
-            let mut model = reactor_model();
-            write(root, "app/src/main/java/Application.java", "class Application {}");
-            write(root, &format!("unrelated/src/main/java/Other.{extension}"), "");
-            assert!(!launch_has_non_java_sources(root, &model, &root.join("app"), false));
-            write(root, &format!("lib/src/main/java/Channel.{extension}"), "");
-            assert!(launch_has_non_java_sources(root, &model, &root.join("app"), false));
-            assert_eq!(
-                maven_launch_projects(root, model.maven.as_ref().unwrap(), &root.join("app"), false).len(),
-                3,
-                "cycles terminate"
-            );
-            let m = model.maven.as_mut().unwrap();
-            m.projects[2].dependencies[0].scope = "test".into();
-            assert!(
-                !launch_has_non_java_sources(root, &model, &root.join("app"), true),
-                "upstream test dependencies are not transitive"
-            );
-            let m = model.maven.as_mut().unwrap();
-            m.projects[1].dependencies[0].scope = "test".into();
-            m.projects[2].dependencies[0].scope = "compile".into();
-            assert!(!launch_has_non_java_sources(root, &model, &root.join("app"), false));
-            assert!(launch_has_non_java_sources(root, &model, &root.join("app"), true));
-            model.maven.as_mut().unwrap().projects[2].dependencies[0].version = Some("external".into());
-            assert!(!launch_has_non_java_sources(root, &model, &root.join("app"), true));
-            model.maven.as_mut().unwrap().projects[2].dependencies[0].version = Some("1".into());
-            model.maven.as_mut().unwrap().projects[3].aggregated = false;
-            model.maven.as_mut().unwrap().projects[0].modules.retain(|p| p != "lib/pom.xml");
-            assert!(
-                !launch_has_non_java_sources(root, &model, &root.join("app"), true),
-                "another linked reactor is external"
-            );
-        }
-    }
-
-    #[test]
-    fn maven_launch_steps_use_reactor_settings_and_launch_scope() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        write(root, "app/pom.xml", "<project/>");
-        let model = reactor_model();
-        for (test, goal) in [(false, "compile"), (true, "test-compile")] {
-            let plan = launch_plan(root, &model, &root.join("app"), test).unwrap();
-            let step = &plan.steps[0];
-            assert_eq!(step.cwd, root);
-            assert_eq!(step.program, "mvnw");
-            assert_eq!(step.env["JAVA_HOME"], "/jdk");
-            assert_eq!(
-                step.args,
-                ["-B", "-Dstyle.color=never", "-s", "settings.xml", "-pl", "app", "-am", "clean", goal]
-            );
-        }
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn external_launch_returns_upstream_outputs_and_blocks_failure_or_cancellation() {
-        use std::os::unix::fs::PermissionsExt;
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        write(root, "app/pom.xml", "<project/>");
-        write(
-            root,
-            "mvnw",
-            "#!/bin/sh\nmkdir -p app/target/classes middle/target/classes lib/target/classes app/target/test-classes\n",
-        );
-        let wrapper = root.join("mvnw");
-        std::fs::set_permissions(&wrapper, std::fs::Permissions::from_mode(0o755)).unwrap();
-        let mut model = reactor_model();
-        model.maven.as_mut().unwrap().projects[0].command = wrapper.to_string_lossy().into_owned();
-        let dirs = build_for_launch(root, &model, &root.join("app"), true, &CancellationToken::new()).unwrap();
-        assert_eq!(
-            dirs,
-            ["app/target/test-classes", "app/target/classes", "middle/target/classes", "lib/target/classes"]
-                .map(|p| root.join(p))
-        );
-        write(
-            root,
-            "mvnw",
-            "#!/bin/sh\necho '[ERROR] Kotlin compilation failed: unresolved reference broken' >&2\nexit 1\n",
-        );
-        let error = build_for_launch(root, &model, &root.join("app"), false, &CancellationToken::new()).unwrap_err();
-        assert!(error.message.contains("Kotlin compilation failed"), "{}", error.message);
-        let cancel = CancellationToken::new();
-        cancel.cancel();
-        assert_eq!(
-            build_for_launch(root, &model, &root.join("app"), false, &cancel).unwrap_err().kind,
-            ide_core::error::ErrorKind::Cancelled
-        );
-    }
-
     #[test]
     fn non_java_launch_class_dirs() {
         let tmp = tempfile::tempdir().unwrap();

crates/ide-build/src/gradle-model.gradle

@@ -1,40 +0,0 @@
-// OpenIDEA Gradle sync: prints each project as Gradle evaluated it, one JSON line per project.
-// Read by `ide_build::gradle::parse_reported_projects`. Dependencies are not resolved: the
-// Java language server reads the classpath itself, and resolving is the slow part of an import.
-import groovy.json.JsonOutput
-
-def canon = { File f -> f.canonicalPath }
-// Init scripts also run in included builds and buildSrc, whose projects reuse `:`, `:core`…:
-// the identity path (`:lib:core`, `:buildSrc`) tells them apart and addresses their tasks
-// from the root build. Internal API, hence the fallback.
-def identity = { Project p -> try { p.identityPath.toString() } catch (ignored) { p.path } }
-
-def describe = { Project p ->
-    def m = [path: identity(p), dir: canon(p.projectDir), buildDir: canon(p.layout.buildDirectory.get().asFile)]
-    if (p.gradle.parent != null) m.build = identity(p.rootProject)
-    def sets = p.extensions.findByName('sourceSets')
-    if (sets != null) {
-        // Test source sets as IDEA classifies them: `test`, test fixtures, JVM test suites,
-        // and sets whose folders the `idea` plugin lists as test sources.
-        def suites = [] as Set
-        try { p.extensions.findByName('testing')?.suites?.each { suites << it.sources.name } } catch (ignored) {}
-        def ideaTests = [] as Set
-        try { p.extensions.findByName('idea')?.module?.testSources?.files?.each { ideaTests << canon(it) } } catch (ignored) {}
-        m.sourceSets = sets.collect { s ->
-            def res = s.resources.srcDirs.collect(canon)
-            def src = s.allSource.srcDirs.collect(canon) - res
-            def test = s.name == 'test' || s.name == 'testFixtures' || suites.contains(s.name) ||
-                s.name.endsWith('Test') || s.name.endsWith('Tests') ||
-                (!src.isEmpty() && src.every { ideaTests.contains(it) })
-            [name: s.name, test: test, src: src, res: res]
-        }
-    }
-    try {
-        def java = p.extensions.findByName('java')
-        def lv = java?.toolchain?.languageVersion?.getOrNull()
-        m.java = lv != null ? lv.asInt() : (java?.targetCompatibility?.majorVersion as Integer)
-    } catch (ignored) {}
-    println '@openidea-model\t' + JsonOutput.toJson(m)
-}
-
-gradle.projectsEvaluated { g -> g.rootProject.allprojects { describe(it) } }

crates/ide-build/src/gradle.rs

@@ -32,8 +32,7 @@ pub struct GradleModel {
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
 pub struct GradleProject {
-    /// Gradle path: `:` for the root project, `:app`, `:libs:core`; for a project of a
-    /// nested build its identity path (`:lib:core`), which addresses its tasks from the root.
+    /// Gradle path: `:` for the root project, `:app`, `:libs:core`.
     pub path: String,
     pub name: String,
     /// Project-relative directory.
@@ -41,10 +40,6 @@ pub struct GradleProject {
     /// Project-relative build script, if any.
     pub build_file: Option<String>,
     pub tasks: Vec<GradleTask>,
-    /// Identity path of the nested build holding the project (`:lib` for `includeBuild`,
-    /// `:buildSrc`); null for the opened build.
-    #[serde(default)]
-    pub build: Option<String>,
 }
 
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
@@ -134,88 +129,35 @@ fn include_args(after: &str) -> Vec<String> {
     out
 }
 
-/// What a settings script declares, read statically.
-#[derive(Debug, Default, PartialEq)]
-pub struct Settings {
-    pub name: Option<String>,
-    /// Included project paths (`:app`), in declaration order.
-    pub includes: Vec<String>,
-    /// Project directories that differ from the default `<path>` under the build
-    /// dir, relative to it: `includeFlat` siblings and literal `projectDir = file(..)`.
-    pub dirs: BTreeMap<String, String>,
-}
-
-/// The included projects, root project name and directory overrides of a settings script.
-/// Interpolated (`"$m"`) names and directories cannot be read without Gradle and are skipped.
-pub fn parse_settings(text: &str) -> Settings {
+/// `(root project name, included project paths)` from a settings script.
+pub fn parse_settings(text: &str) -> (Option<String>, Vec<String>) {
     let text = strip_comments(text);
-    let mut s = Settings::default();
+    let mut name = None;
+    let mut includes: Vec<String> = Vec::new();
     for (i, _) in text.match_indices("rootProject.name") {
         let line = text[i + "rootProject.name".len()..].lines().next().unwrap_or_default();
         if let Some(n) = literals(line).into_iter().next() {
-            s.name = Some(n);
+            name = Some(n);
         }
     }
     let mut from = 0;
     while let Some(i) = text[from..].find("include") {
         let at = from + i;
         from = at + "include".len();
-        let flat = text[from..].starts_with("Flat");
-        if flat {
-            from += "Flat".len();
-        }
         let before_ok = at == 0 || !text[..at].ends_with(|c: char| c.is_alphanumeric() || c == '_' || c == '.');
         let after = &text[from..];
         let after_ok = after.starts_with(|c: char| c == '(' || c.is_whitespace());
         if !before_ok || !after_ok {
             continue;
         }
-        for p in include_args(after).into_iter().filter(|p| !p.contains('$')) {
+        for p in include_args(after) {
             let path = if p.starts_with(':') { p } else { format!(":{p}") };
-            if path.len() <= 1 {
-                continue;
-            }
-            // `includeFlat 'a'` is the sibling directory `../a` of the root project.
-            if flat {
-                s.dirs.insert(path.clone(), format!("../{}", path.trim_start_matches(':')));
-            }
-            if !s.includes.contains(&path) {
-                s.includes.push(path);
+            if path.len() > 1 && !includes.contains(&path) {
+                includes.push(path);
             }
         }
     }
-    // `project(':a').projectDir = file('../a')`; a later assignment wins, as in Gradle.
-    for line in text.lines() {
-        let Some((left, right)) = line.split_once(".projectDir") else { continue };
-        let Some(right) = right.trim_start().strip_prefix('=') else { continue };
-        let Some(arg) = right.trim_start().strip_prefix("file") else { continue };
-        let (Some(path), Some(dir)) = (
-            left.rsplit_once("project").map(|(_, p)| literals(p)).and_then(|l| l.into_iter().next()),
-            literals(arg).into_iter().next(),
-        ) else {
-            continue;
-        };
-        if !path.contains('$') && !dir.contains('$') {
-            let path = if path.starts_with(':') { path } else { format!(":{path}") };
-            s.dirs.insert(path, dir);
-        }
-    }
-    s
-}
-
-/// `a/b/../c` → `a/c`, without touching the filesystem.
-fn normalize(p: &Path) -> PathBuf {
-    let mut out = PathBuf::new();
-    for c in p.components() {
-        match c {
-            std::path::Component::CurDir => {}
-            std::path::Component::ParentDir if out.file_name().is_some() => {
-                out.pop();
-            }
-            c => out.push(c),
-        }
-    }
-    out
+    (name, includes)
 }
 
 /// The directory of the Gradle build under `root`: the root itself, or a direct
@@ -293,159 +235,31 @@ pub fn default_tasks(is_root: bool, script: &str) -> Vec<GradleTask> {
 }
 
 /// Reads the Gradle build under `root` (no Gradle run), or `None` when there is none.
-fn read_first(d: &Path, names: &[&str]) -> Option<(String, String)> {
-    names.iter().find_map(|n| std::fs::read_to_string(d.join(n)).ok().map(|t| (n.to_string(), t)))
-}
-
-/// The project `path` in `pdir`, with the default tasks of its build script.
-/// Outside `root` the directory stays absolute (`rel` falls back).
-fn project_at(root: &Path, path: String, name: String, pdir: &Path) -> GradleProject {
-    let script = read_first(pdir, BUILD_FILES);
-    let tasks = default_tasks(path == ":", script.as_ref().map(|(_, t)| t.as_str()).unwrap_or_default());
-    GradleProject {
-        build_file: script.map(|(n, _)| rel(root, &pdir.join(n))),
-        dir: rel(root, pdir),
-        path,
-        name,
-        tasks,
-        build: None,
-    }
-}
-
-/// A project as Gradle evaluated it (the sync's init script, `gradle-model.gradle`).
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ReportedProject {
-    pub path: String,
-    /// Absolute, canonical.
-    pub dir: String,
-    /// Absolute output folder (`layout.buildDirectory`).
-    #[serde(default)]
-    pub build_dir: Option<String>,
-    #[serde(default)]
-    pub source_sets: Vec<ReportedSourceSet>,
-    /// Toolchain language version, else target compatibility.
-    #[serde(default)]
-    pub java: Option<u32>,
-    /// Identity path of the nested build (included build, buildSrc) reporting the project.
-    #[serde(default)]
-    pub build: Option<String>,
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-pub struct ReportedSourceSet {
-    pub name: String,
-    pub test: bool,
-    /// Absolute source folders (Java, Kotlin, Groovy, …), which need not exist.
-    #[serde(default)]
-    pub src: Vec<String>,
-    /// Absolute resource folders.
-    #[serde(default)]
-    pub res: Vec<String>,
-}
-
-const MODEL_LINE: &str = "@openidea-model\t";
-
-/// The projects printed by `gradle-model.gradle`; malformed lines are skipped.
-pub fn parse_reported_projects(output: &str) -> Vec<ReportedProject> {
-    output.lines().filter_map(|l| serde_json::from_str(l.trim_end().strip_prefix(MODEL_LINE)?).ok()).collect()
-}
-
-/// Source roots of the reported source sets: `(absolute folder, is test, is resources)`.
-pub fn reported_source_roots(reported: &[ReportedProject]) -> Vec<(PathBuf, ReportedRoot)> {
-    let mut out: Vec<(PathBuf, ReportedRoot)> = Vec::new();
-    for p in reported {
-        for set in &p.source_sets {
-            let (src, res) = if set.test {
-                (ReportedRoot::Test, ReportedRoot::TestResources)
-            } else {
-                (ReportedRoot::Source, ReportedRoot::Resources)
-            };
-            for (dir, kind) in set.src.iter().map(|d| (d, src)).chain(set.res.iter().map(|d| (d, res))) {
-                let dir = PathBuf::from(dir);
-                // A folder shared by `main` and another set is `main`'s, as in IDEA.
-                if !out.iter().any(|(d, _)| *d == dir) {
-                    out.push((dir, kind));
-                }
-            }
-        }
-        // IDEA excludes the build folder of every module.
-        if let Some(b) = &p.build_dir {
-            out.push((PathBuf::from(b), ReportedRoot::Excluded));
-        }
-    }
-    out
-}
-
-/// Role of a folder a Gradle sync reported.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum ReportedRoot {
-    Source,
-    Test,
-    Resources,
-    TestResources,
-    Excluded,
-}
-
-/// Replaces the statically read projects with the ones Gradle reported (root first):
-/// settings scripts may compute their projects, which no static reading sees.
-pub fn merge_reported_projects(root: &Path, model: &mut GradleModel, reported: &[ReportedProject]) {
-    if reported.is_empty() {
-        return;
-    }
-    let root_name = model.projects.iter().find(|p| p.path == ":").map(|p| p.name.clone());
-    model.projects = reported
-        .iter()
-        .map(|p| {
-            let name = match p.path.as_str() {
-                ":" => root_name.clone().unwrap_or_default(),
-                path => path.rsplit(':').next().unwrap_or_default().to_owned(),
-            };
-            let mut project = project_at(root, p.path.clone(), name, Path::new(&p.dir));
-            // buildSrc is built before the build, never addressable as `:buildSrc:<task>`.
-            if p.build.as_deref().is_some_and(|b| b.ends_with(":buildSrc")) {
-                project.tasks.clear();
-            }
-            project.build = p.build.clone();
-            project
-        })
-        .collect();
-    // Each build reports its projects when it is evaluated (nested builds first).
-    model.projects.sort_by(|a, b| a.path.cmp(&b.path));
-    // One JDK runs the whole build: the newest any module needs.
-    if let Some(v) = reported.iter().filter_map(|p| p.java).max() {
-        model.java_version = Some(v);
-    }
-}
-
-/// Project directories outside `root`, outermost only (`../svc`, not also `../svc/sources/app`):
-/// the folders IDEA shows as extra top-level module roots.
-pub fn external_roots<'a>(root: &Path, dirs: impl IntoIterator<Item = &'a str>) -> Vec<PathBuf> {
-    let mut dirs: Vec<PathBuf> = dirs.into_iter().map(|d| root.join(d)).filter(|d| !d.starts_with(root)).collect();
-    dirs.sort();
-    dirs.dedup();
-    let mut out: Vec<PathBuf> = Vec::new();
-    for d in dirs {
-        if !out.iter().any(|o| d.starts_with(o)) {
-            out.push(d);
-        }
-    }
-    out
-}
-
 pub fn load(root: &Path) -> Option<GradleModel> {
     let dir = build_dir(root)?;
-    let settings = read_first(&dir, SETTINGS_FILES).map(|(_, t)| parse_settings(&t)).unwrap_or_default();
+    let read = |d: &Path, names: &[&str]| {
+        names.iter().find_map(|n| std::fs::read_to_string(d.join(n)).ok().map(|t| (n.to_string(), t)))
+    };
+    let (name, includes) = read(&dir, SETTINGS_FILES).map(|(_, t)| parse_settings(&t)).unwrap_or_default();
     let root_name =
-        settings.name.unwrap_or_else(|| dir.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default());
-    let mut projects = vec![project_at(root, ":".into(), root_name, &dir)];
-    for path in settings.includes {
-        let pdir = match settings.dirs.get(&path) {
-            Some(d) => normalize(&dir.join(d)),
-            None => dir.join(path.trim_start_matches(':').replace(':', "/")),
-        };
+        name.unwrap_or_else(|| dir.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default());
+    let mut projects = Vec::new();
+    let mut add = |path: String, name: String, pdir: PathBuf| {
+        let script = read(&pdir, BUILD_FILES);
+        let tasks = default_tasks(path == ":", script.as_ref().map(|(_, t)| t.as_str()).unwrap_or_default());
+        projects.push(GradleProject {
+            build_file: script.map(|(n, _)| rel(root, &pdir.join(n))),
+            dir: rel(root, &pdir),
+            path,
+            name,
+            tasks,
+        });
+    };
+    add(":".into(), root_name, dir.clone());
+    for path in includes {
+        let pdir = dir.join(path.trim_start_matches(':').replace(':', "/"));
         let name = path.rsplit(':').next().unwrap_or_default().to_owned();
-        projects.push(project_at(root, path, name, &pdir));
+        add(path, name, pdir);
     }
     let java_version = projects
         .iter()
@@ -544,32 +358,9 @@ pub fn build_files(root: &Path, model: &GradleModel) -> Vec<PathBuf> {
     let dir = root.join(&model.dir);
     let mut out: Vec<PathBuf> = SETTINGS_FILES.iter().map(|f| dir.join(f)).filter(|p| p.is_file()).collect();
     out.extend(model.projects.iter().filter_map(|p| p.build_file.as_ref().map(|f| root.join(f))));
-    // The settings of each nested build (its root project's folder).
-    for p in model.projects.iter().filter(|p| p.build.as_deref() == Some(p.path.as_str())) {
-        let nested = root.join(&p.dir);
-        out.extend(SETTINGS_FILES.iter().map(|f| nested.join(f)).filter(|f| f.is_file()));
-    }
-    // What IDEA's auto-import also watches: properties, the wrapper and version catalogs.
-    let extra = ["gradle.properties", "gradle/wrapper/gradle-wrapper.properties"].map(|f| dir.join(f));
-    out.extend(extra.into_iter().filter(|p| p.is_file()));
-    if let Ok(entries) = std::fs::read_dir(dir.join("gradle")) {
-        let mut catalogs: Vec<PathBuf> = entries
-            .flatten()
-            .map(|e| e.path())
-            .filter(|p| p.to_string_lossy().ends_with(".versions.toml") && p.is_file())
-            .collect();
-        catalogs.sort();
-        out.extend(catalogs);
-    }
     out
 }
 
-/// A build script without comments and with whitespace runs collapsed, so editing a
-/// comment or reformatting does not make a sync stale (IDEA hashes lexer tokens alike).
-pub(crate) fn script_fingerprint(text: &str) -> String {
-    strip_comments(text).split_whitespace().collect::<Vec<_>>().join(" ")
-}
-
 /// `(project path, task)` from `gradle tasks --all` console output; tasks listed as
 /// `app:run` belong to `:app`, unqualified ones to the root project `:`.
 pub fn parse_tasks(output: &str) -> Vec<(String, GradleTask)> {
@@ -608,12 +399,6 @@ pub fn parse_tasks(output: &str) -> Vec<(String, GradleTask)> {
     out
 }
 
-/// Static fallback until Gradle has reported its tasks.
-pub(crate) fn has_war_plugin(script: &str) -> bool {
-    let script = strip_comments(script);
-    script.split(|c: char| !c.is_alphanumeric() && c != '_').any(|word| word == "war")
-}
-
 #[cfg(test)]
 mod tests {
     #[test]
@@ -660,60 +445,14 @@ dependencies {
             /* include("block") */
             includeBuild("plugins")
         "#;
-        let s = parse_settings(kts);
-        assert_eq!(s.name.as_deref(), Some("gradle-demo"));
-        assert_eq!(s.includes, [":app", ":lib", ":libs:core"]);
-        assert!(s.dirs.is_empty());
+        let (name, includes) = parse_settings(kts);
+        assert_eq!(name.as_deref(), Some("gradle-demo"));
+        assert_eq!(includes, [":app", ":lib", ":libs:core"]);
 
         let groovy = "rootProject.name = 'demo'\ninclude 'a',\n        'b'\ninclude ':c'\nprintln 'x'\n";
-        let s = parse_settings(groovy);
-        assert_eq!(s.name.as_deref(), Some("demo"));
-        assert_eq!(s.includes, [":a", ":b", ":c"]);
-    }
-
-    #[test]
-    fn settings_include_flat_and_project_dirs() {
-        let groovy = r#"
-            includeFlat 'svc-a'
-            includeFlat 'svc-b', 'svc-c' // trailing comment
-            ['x', 'y'].each { m -> include ":svc-a:$m" }
-            include ':wo'
-            project(':wo').projectDir = file('../svc-a/.worktrees/wo')
-            project(":dyn").projectDir = file("${rootDir}/dyn")
-            includeFlated 'not-a-call'
-        "#;
-        let s = parse_settings(groovy);
-        assert_eq!(s.includes, [":svc-a", ":svc-b", ":svc-c", ":wo"]);
-        assert_eq!(
-            s.dirs.into_iter().collect::<Vec<_>>(),
-            [
-                (":svc-a".into(), "../svc-a".into()),
-                (":svc-b".into(), "../svc-b".into()),
-                (":svc-c".into(), "../svc-c".into()),
-                (":wo".into(), "../svc-a/.worktrees/wo".into()),
-            ]
-        );
-
-        let kts = "includeFlat(\"k\")\nproject(\":k\").projectDir = file(\"../other\")";
-        let s = parse_settings(kts);
-        assert_eq!(s.includes, [":k"]);
-        assert_eq!(s.dirs.get(":k").map(String::as_str), Some("../other"));
-    }
-
-    #[test]
-    fn loads_include_flat_siblings() {
-        let tmp = tempfile::tempdir().unwrap();
-        let ws = tmp.path();
-        std::fs::create_dir_all(ws.join("root")).unwrap();
-        std::fs::create_dir_all(ws.join("svc")).unwrap();
-        std::fs::write(ws.join("root/settings.gradle"), "rootProject.name = 'Root'\nincludeFlat 'svc'").unwrap();
-        std::fs::write(ws.join("svc/build.gradle"), "plugins { id 'java' }").unwrap();
-        let root = ws.join("root");
-        let m = load(&root).unwrap();
-        let svc = m.projects.iter().find(|p| p.path == ":svc").unwrap();
-        assert_eq!(Path::new(&svc.dir), ws.join("svc"));
-        assert_eq!(svc.build_file.as_deref().map(Path::new), Some(ws.join("svc/build.gradle").as_path()));
-        assert!(root.join(svc.build_file.as_ref().unwrap()).is_file());
+        let (name, includes) = parse_settings(groovy);
+        assert_eq!(name.as_deref(), Some("demo"));
+        assert_eq!(includes, [":a", ":b", ":c"]);
     }
 
     #[test]
@@ -794,52 +533,4 @@ Pattern: clean<TaskName>: Cleans the output files of a task.
         let none = tempfile::tempdir().unwrap();
         assert!(load(none.path()).is_none());
     }
-
-    #[test]
-    fn merges_included_builds_and_build_src_by_identity_path() {
-        let tmp = tempfile::tempdir().unwrap();
-        let ws = tmp.path();
-        for d in ["shop/app", "shop/buildSrc", "lib/core"] {
-            std::fs::create_dir_all(ws.join(d)).unwrap();
-        }
-        std::fs::write(ws.join("shop/settings.gradle"), "rootProject.name = 'shop'\ninclude 'app'").unwrap();
-        std::fs::write(ws.join("lib/settings.gradle"), "include 'core'").unwrap();
-        let root = ws.join("shop");
-        // In evaluation order, as the init script prints it: nested builds first.
-        let line = |path: &str, d: &str, build: Option<&str>| {
-            let project = ReportedProject {
-                path: path.into(),
-                dir: ws.join(d).to_string_lossy().into_owned(),
-                build: build.map(Into::into),
-                ..ReportedProject::default()
-            };
-            format!("{MODEL_LINE}{}\n", serde_json::to_string(&project).unwrap())
-        };
-        let out = [
-            line(":lib", "lib", Some(":lib")),
-            line(":lib:core", "lib/core", Some(":lib")),
-            line(":buildSrc", "shop/buildSrc", Some(":buildSrc")),
-            line(":", "shop", None),
-            line(":app", "shop/app", None),
-        ]
-        .concat();
-        let mut model = load(&root).unwrap();
-        merge_reported_projects(&root, &mut model, &parse_reported_projects(&out));
-        let projects: Vec<_> =
-            model.projects.iter().map(|p| (p.path.as_str(), p.name.as_str(), p.build.as_deref())).collect();
-        assert_eq!(
-            projects,
-            [
-                (":", "shop", None),
-                (":app", "app", None),
-                (":buildSrc", "buildSrc", Some(":buildSrc")),
-                (":lib", "lib", Some(":lib")),
-                (":lib:core", "core", Some(":lib")),
-            ]
-        );
-        let build_src = &model.projects[2];
-        assert!(build_src.tasks.is_empty(), "buildSrc tasks cannot run from the root build");
-        assert!(!model.projects[4].tasks.is_empty());
-        assert!(build_files(&root, &model).contains(&ws.join("lib/settings.gradle")));
-    }
 }

crates/ide-build/src/kotlin_bridge.rs

@@ -1,475 +0,0 @@
-//! Private Maven builds for JDT's Kotlin binary libraries. Never use launch outputs.
-
-use crate::BuildModel;
-use crate::compile::{self, BuildEvent, BuildKind, BuildMessage};
-use ide_core::{CancellationToken, IdeError, IdeResult};
-use serde::{Deserialize, Serialize};
-use std::collections::BTreeMap;
-use std::path::{Path, PathBuf};
-
-#[derive(Clone, Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct Module {
-    key: String,
-    project_uri: String,
-    output: PathBuf,
-    test_output: Option<PathBuf>,
-    dependencies: Vec<Dependency>,
-    has_kotlin: bool,
-    kotlin_goals: Vec<KotlinGoal>,
-}
-
-#[derive(Clone, Debug, Deserialize)]
-struct KotlinGoal {
-    execution: String,
-    status: String,
-}
-
-#[derive(Clone, Debug, Deserialize)]
-struct Dependency {
-    key: String,
-    scope: String,
-    #[serde(rename = "type")]
-    kind: Option<String>,
-    classifier: Option<String>,
-}
-
-#[derive(Clone, Debug, Serialize, PartialEq, Eq)]
-pub struct Library {
-    pub path: PathBuf,
-    pub test: bool,
-}
-
-#[derive(Clone, Debug, Serialize, PartialEq, Eq)]
-#[serde(rename_all = "camelCase")]
-pub struct ProjectLibraries {
-    pub project_uri: String,
-    pub libraries: Vec<Library>,
-}
-
-pub struct Outcome {
-    pub projects: Vec<ProjectLibraries>,
-    pub messages: Vec<BuildMessage>,
-    pub success: bool,
-}
-
-/// Inspect sources, excluding generated/build/VCS trees and never following symlinks.
-pub fn has_kotlin(root: &Path) -> bool {
-    let Ok(entries) = std::fs::read_dir(root) else { return false };
-    entries.flatten().any(|entry| {
-        let Ok(kind) = entry.file_type() else { return false };
-        if kind.is_file() {
-            entry.path().extension().is_some_and(|e| e == "kt")
-        } else {
-            kind.is_dir()
-                && !matches!(
-                    entry.file_name().to_str(),
-                    Some("target" | "build" | "out" | "bin" | "node_modules" | ".git" | ".openidea")
-                )
-                && has_kotlin(&entry.path())
-        }
-    })
-}
-
-/// Run the project's configured wrapper/settings/JDK and lifecycle, with an output
-/// redirector loaded before Maven calculates its lifecycle execution plans.
-pub fn build(
-    root: &Path,
-    model: &BuildModel,
-    bundle: &Path,
-    generation: &Path,
-    cancel: &CancellationToken,
-) -> IdeResult<Outcome> {
-    std::fs::create_dir_all(generation)?;
-    let mut plan = compile::plan(root, model, BuildKind::Build, None)?;
-    if plan.system != compile::BuildSystem::Maven {
-        return Err(IdeError::invalid("Kotlin bridge requires a Maven build root"));
-    }
-    let mut manifests = Vec::new();
-    for (index, step) in plan.steps.iter_mut().enumerate() {
-        step.args.push("--fail-at-end".into());
-        let directory = generation.join(format!("reactor-{index}"));
-        std::fs::create_dir_all(&directory)?;
-        manifests.push(directory.join("modules.json"));
-        let mut extensions = vec![bundle.to_path_buf()];
-        step.args.retain(|arg| {
-            if let Some(value) = arg.strip_prefix("-Dmaven.ext.class.path=") {
-                extensions.extend(std::env::split_paths(value));
-                false
-            } else {
-                true
-            }
-        });
-        let extension_path = std::env::join_paths(extensions).map_err(|e| IdeError::invalid(e.to_string()))?;
-        step.args.push(format!("-Dmaven.ext.class.path={}", extension_path.to_string_lossy()));
-        step.args.push(format!("-Dopenidea.kotlin.staging={}", directory.join("staging").display()));
-    }
-    let mut messages = Vec::new();
-    // Independent linked reactors must still run after another reactor's javac fails.
-    for step in &plan.steps {
-        let mut reactor = plan.clone();
-        reactor.steps = vec![step.clone()];
-        let result = compile::run(root, &reactor, cancel, &|event| {
-            if let BuildEvent::Output { text, .. } = event {
-                tracing::debug!("kotlin bridge: {}", text.trim_end());
-            }
-        })?;
-        messages.extend(result.messages);
-    }
-    // javac diagnostics belong to JDT, including when a Kotlin target was skipped.
-    messages.retain(|message| {
-        message.path.as_ref().is_some_and(|path| PathBuf::from(path.clone()).extension().is_some_and(|e| e == "kt"))
-    });
-    let mut modules = Vec::new();
-    for manifest in manifests {
-        let parsed: Vec<Module> = serde_json::from_slice(&std::fs::read(manifest)?)
-            .map_err(|e| IdeError::internal(format!("Kotlin module manifest: {e}")))?;
-        modules.extend(parsed);
-    }
-    messages.extend(kotlin_failures(&modules));
-    if messages.iter().any(|message| message.severity == ide_core::Severity::Error) {
-        return Ok(Outcome { projects: Vec::new(), messages, success: false });
-    }
-    let pending = generation.join("libraries.pending");
-    let published = generation.join("libraries");
-    std::fs::create_dir_all(&pending)?;
-    let mut libraries = BTreeMap::new();
-    for (index, module) in modules.iter().enumerate() {
-        let mut outputs = ModuleLibraries::default();
-        for (source, target, name) in [
-            (Some(&module.output), &mut outputs.main, format!("main-{index}")),
-            (module.test_output.as_ref(), &mut outputs.test, format!("test-{index}")),
-        ] {
-            let Some(source) = source else { continue };
-            if !source.starts_with(generation) {
-                return Err(IdeError::internal("Kotlin build output escaped staging"));
-            }
-            if copy_kotlin(source, &pending.join(&name), cancel)? {
-                *target = Some(published.join(name));
-            }
-        }
-        libraries.insert(module.key.clone(), outputs);
-    }
-    publish(&pending, &published, cancel)?;
-    Ok(Outcome { projects: consumers(&modules, &libraries), messages, success: true })
-}
-
-fn kotlin_failures(modules: &[Module]) -> Vec<BuildMessage> {
-    let mut messages = Vec::new();
-    for module in modules {
-        if !module.has_kotlin {
-            continue;
-        }
-        if module.kotlin_goals.is_empty() {
-            messages.push(kotlin_failure(module, "compile target was not executed"));
-        }
-        for goal in &module.kotlin_goals {
-            if goal.status != "success" {
-                messages.push(kotlin_failure(module, &format!("{} {}", goal.execution, goal.status)));
-            }
-        }
-    }
-    messages
-}
-
-fn kotlin_failure(module: &Module, reason: &str) -> BuildMessage {
-    BuildMessage {
-        severity: ide_core::Severity::Error,
-        text: format!("Kotlin compilation for {}: {reason}", module.key),
-        path: None,
-        range: None,
-        code: None,
-    }
-}
-
-fn publish(pending: &Path, published: &Path, cancel: &CancellationToken) -> IdeResult<()> {
-    if cancel.is_cancelled() {
-        return Err(IdeError::cancelled());
-    }
-    std::fs::rename(pending, published)?;
-    Ok(())
-}
-
-#[derive(Default)]
-struct ModuleLibraries {
-    main: Option<PathBuf>,
-    test: Option<PathBuf>,
-}
-
-fn consumers(modules: &[Module], libraries: &BTreeMap<String, ModuleLibraries>) -> Vec<ProjectLibraries> {
-    modules
-        .iter()
-        .map(|consumer| {
-            let mut visible = Vec::<Library>::new();
-            let mut add = |path: &Option<PathBuf>, test: bool| {
-                if let Some(path) = path {
-                    if let Some(previous) = visible.iter_mut().find(|entry| &entry.path == path) {
-                        previous.test &= test;
-                    } else {
-                        visible.push(Library { path: path.clone(), test });
-                    }
-                }
-            };
-            if let Some(own) = libraries.get(&consumer.key) {
-                add(&own.test, true);
-                add(&own.main, false);
-            }
-            // Maven's resolved artifacts already apply exclusions, mediation and optional
-            // propagation. Preserve their classpath order, after the module's own output.
-            for dependency in &consumer.dependencies {
-                let Some(output) = libraries.get(&dependency.key) else { continue };
-                let test = match dependency.scope.as_str() {
-                    "compile" | "provided" | "system" | "" => false,
-                    "test" | "runtime" => true,
-                    _ => continue,
-                };
-                match (dependency.kind.as_deref(), dependency.classifier.as_deref()) {
-                    (Some("test-jar"), None | Some("tests")) | (Some("jar"), Some("tests")) => add(&output.test, test),
-                    (None | Some("jar"), None | Some("")) => add(&output.main, test),
-                    _ => {}
-                }
-            }
-            ProjectLibraries { project_uri: consumer.project_uri.clone(), libraries: visible }
-        })
-        .collect()
-}
-
-fn copy_kotlin(source: &Path, destination: &Path, cancel: &CancellationToken) -> IdeResult<bool> {
-    let Ok(entries) = std::fs::read_dir(source) else { return Ok(false) };
-    let mut found = false;
-    for entry in entries {
-        if cancel.is_cancelled() {
-            return Err(IdeError::cancelled());
-        }
-        let entry = entry?;
-        let kind = entry.file_type()?;
-        let path = entry.path();
-        let output = destination.join(entry.file_name());
-        if kind.is_dir() {
-            found |= copy_kotlin(&path, &output, cancel)?;
-        } else if kind.is_file() {
-            let bytes = std::fs::read(&path)?;
-            let class = path.extension().is_some_and(|e| e == "class");
-            let metadata = path.extension().is_some_and(|e| e == "kotlin_module");
-            if metadata || (class && kotlin_class(&bytes).unwrap_or(false)) {
-                std::fs::create_dir_all(destination)?;
-                std::fs::write(output, bytes)?;
-                found |= class;
-            }
-        }
-    }
-    Ok(found)
-}
-
-/// Read the actual class-level SourceFile attribute, rather than searching strings
-/// (a Java constant containing "Something.kt" must never become a Kotlin library).
-fn kotlin_class(bytes: &[u8]) -> Option<bool> {
-    struct Reader<'a> {
-        bytes: &'a [u8],
-        pos: usize,
-    }
-    impl<'a> Reader<'a> {
-        fn take(&mut self, count: usize) -> Option<&'a [u8]> {
-            let value = self.bytes.get(self.pos..self.pos.checked_add(count)?)?;
-            self.pos += count;
-            Some(value)
-        }
-        fn u2(&mut self) -> Option<usize> {
-            Some(u16::from_be_bytes(self.take(2)?.try_into().ok()?) as usize)
-        }
-        fn u4(&mut self) -> Option<usize> {
-            Some(u32::from_be_bytes(self.take(4)?.try_into().ok()?) as usize)
-        }
-        fn attributes(&mut self) -> Option<()> {
-            for _ in 0..self.u2()? {
-                self.u2()?;
-                let n = self.u4()?;
-                self.take(n)?;
-            }
-            Some(())
-        }
-    }
-    let mut reader = Reader { bytes, pos: 0 };
-    if reader.take(4)? != [0xca, 0xfe, 0xba, 0xbe] {
-        return None;
-    }
-    reader.take(4)?;
-    let count = reader.u2()?;
-    let mut utf8 = BTreeMap::new();
-    let mut index = 1;
-    while index < count {
-        match reader.take(1)?[0] {
-            1 => {
-                let n = reader.u2()?;
-                utf8.insert(index, reader.take(n)?);
-            }
-            3 | 4 | 9..=12 | 17 | 18 => {
-                reader.take(4)?;
-            }
-            5 | 6 => {
-                reader.take(8)?;
-                index += 1;
-            }
-            7 | 8 | 16 | 19 | 20 => {
-                reader.take(2)?;
-            }
-            15 => {
-                reader.take(3)?;
-            }
-            _ => return None,
-        }
-        index += 1;
-    }
-    reader.take(6)?;
-    let interfaces = reader.u2()?;
-    reader.take(interfaces.checked_mul(2)?)?;
-    for _ in 0..2 {
-        for _ in 0..reader.u2()? {
-            reader.take(6)?;
-            reader.attributes()?;
-        }
-    }
-    for _ in 0..reader.u2()? {
-        let name = reader.u2()?;
-        let length = reader.u4()?;
-        if utf8.get(&name).copied() == Some(b"SourceFile".as_slice()) && length == 2 {
-            let source = reader.u2()?;
-            return Some(utf8.get(&source)?.ends_with(b".kt"));
-        }
-        reader.take(length)?;
-    }
-    Some(false)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn every_kotlin_target_must_succeed_even_when_maven_fails_elsewhere() {
-        let mut modules: Vec<Module> = serde_json::from_str(r#"[
-            {"key":"lib","projectUri":"lib","output":"lib","dependencies":[],"hasKotlin":true,
-             "kotlinGoals":[{"execution":"main:compile","status":"success"},{"execution":"test:test-compile","status":"success"}]},
-            {"key":"java","projectUri":"java","output":"java","dependencies":[],"hasKotlin":false,"kotlinGoals":[]}
-        ]"#).unwrap();
-        assert!(kotlin_failures(&modules).is_empty());
-        for status in ["failed", "skipped"] {
-            modules[0].kotlin_goals[1].status = status.into();
-            let failures = kotlin_failures(&modules);
-            assert_eq!(failures.len(), 1);
-            assert!(failures[0].text.contains(&format!("test:test-compile {status}")));
-        }
-        modules[0].kotlin_goals.clear();
-        assert_eq!(kotlin_failures(&modules).len(), 1);
-        modules[0].has_kotlin = false;
-        assert!(kotlin_failures(&modules).is_empty());
-        assert!(
-            serde_json::from_str::<Vec<Module>>(
-                r#"[{"key":"old","projectUri":"old","output":"old","dependencies":[]}]"#
-            )
-            .is_err()
-        );
-    }
-
-    #[test]
-    fn respects_mavens_resolved_closure_and_scopes() {
-        let json = r#"[
-          {"key":"zapp","projectUri":"app","output":"app", "hasKotlin":false,"kotlinGoals":[],"dependencies":[{"key":"mid","scope":"compile","optional":false},{"key":"lib","scope":"compile","optional":false}]},
-          {"key":"mid","projectUri":"mid","output":"mid", "hasKotlin":false,"kotlinGoals":[],"dependencies":[
-            {"key":"lib","scope":"compile","optional":false},
-            {"key":"optional","scope":"compile","optional":true},
-            {"key":"test","scope":"test","optional":false},
-            {"key":"provided","scope":"provided","optional":false}]},
-          {"key":"lib","projectUri":"lib","output":"lib","hasKotlin":false,"kotlinGoals":[],"dependencies":[]}
-        ]"#;
-        let modules: Vec<Module> = serde_json::from_str(json).unwrap();
-        let libraries = ["zapp", "lib", "optional", "test", "provided"]
-            .into_iter()
-            .map(|key| (key.to_owned(), ModuleLibraries { main: Some(PathBuf::from(key)), test: None }))
-            .collect();
-        let result = consumers(&modules, &libraries);
-        assert_eq!(
-            result[0].libraries,
-            vec![Library { path: "zapp".into(), test: false }, Library { path: "lib".into(), test: false },]
-        );
-        assert_eq!(result[1].libraries.len(), 4);
-        assert!(result[1].libraries.iter().find(|l| l.path == Path::new("test")).unwrap().test);
-    }
-
-    #[test]
-    fn test_outputs_are_private_unless_maven_resolves_a_test_jar() {
-        let modules: Vec<Module> = serde_json::from_str(r#"[
-          {"key":"lib","projectUri":"lib","output":"lib","hasKotlin":false,"kotlinGoals":[],"dependencies":[]},
-          {"key":"app","projectUri":"app","output":"app","hasKotlin":false,"kotlinGoals":[],"dependencies":[{"key":"lib","scope":"compile","type":"jar","classifier":null}]},
-          {"key":"test-app","projectUri":"test-app","output":"app","hasKotlin":false,"kotlinGoals":[],"dependencies":[{"key":"lib","scope":"test","type":"test-jar","classifier":"tests"}]}
-        ]"#).unwrap();
-        let libraries =
-            BTreeMap::from([("lib".into(), ModuleLibraries { main: Some("main".into()), test: Some("test".into()) })]);
-        let result = consumers(&modules, &libraries);
-        assert_eq!(
-            result[0].libraries,
-            vec![Library { path: "test".into(), test: true }, Library { path: "main".into(), test: false }]
-        );
-        assert_eq!(result[1].libraries, vec![Library { path: "main".into(), test: false }]);
-        assert_eq!(result[2].libraries, vec![Library { path: "test".into(), test: true }]);
-    }
-
-    #[test]
-    fn publishes_complete_directories_and_cancellation_keeps_them_private() {
-        let directory = tempfile::tempdir().unwrap();
-        let pending = directory.path().join("pending");
-        let final_path = directory.path().join("published");
-        std::fs::create_dir(&pending).unwrap();
-        std::fs::write(pending.join("Channel.class"), "complete").unwrap();
-        let cancelled = CancellationToken::new();
-        cancelled.cancel();
-        assert!(publish(&pending, &final_path, &cancelled).is_err());
-        assert!(!final_path.exists());
-        assert!(pending.exists());
-        publish(&pending, &final_path, &CancellationToken::new()).unwrap();
-        assert!(!pending.exists());
-        assert_eq!(std::fs::read(final_path.join("Channel.class")).unwrap(), b"complete");
-    }
-
-    #[test]
-    fn never_runs_another_build_system_with_maven_output_properties() {
-        let directory = tempfile::tempdir().unwrap();
-        std::fs::write(directory.path().join("Cargo.toml"), "").unwrap();
-        let error = build(
-            directory.path(),
-            &BuildModel::default(),
-            Path::new("unused.jar"),
-            &directory.path().join("private"),
-            &CancellationToken::new(),
-        )
-        .err()
-        .unwrap();
-        assert_eq!(error.message, "Kotlin bridge requires a Maven build root");
-    }
-
-    #[test]
-    fn does_not_find_deleted_sources_in_build_outputs() {
-        let dir = tempfile::tempdir().unwrap();
-        std::fs::create_dir_all(dir.path().join("target/generated")).unwrap();
-        std::fs::write(dir.path().join("target/generated/Old.kt"), "").unwrap();
-        assert!(!has_kotlin(dir.path()));
-        std::fs::write(dir.path().join("New.kt"), "").unwrap();
-        assert!(has_kotlin(dir.path()));
-    }
-
-    #[test]
-    fn parses_sourcefile_and_rejects_truncated_classes() {
-        let mut class = vec![0xca, 0xfe, 0xba, 0xbe, 0, 0, 0, 52, 0, 3, 1, 0, 10];
-        class.extend_from_slice(b"SourceFile");
-        class.extend_from_slice(&[1, 0, 10]);
-        class.extend_from_slice(b"Channel.kt");
-        class.extend_from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 2, 0, 2]);
-        assert_eq!(kotlin_class(&class), Some(true));
-        for end in 0..class.len() {
-            assert!(kotlin_class(&class[..end]).is_none());
-        }
-        let offset = 26;
-        class[offset..offset + 10].copy_from_slice(b"Other.java");
-        assert_eq!(kotlin_class(&class), Some(false));
-    }
-}

crates/ide-build/src/lib.rs

@@ -5,20 +5,17 @@
 //! and merges what the last sync ([`sync_maven`] / [`sync_gradle`], which run
 //! Maven / Gradle in the background) cached for the project.
 
-pub mod application_update;
 pub mod compile;
 pub mod gradle;
-pub mod kotlin_bridge;
 pub mod maven;
 pub mod pom_edit;
 mod process;
 mod sync;
-pub mod web;
 mod xml;
 
 pub use gradle::{GradleModel, GradleProject, GradleTask};
 pub use maven::{MavenDependency, MavenModel, MavenPlugin, MavenProfile, MavenProject, Omission};
-pub use sync::{SyncOptions, SyncProgress, maven_profiles, save_maven_profiles, sync_gradle, sync_maven};
+pub use sync::{SyncOptions, SyncProgress, sync_gradle, sync_maven};
 
 use serde::{Deserialize, Serialize};
 use specta::Type;
@@ -42,19 +39,8 @@ pub struct BuildModel {
 /// Static model of the builds under `root`, merged with the sync results cached in `cache_dir`.
 /// Parent POMs are looked up in `maven_repo` (the configured local repository), else the default one.
 pub fn load(root: &Path, cache_dir: &Path, maven_repo: Option<PathBuf>) -> BuildModel {
-    load_linked(root, cache_dir, maven_repo, &ide_core::settings::MavenSettings::default())
-}
-
-/// Loads only linked Maven reactors, retaining an empty model so projects can be re-added.
-pub fn load_linked(
-    root: &Path,
-    cache_dir: &Path,
-    maven_repo: Option<PathBuf>,
-    settings: &ide_core::settings::MavenSettings,
-) -> BuildModel {
     let maven = maven::is_maven_project(root).then(|| {
         let mut m = maven::load_with_repo(root, maven_repo.or_else(maven::default_local_repo));
-        maven::UnlinkedProjects::from_model(&m, settings).filter(&mut m);
         sync::apply_maven_cache(root, cache_dir, &mut m);
         m
     });
@@ -65,18 +51,6 @@ pub fn load_linked(
     BuildModel { maven, gradle }
 }
 
-/// Gradle project folders outside `root` as of the last sync (`includeFlat` siblings):
-/// extra content roots, as IDEA lists module roots beside the project folder.
-/// Reads only the sync's cached projects (no build script), so it is cheap enough for hot paths.
-pub fn gradle_external_roots(root: &Path, cache_dir: &Path) -> Vec<PathBuf> {
-    gradle::external_roots(root, sync::reported_gradle_projects(cache_dir).iter().map(|p| p.dir.as_str()))
-}
-
-/// Source, resource and build folders of the last Gradle sync, absolute.
-pub fn gradle_source_roots(cache_dir: &Path) -> Vec<(PathBuf, gradle::ReportedRoot)> {
-    gradle::reported_source_roots(&sync::reported_gradle_projects(cache_dir))
-}
-
 /// A library the project depends on, as `groupId:artifactId:version`.
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct DependencyCoordinate {

crates/ide-build/src/maven.rs

@@ -11,9 +11,7 @@ use crate::xml::{self, Element};
 use serde::{Deserialize, Serialize};
 use specta::Type;
 use std::collections::{BTreeMap, HashMap, HashSet};
-use std::io::Read;
 use std::path::{Path, PathBuf};
-use std::sync::{Mutex, OnceLock};
 
 /// Phases shown under "Lifecycle" (IDEA's default list).
 pub const LIFECYCLE: &[&str] =
@@ -245,8 +243,7 @@ struct RawPom {
     plugins: Vec<RawPlugin>,
     managed_plugins: Vec<RawPlugin>,
     profiles: Vec<RawProfile>,
-    /// `maven-compiler-plugin` `<release>` / `<source>` of `<build><plugins>`, else of
-    /// `<pluginManagement>`.
+    /// `<build><plugins>` `maven-compiler-plugin` `<release>` / `<source>`.
     compiler_release: Option<String>,
 }
 
@@ -288,29 +285,11 @@ fn texts(e: &Element, path: &str, item: &str) -> Vec<String> {
     e.list(path, item).iter().map(|m| m.text.trim().to_owned()).filter(|m| !m.is_empty()).collect()
 }
 
-/// Child modules of a project or profile: `<modules>` (model 4.0.0) plus `<subprojects>`,
-/// which Maven 4 (model 4.1.0) uses instead.
-fn module_names(e: &Element) -> Vec<String> {
-    let mut names = texts(e, "modules", "module");
-    names.extend(texts(e, "subprojects", "subproject"));
-    names
-}
-
 fn read_build(e: &Element, plugins: &mut Vec<RawPlugin>, managed: &mut Vec<RawPlugin>) {
     plugins.extend(e.list("build/plugins", "plugin").into_iter().filter_map(read_plugin));
     managed.extend(e.list("build/pluginManagement/plugins", "plugin").into_iter().filter_map(read_plugin));
 }
 
-/// `maven-compiler-plugin` `<release>` / `<source>` among the plugins at `path`.
-fn compiler_level(project: &Element, path: &str) -> Option<String> {
-    project
-        .list(path, "plugin")
-        .into_iter()
-        .find(|p| p.text_of("artifactId").as_deref() == Some("maven-compiler-plugin"))
-        .and_then(|p| p.child("configuration"))
-        .and_then(|c| c.text_of("release").or_else(|| c.text_of("source")))
-}
-
 fn read_raw(project: &Element) -> RawPom {
     let parent = project.child("parent").and_then(|p| {
         Some(ParentRef {
@@ -329,7 +308,7 @@ fn read_raw(project: &Element) -> RawPom {
         name: project.text_of("name"),
         parent,
         properties: read_properties(project.child("properties")),
-        modules: module_names(project),
+        modules: texts(project, "modules", "module"),
         deps: project.list("dependencies", "dependency").into_iter().filter_map(read_dep).collect(),
         managed: project
             .list("dependencyManagement/dependencies", "dependency")
@@ -339,13 +318,18 @@ fn read_raw(project: &Element) -> RawPom {
         ..RawPom::default()
     };
     read_build(project, &mut pom.plugins, &mut pom.managed_plugins);
-    pom.compiler_release =
-        compiler_level(project, "build/plugins").or_else(|| compiler_level(project, "build/pluginManagement/plugins"));
+    if let Some(c) = pom.plugins.iter().position(|p| p.artifact_id == "maven-compiler-plugin") {
+        let plugin =
+            project.list("build/plugins", "plugin").into_iter().filter(|p| p.text_of("artifactId").is_some()).nth(c);
+        if let Some(cfg) = plugin.and_then(|p| p.child("configuration")) {
+            pom.compiler_release = cfg.text_of("release").or_else(|| cfg.text_of("source"));
+        }
+    }
     for p in project.list("profiles", "profile") {
         let mut profile = RawProfile {
             id: p.text_of("id").unwrap_or_else(|| "default".into()),
             active_by_default: p.at("activation/activeByDefault").is_some_and(|a| a.text.trim() == "true"),
-            modules: module_names(p),
+            modules: texts(p, "modules", "module"),
             properties: read_properties(p.child("properties")),
             deps: p.list("dependencies", "dependency").into_iter().filter_map(read_dep).collect(),
             ..RawProfile::default()
@@ -417,12 +401,6 @@ struct Inherited {
     managed: Vec<RawDep>,
     plugins: Vec<RawPlugin>,
     managed_plugins: Vec<RawPlugin>,
-    /// The nearest `maven-compiler-plugin` `<release>` / `<source>`: a module usually
-    /// inherits its compiler level from the parent's (managed) plugin configuration.
-    compiler_release: Option<String>,
-    /// `<id>`, `activeByDefault`: profiles of the POM and its ancestors —
-    /// Maven lets a child enable a parent's profiles with `-P`.
-    profiles: Vec<(String, bool)>,
 }
 
 fn merge_by<T: Clone>(base: &mut Vec<T>, own: &[T], key: impl Fn(&T) -> String) {
@@ -467,20 +445,13 @@ struct Resolver {
 /// `~/.m2/repository`, or `<localRepository>` from `~/.m2/settings.xml`.
 pub(crate) fn default_local_repo() -> Option<PathBuf> {
     let m2 = dirs::home_dir()?.join(".m2");
-    local_repository_of(&m2.join("settings.xml")).or(Some(m2.join("repository")))
-}
-
-/// `<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 root = xml::parse(&text)?;
-    let repo = root.text_of("localRepository")?.trim().to_owned();
-    if repo.is_empty() {
-        return None;
+    if let Some(settings) = std::fs::read_to_string(m2.join("settings.xml")).ok().and_then(|t| xml::parse(&t))
+        && let Some(repo) = settings.text_of("localRepository")
+    {
+        let home = dirs::home_dir().map(|h| h.to_string_lossy().into_owned()).unwrap_or_default();
+        return Some(PathBuf::from(repo.replace("${user.home}", &home)));
     }
-    let home = dirs::home_dir().map(|h| h.to_string_lossy().into_owned()).unwrap_or_default();
-    Some(PathBuf::from(repo.replace("${user.home}", &home)))
+    Some(m2.join("repository"))
 }
 
 impl Resolver {
@@ -547,19 +518,11 @@ impl Resolver {
         merge_by(&mut ctx.deps, &pom.deps, RawDep::key);
         merge_plugins(&mut ctx.plugins, &pom.plugins);
         merge_plugins(&mut ctx.managed_plugins, &pom.managed_plugins);
-        if pom.compiler_release.is_some() {
-            ctx.compiler_release = pom.compiler_release.clone();
-        }
         for p in pom.profiles.iter().filter(|p| p.active_by_default) {
             merge_by(&mut ctx.properties, &p.properties, |(k, _)| k.clone());
             merge_by(&mut ctx.deps, &p.deps, RawDep::key);
             merge_plugins(&mut ctx.plugins, &p.plugins);
         }
-        merge_by(
-            &mut ctx.profiles,
-            &pom.profiles.iter().map(|p| (p.id.clone(), p.active_by_default)).collect::<Vec<_>>(),
-            |(id, _)| id.clone(),
-        );
         // Managed dependencies: own entries win; imported BOMs fill the gaps.
         let props = self.properties_for(&pom, &ctx, &dir);
         let mut imported: Vec<RawDep> = Vec::new();
@@ -630,72 +593,6 @@ impl Resolver {
     }
 }
 
-/// Files and source/resource trees consumed by a launch build. Unresolved custom
-/// roots disable reuse rather than silently omitting an input.
-pub(crate) fn launch_inputs(
-    root: &Path,
-    projects: &[&MavenProject],
-    local_repo: Option<PathBuf>,
-) -> Option<Vec<PathBuf>> {
-    fn roots(el: &Element, parent: &str, dir: &Path, out: &mut Vec<PathBuf>) -> Option<()> {
-        let input =
-            matches!(el.name.as_str(), "sourceDirectory" | "testSourceDirectory" | "sourceDir" | "testSourceDir")
-                || (matches!(parent, "sources" | "sourceDirs" | "testSources" | "testSourceDirs")
-                    && matches!(el.name.as_str(), "source" | "sourceDir" | "testSourceDir"))
-                || (matches!(parent, "resource" | "testResource" | "source" | "testSource") && el.name == "directory")
-                || (parent == "filters" && el.name == "filter");
-        // Profile activation may depend on the presence of an otherwise unrelated file.
-        let activation = parent == "file" && matches!(el.name.as_str(), "exists" | "missing");
-        if input || activation {
-            // Other properties can be overridden by -D, profiles or settings.
-            // Without Maven's effective roots, conservatively disable reuse for them.
-            let value = el
-                .text
-                .trim()
-                .replace("${project.basedir}", &dir.to_string_lossy())
-                .replace("${basedir}", &dir.to_string_lossy());
-            if value.contains("${") {
-                return None;
-            }
-            if !value.is_empty() {
-                out.push(dir.join(value));
-            }
-        }
-        for child in &el.children {
-            roots(child, &el.name, dir, out)?;
-        }
-        Some(())
-    }
-    let mut resolver = Resolver::new(local_repo.or_else(default_local_repo));
-    let mut out = Vec::new();
-    for project in projects {
-        let dir = root.join(&project.dir);
-        // Include all conventional language/resource roots, including nonstandard files under src.
-        out.push(dir.join("src"));
-        let pom = root.join(&project.pom);
-        resolver.context(&pom, 0);
-        let mut path = pom;
-        let mut seen = HashSet::new();
-        loop {
-            let canonical = dunce::canonicalize(&path).ok()?;
-            if !seen.insert(canonical) || seen.len() > MAX_PARENT_DEPTH {
-                return None;
-            }
-            out.push(path.clone());
-            let text = std::fs::read_to_string(&path).ok()?;
-            roots(&xml::parse(&text)?, "", &dir, &mut out)?;
-            let raw = resolver.pom(&path)?;
-            let Some(parent) = raw.parent else { break };
-            path = resolver.parent_path(path.parent()?, &parent)?;
-        }
-    }
-    // Also track imported BOMs read while resolving inheritance.
-    out.extend(resolver.poms.into_keys());
-    out.sort();
-    out.dedup();
-    Some(out)
-}
-
 // ---------------------------------------------------------------- plugins
 
 /// `maven-clean-plugin` → `clean`, `spring-boot-maven-plugin` → `spring-boot`.
@@ -709,76 +606,7 @@ pub fn goal_prefix(artifact_id: &str) -> String {
     artifact_id.strip_suffix("-plugin").unwrap_or(artifact_id).to_owned()
 }
 
-/// Goals of every plugin jar read so far, by the path of that jar.
-static DESCRIPTOR: OnceLock<Mutex<HashMap<String, Vec<String>>>> = OnceLock::new();
-
-/// `<goal>` names of the plugin descriptor inside its jar (`META-INF/maven/plugin.xml`),
-/// which is where Maven itself takes the list `plugin:help` prints. Empty when the jar
-/// is not in the local repository yet.
-fn descriptor_goals(repo: &Path, group_id: &str, artifact_id: &str, version: &str) -> Vec<String> {
-    // Keyed by the jar itself, not by its coordinates: a repository can be replaced
-    // between runs, and a test's empty repository must not answer for another's.
-    // One `push` per group segment: the layout is `<repo>/<group as directories>/…` on
-    // every platform, Windows' separator included.
-    let mut dir = repo.to_path_buf();
-    dir.extend(group_id.split('.'));
-    dir.push(artifact_id);
-    dir.push(version);
-    let Some(jar) = plugin_jar(&dir, artifact_id, version) else { return Vec::new() };
-    let key = jar.to_string_lossy().into_owned();
-    let cache = DESCRIPTOR.get_or_init(|| Mutex::new(HashMap::new()));
-    if let Some(cached) = cache.lock().unwrap_or_else(|e| e.into_inner()).get(&key) {
-        return cached.clone();
-    }
-    // A failed read is not remembered: the jar may be half written by Maven right now.
-    let Some(goals) = read_descriptor(&jar) else { return Vec::new() };
-    cache.lock().unwrap_or_else(|e| e.into_inner()).insert(key, goals.clone());
-    goals
-}
-
-/// The plugin's jar in its version directory: `<artifactId>-<version>.jar`, or — for a
-/// SNAPSHOT installed from a repository, whose file name carries a timestamp — the newest
-/// `<artifactId>-*.jar` that is neither sources nor javadoc.
-fn plugin_jar(dir: &Path, artifact_id: &str, version: &str) -> Option<PathBuf> {
-    let exact = dir.join(format!("{artifact_id}-{version}.jar"));
-    if exact.is_file() {
-        return Some(exact);
-    }
-    let prefix = format!("{artifact_id}-");
-    let mut best: Option<(std::time::SystemTime, PathBuf)> = None;
-    for entry in std::fs::read_dir(dir).ok()?.flatten() {
-        let path = entry.path();
-        let Some(name) = path.file_name().and_then(|n| n.to_str()) else { continue };
-        if !name.starts_with(&prefix) || !name.ends_with(".jar") || name.ends_with("-sources.jar") {
-            continue;
-        }
-        if name.ends_with("-javadoc.jar") {
-            continue;
-        }
-        let Ok(modified) = entry.metadata().and_then(|m| m.modified()) else { continue };
-        if best.as_ref().is_none_or(|(at, _)| modified > *at) {
-            best = Some((modified, path));
-        }
-    }
-    best.map(|(_, p)| p)
-}
-
-fn read_descriptor(jar: &Path) -> Option<Vec<String>> {
-    let file = std::fs::File::open(jar).ok()?;
-    let mut archive = zip::ZipArchive::new(file).ok()?;
-    let mut entry = archive.by_name("META-INF/maven/plugin.xml").ok()?;
-    let mut text = String::new();
-    entry.read_to_string(&mut text).ok()?;
-    let root = xml::parse(&text)?;
-    let mut goals: Vec<String> =
-        root.list("mojos", "mojo").iter().filter_map(|m| m.text_of("goal")).map(|g| g.trim().to_owned()).collect();
-    goals.retain(|g| !g.is_empty());
-    goals.sort();
-    goals.dedup();
-    Some(goals)
-}
-
-/// Goals of well-known plugins, for a jar that is not in the local repository yet.
+/// Goals of well-known plugins (their plugin descriptors are not read).
 fn known_goals(artifact_id: &str) -> &'static [&'static str] {
     match artifact_id {
         "maven-clean-plugin" => &["clean", "help"],
@@ -930,27 +758,9 @@ fn lifecycle_plugins(packaging: &str) -> &'static [&'static str] {
     }
 }
 
-/// A plugin as shown in the tree: the goals its jar declares, the ones known by name for
-/// the common plugins, and the ones the project binds in `<executions>`, sorted. IDEA lists
-/// a plugin's goals the same way, which is why a plugin outside the table (checkstyle, say)
-/// still shows every goal it offers instead of only the bound one.
-pub(crate) fn plugin(
-    group_id: &str,
-    artifact_id: &str,
-    version: Option<String>,
-    goals: &[String],
-    local_repo: Option<&Path>,
-) -> MavenPlugin {
+/// A plugin as shown in the tree: execution goals plus the plugin's known goals, sorted.
+pub(crate) fn plugin(group_id: &str, artifact_id: &str, version: Option<String>, goals: &[String]) -> MavenPlugin {
     let mut all: Vec<String> = known_goals(artifact_id).iter().map(|g| (*g).to_owned()).collect();
-    let repo = local_repo.map(Path::to_path_buf).or_else(default_local_repo);
-    // An unresolved `${…}` version names no jar: the table and the bound goals stand in.
-    if let (Some(repo), Some(version)) = (repo.as_deref(), version.as_deref().filter(|v| !v.contains("${"))) {
-        for g in descriptor_goals(repo, group_id, artifact_id, version) {
-            if !all.contains(&g) {
-                all.push(g);
-            }
-        }
-    }
     for g in goals {
         if !all.contains(g) {
             all.push(g.clone());
@@ -978,19 +788,13 @@ fn rel_path(root: &Path, p: &Path) -> String {
 }
 
 /// The POMs that are not modules of another one: the root `pom.xml`, else the
-/// shallowest `pom.xml` of each branch (a folder holding several builds). An
-/// aggregate POM directly inside `src/` counts too (issue #1001: `src/pom.xml`
-/// with its modules beside it, `src/app/pom.xml` and so on).
+/// shallowest `pom.xml` of each branch (a folder holding several builds).
 fn top_level_poms(root: &Path) -> Vec<PathBuf> {
     let top = root.join("pom.xml");
     if top.is_file() {
         return vec![top];
     }
     let mut out = Vec::new();
-    let src_pom = root.join("src").join("pom.xml");
-    if src_pom.is_file() {
-        out.push(src_pom);
-    }
     let mut queue: Vec<(PathBuf, usize)> = vec![(root.to_path_buf(), 0)];
     while let Some((dir, depth)) = queue.pop() {
         let Ok(entries) = std::fs::read_dir(&dir) else { continue };
@@ -1004,16 +808,9 @@ fn top_level_poms(root: &Path) -> Vec<PathBuf> {
         }
         dirs.sort();
         for d in dirs.into_iter().rev() {
-            let pom = d.join("pom.xml");
-            if pom.is_file() {
-                out.push(pom);
-                continue;
-            }
-            let src_pom = d.join("src").join("pom.xml");
-            if src_pom.is_file() {
-                out.push(src_pom);
-            }
-            if depth + 1 < POM_SEARCH_DEPTH {
+            if d.join("pom.xml").is_file() {
+                out.push(d.join("pom.xml"));
+            } else if depth + 1 < POM_SEARCH_DEPTH {
                 queue.push((d, depth + 1));
             }
         }
@@ -1128,20 +925,19 @@ pub(crate) fn load_with_repo(root: &Path, local_repo: Option<PathBuf>) -> MavenM
                     .or_else(|| ctx.managed_plugins.iter().find(|m| m.key() == p.key()).and_then(|m| m.version.clone()))
                     .map(|v| i(&v))
                     .filter(|v| !v.contains("${"));
-                plugin(&i(&p.group_id), &i(&p.artifact_id), version, &p.goals, resolver.local_repo.as_deref())
+                plugin(&i(&p.group_id), &i(&p.artifact_id), version, &p.goals)
             })
             .collect();
 
         let jv = ["maven.compiler.release", "java.version", "maven.compiler.source", "maven.compiler.target"]
             .iter()
             .find_map(|k| props.get(*k).map(|v| i(v)))
-            .or_else(|| ctx.compiler_release.as_deref().map(i))
+            .or_else(|| pom.compiler_release.as_deref().map(i))
             .and_then(|v| java_version(&v));
 
-        // The project can activate the profiles of its own POM and its ancestors'.
-        for (id, active) in &ctx.profiles {
-            if !model.profiles.iter().any(|x| x.id == *id) {
-                model.profiles.push(MavenProfile { id: id.clone(), active_by_default: *active });
+        for p in &pom.profiles {
+            if !model.profiles.iter().any(|x| x.id == p.id) {
+                model.profiles.push(MavenProfile { id: p.id.clone(), active_by_default: p.active_by_default });
             }
         }
         let artifact_id = i(&pom.artifact_id);
@@ -1158,7 +954,7 @@ pub(crate) fn load_with_repo(root: &Path, local_repo: Option<PathBuf>) -> MavenM
             aggregated,
             plugins,
             dependencies,
-            profiles: ctx.profiles.iter().map(|(id, _)| id.clone()).collect(),
+            profiles: pom.profiles.iter().map(|p| p.id.clone()).collect(),
             java_version: jv,
             command: wrapper(root, &dir),
             options: Vec::new(),
@@ -1171,101 +967,6 @@ pub(crate) fn load_with_repo(root: &Path, local_repo: Option<PathBuf>) -> MavenM
     model
 }
 
-/// Shared linkage decision for every Maven consumer, including modules outside a reactor directory.
-#[derive(Default)]
-pub struct UnlinkedProjects {
-    poms: std::collections::BTreeSet<String>,
-}
-
-impl UnlinkedProjects {
-    pub fn load(root: &Path, settings: &ide_core::settings::MavenSettings) -> Self {
-        if settings.unlinked_projects.is_empty() {
-            return Self::default();
-        }
-        Self::from_model(&load(root), settings)
-    }
-
-    pub fn from_model(model: &MavenModel, settings: &ide_core::settings::MavenSettings) -> Self {
-        let mut result = Self::default();
-        let mut pending = settings.unlinked_projects.clone();
-        while let Some(pom) = pending.pop() {
-            let pom = normalized_pom(&pom);
-            if !result.poms.insert(pom.clone()) {
-                continue;
-            }
-            if let Some(project) = model.projects.iter().find(|p| normalized_pom(&p.pom) == pom) {
-                pending.extend(project.modules.iter().cloned());
-            }
-        }
-        result
-    }
-
-    pub fn contains(&self, pom: &str) -> bool {
-        self.poms.contains(&normalized_pom(pom))
-    }
-
-    pub fn poms(&self) -> impl Iterator<Item = &str> {
-        self.poms.iter().map(String::as_str)
-    }
-
-    /// The POMs the Java language server should import when an unlinked POM is a module of a
-    /// linked reactor, else `None` (excluding the unlinked directories is enough then).
-    ///
-    /// jdtls imports an aggregator together with all of its modules, whatever its import
-    /// exclusions say, so a reactor keeping an unlinked module is left out; its other linked
-    /// modules are listed on their own. Such an aggregator (`pom` packaging) has no sources.
-    pub fn import_poms(&self, model: &MavenModel) -> Option<Vec<String>> {
-        let linked: Vec<&MavenProject> = model.projects.iter().filter(|p| !self.contains(&p.pom)).collect();
-        if !linked.iter().any(|p| p.modules.iter().any(|m| self.contains(m))) {
-            return None;
-        }
-        let by_pom: std::collections::HashMap<String, &MavenProject> =
-            model.projects.iter().map(|p| (normalized_pom(&p.pom), p)).collect();
-        // Whether `pom`'s module tree reaches an unlinked POM.
-        let reaches_unlinked = |pom: &str| {
-            let mut seen = std::collections::HashSet::new();
-            let mut pending = vec![normalized_pom(pom)];
-            while let Some(pom) = pending.pop() {
-                if !seen.insert(pom.clone()) {
-                    continue;
-                }
-                let Some(project) = by_pom.get(&pom) else { continue };
-                for module in &project.modules {
-                    if self.contains(module) {
-                        return true;
-                    }
-                    pending.push(normalized_pom(module));
-                }
-            }
-            false
-        };
-        Some(linked.into_iter().filter(|p| !reaches_unlinked(&p.pom)).map(|p| normalized_pom(&p.pom)).collect())
-    }
-
-    pub fn filter(&self, model: &mut MavenModel) {
-        model.projects.retain(|p| !self.contains(&p.pom));
-        for project in &mut model.projects {
-            project.modules.retain(|p| !self.contains(p));
-        }
-        model.profiles.retain(|p| model.projects.iter().any(|project| project.profiles.contains(&p.id)));
-    }
-}
-
-fn normalized_pom(pom: &str) -> String {
-    let pom = pom.replace('\\', "/");
-    let mut parts = Vec::new();
-    for part in pom.split('/') {
-        match part {
-            "" | "." => {}
-            ".." if parts.last().is_some_and(|p| *p != "..") => {
-                parts.pop();
-            }
-            part => parts.push(part),
-        }
-    }
-    parts.join("/")
-}
-
 /// Every POM of the model (for change detection).
 pub fn build_files(root: &Path, model: &MavenModel) -> Vec<PathBuf> {
     model.projects.iter().map(|p| root.join(&p.pom)).collect()
@@ -1274,16 +975,6 @@ pub fn build_files(root: &Path, model: &MavenModel) -> Vec<PathBuf> {
 /// Projects and their plugins / dependencies from `mvn help:effective-pom` output
 /// (`<project>` or `<projects>`), keyed `groupId:artifactId`.
 pub fn parse_effective_pom(text: &str) -> Vec<(String, Vec<MavenPlugin>, Vec<MavenDependency>)> {
-    parse_effective_pom_in(text, None)
-}
-
-/// The same, with the local repository the project actually builds against (a
-/// `-Dmaven.repo.local` of the build, say): the plugin goals come from jars there,
-/// rather than from the user's default one.
-pub fn parse_effective_pom_in(
-    text: &str,
-    local_repo: Option<&Path>,
-) -> Vec<(String, Vec<MavenPlugin>, Vec<MavenDependency>)> {
     let Some(root) = xml::parse(text) else { return Vec::new() };
     let projects: Vec<&Element> =
         if root.name == "projects" { root.children_named("project").collect() } else { vec![&root] };
@@ -1295,7 +986,7 @@ pub fn parse_effective_pom_in(
             let plugins = raw
                 .plugins
                 .iter()
-                .map(|pl| plugin(&pl.group_id, &pl.artifact_id, pl.version.clone(), &pl.goals, local_repo))
+                .map(|pl| plugin(&pl.group_id, &pl.artifact_id, pl.version.clone(), &pl.goals))
                 .collect();
             let deps = raw
                 .deps
@@ -1426,107 +1117,6 @@ pub fn parse_dependency_tree(output: &str) -> Vec<(String, Vec<MavenDependency>)
 mod tests {
     use super::*;
 
-    /// A plugin jar in `repo` whose descriptor declares `goals`.
-    fn write_plugin_jar(repo: &Path, group: &str, artifact: &str, version: &str, goals: &[&str]) {
-        let dir = repo.join(group.replace('.', "/")).join(artifact).join(version);
-        std::fs::create_dir_all(&dir).unwrap();
-        let mojos: String = goals.iter().map(|g| format!("<mojo><goal>{g}</goal></mojo>")).collect();
-        let descriptor = format!("<plugin><mojos>{mojos}</mojos></plugin>");
-        let file = std::fs::File::create(dir.join(format!("{artifact}-{version}.jar"))).unwrap();
-        let mut zip = zip::ZipWriter::new(file);
-        zip.start_file("META-INF/maven/plugin.xml", zip::write::SimpleFileOptions::default()).unwrap();
-        std::io::Write::write_all(&mut zip, descriptor.as_bytes()).unwrap();
-        zip.finish().unwrap();
-    }
-
-    #[test]
-    fn a_plugin_lists_the_goals_its_jar_declares() {
-        let tmp = tempfile::tempdir().unwrap();
-        let repo = tmp.path();
-        write_plugin_jar(
-            repo,
-            "org.apache.maven.plugins",
-            "maven-checkstyle-plugin",
-            "3.3.1",
-            &["checkstyle", "checkstyle-aggregate", "help", "check"],
-        );
-        let p = plugin(
-            "org.apache.maven.plugins",
-            "maven-checkstyle-plugin",
-            Some("3.3.1".into()),
-            &["check".to_owned()],
-            Some(repo),
-        );
-        assert_eq!(p.goals, ["check", "checkstyle", "checkstyle-aggregate", "help"], "every goal the plugin offers");
-        assert_eq!(p.prefix, "checkstyle");
-    }
-
-    #[test]
-    fn a_settings_file_names_the_repository_to_read_goals_from() {
-        let tmp = tempfile::tempdir().unwrap();
-        let settings = tmp.path().join("settings.xml");
-        std::fs::write(
-            &settings,
-            "<settings><localRepository>${user.home}/repo-from-settings</localRepository></settings>",
-        )
-        .unwrap();
-        let repo = local_repository_of(&settings).unwrap();
-        assert!(repo.ends_with("repo-from-settings"), "{}", repo.display());
-        assert!(!repo.to_string_lossy().contains("${user.home}"));
-        // A settings file that names none leaves Maven's default alone.
-        let plain = tmp.path().join("plain.xml");
-        std::fs::write(&plain, "<settings><offline>true</offline></settings>").unwrap();
-        assert!(local_repository_of(&plain).is_none());
-        assert!(local_repository_of(&tmp.path().join("missing.xml")).is_none());
-    }
-
-    #[test]
-    fn effective_pom_goals_come_from_the_local_repository_it_is_given() {
-        let tmp = tempfile::tempdir().unwrap();
-        write_plugin_jar(tmp.path(), "org.apache.maven.plugins", "maven-demo-plugin", "1.0", &["run", "help"]);
-        let text = "<project><groupId>g</groupId><artifactId>a</artifactId><build><plugins>\
-            <plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-demo-plugin</artifactId>\
-            <version>1.0</version><executions><execution><goals><goal>run</goal></goals></execution></executions>\
-            </plugin></plugins></build></project>";
-        let with_repo = parse_effective_pom_in(text, Some(tmp.path()));
-        assert_eq!(with_repo[0].1[0].goals, ["help", "run"], "the jar's own goals come first");
-        // Without that repository the plugin is unknown: only what the project binds.
-        assert_eq!(parse_effective_pom(text)[0].1[0].goals, ["run"]);
-    }
-
-    #[test]
-    fn a_snapshot_plugin_is_found_by_its_timestamped_jar() {
-        let tmp = tempfile::tempdir().unwrap();
-        let dir = tmp.path().join("g/p/maven-demo-plugin/1.0-SNAPSHOT");
-        std::fs::create_dir_all(&dir).unwrap();
-        let descriptor = "<plugin><mojos><mojo><goal>run</goal></mojo></mojos></plugin>";
-        let file = std::fs::File::create(dir.join("maven-demo-plugin-1.0-20240101.120000-3.jar")).unwrap();
-        let mut zip = zip::ZipWriter::new(file);
-        zip.start_file("META-INF/maven/plugin.xml", zip::write::SimpleFileOptions::default()).unwrap();
-        std::io::Write::write_all(&mut zip, descriptor.as_bytes()).unwrap();
-        zip.finish().unwrap();
-        // A sibling sources jar must not win.
-        std::fs::File::create(dir.join("maven-demo-plugin-1.0-20240101.120000-3-sources.jar")).unwrap();
-        let p = plugin("g.p", "maven-demo-plugin", Some("1.0-SNAPSHOT".into()), &[], Some(tmp.path()));
-        assert_eq!(p.goals, ["run"]);
-    }
-
-    #[test]
-    fn a_plugin_without_its_jar_keeps_the_table_and_the_bound_goals() {
-        let tmp = tempfile::tempdir().unwrap();
-        let p = plugin(
-            "org.apache.maven.plugins",
-            "maven-checkstyle-plugin",
-            Some("3.3.1".into()),
-            &["check".to_owned()],
-            Some(tmp.path()),
-        );
-        assert_eq!(p.goals, ["check"], "nothing beyond what the project binds");
-        let known =
-            plugin("org.apache.maven.plugins", "maven-compiler-plugin", Some("3.13.0".into()), &[], Some(tmp.path()));
-        assert_eq!(known.goals, ["compile", "help", "testCompile"], "the common plugins keep their table");
-    }
-
     fn write(dir: &Path, rel: &str, text: &str) {
         let p = dir.join(rel);
         std::fs::create_dir_all(p.parent().unwrap()).unwrap();
@@ -1550,72 +1140,6 @@ mod tests {
       </profiles>
     </project>"#;
 
-    #[test]
-    fn maven_4_subprojects_are_modules() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        write(
-            root,
-            "pom.xml",
-            r#"<project xmlns="http://maven.apache.org/POM/4.1.0"><modelVersion>4.1.0</modelVersion>
-              <groupId>demo</groupId><artifactId>parent</artifactId><version>1.0</version><packaging>pom</packaging>
-              <subprojects><subproject>core</subproject></subprojects>
-              <profiles><profile><id>extra</id><subprojects><subproject>extra</subproject></subprojects></profile></profiles>
-            </project>"#,
-        );
-        write(root, "core/pom.xml", "<project><artifactId>core</artifactId></project>");
-        write(root, "extra/pom.xml", "<project><artifactId>extra</artifactId></project>");
-        let model = load_with_repo(root, None);
-        assert_eq!(model.projects[0].modules, ["core/pom.xml"]);
-        assert!(model.projects.iter().any(|p| p.pom == "core/pom.xml" && p.aggregated));
-    }
-
-    #[test]
-    fn modules_inherit_the_compiler_level_of_the_parent_plugin_configuration() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        let parent = |build: &str| {
-            format!(
-                r#"<project><groupId>demo</groupId><artifactId>parent</artifactId><version>1.0</version><packaging>pom</packaging>
-                  <modules><module>core</module><module>app</module></modules>
-                  <properties><jdk>17</jdk></properties>{build}</project>"#
-            )
-        };
-        let child = |name: &str, build: &str| {
-            format!(
-                r#"<project><parent><groupId>demo</groupId><artifactId>parent</artifactId><version>1.0</version></parent>
-                  <artifactId>{name}</artifactId>{build}</project>"#
-            )
-        };
-        let compiler = |level: &str| {
-            format!(
-                "<plugin><artifactId>maven-compiler-plugin</artifactId><configuration><source>{level}</source></configuration></plugin>"
-            )
-        };
-        let versions = |model: &MavenModel| -> Vec<(String, Option<u32>)> {
-            model.projects.iter().map(|p| (p.pom.clone(), p.java_version)).collect()
-        };
-        let app_build = format!("<build><plugins>{}</plugins></build>", compiler("21"));
-        write(root, "core/pom.xml", &child("core", ""));
-        write(root, "app/pom.xml", &child("app", &app_build));
-        for build in [
-            format!("<build><pluginManagement><plugins>{}</plugins></pluginManagement></build>", compiler("${jdk}")),
-            format!("<build><plugins>{}</plugins></build>", compiler("1.8")),
-        ] {
-            write(root, "pom.xml", &parent(&build));
-            let expected = if build.contains("1.8") { 8 } else { 17 };
-            assert_eq!(
-                versions(&load_with_repo(root, None)),
-                [
-                    ("pom.xml".to_owned(), Some(expected)),
-                    ("core/pom.xml".to_owned(), Some(expected)),
-                    ("app/pom.xml".to_owned(), Some(21)),
-                ],
-                "{build}"
-            );
-        }
-    }
-
     #[test]
     fn multi_module_parent_properties_and_managed_versions() {
         let tmp = tempfile::tempdir().unwrap();
@@ -1695,41 +1219,9 @@ mod tests {
         let profiles: Vec<(&str, bool)> = model.profiles.iter().map(|p| (p.id.as_str(), p.active_by_default)).collect();
         assert_eq!(profiles, [("dev", true), ("extra", false)]);
         assert_eq!(parent.profiles, ["dev", "extra"]);
-        assert_eq!(core.profiles, ["dev", "extra"], "a module inherits its parent's profiles");
         assert!(model.projects.iter().all(|p| p.command == if cfg!(windows) { "mvn.cmd" } else { "mvn" }));
     }
 
-    #[test]
-    fn profiles_of_a_parent_pom_are_inherited() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        write(
-            root,
-            "pom.xml",
-            r#"<project><groupId>demo</groupId><artifactId>parent</artifactId><version>1.0</version>
-              <packaging>pom</packaging><modules><module>child</module></modules>
-              <profiles>
-                <profile><id>jdk8</id></profile>
-                <profile><id>jdk21</id><activation><activeByDefault>true</activeByDefault></activation></profile>
-              </profiles>
-            </project>"#,
-        );
-        write(
-            root,
-            "child/pom.xml",
-            r#"<project><parent><groupId>demo</groupId><artifactId>parent</artifactId><version>1.0</version></parent>
-              <artifactId>child</artifactId>
-              <profiles><profile><id>own</id></profile></profiles>
-            </project>"#,
-        );
-        let model = load_with_repo(root, None);
-        let child = &model.projects[1];
-        // `-Pjdk8` on the module activates the parent's profile, so it is listed.
-        assert_eq!(child.profiles, ["jdk8", "jdk21", "own"]);
-        let profiles: Vec<(&str, bool)> = model.profiles.iter().map(|p| (p.id.as_str(), p.active_by_default)).collect();
-        assert_eq!(profiles, [("jdk8", false), ("jdk21", true), ("own", false)]);
-    }
-
     #[test]
     fn parent_and_bom_from_the_local_repository_and_wrapper() {
         let tmp = tempfile::tempdir().unwrap();
@@ -1811,25 +1303,6 @@ mod tests {
         assert!(!is_maven_project(&root.join("c")));
     }
 
-    #[test]
-    fn aggregate_pom_in_src_is_a_build() {
-        // Issue #1001: `src/pom.xml` aggregating modules under `src/` is recognized,
-        // with its modules loaded — while `src` stays unsearched otherwise.
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        write(
-            root,
-            "src/pom.xml",
-            "<project><groupId>g</groupId><artifactId>parent</artifactId><packaging>pom</packaging>\
-             <modules><module>app</module></modules></project>",
-        );
-        write(root, "src/app/pom.xml", "<project><groupId>g</groupId><artifactId>app</artifactId></project>");
-        let model = load_with_repo(root, None);
-        let names: Vec<&str> = model.projects.iter().map(|p| p.artifact_id.as_str()).collect();
-        assert_eq!(names, ["parent", "app"]);
-        assert!(is_maven_project(root));
-    }
-
     #[test]
     fn property_interpolation() {
         let props: HashMap<String, String> =
@@ -1986,92 +1459,3 @@ mod tests {
         }
     }
 }
-
-#[cfg(test)]
-mod linkage_tests {
-    use super::*;
-    use ide_core::settings::MavenSettings;
-
-    #[test]
-    fn excludes_reactor_modules_and_profiles_but_keeps_other_roots() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        for (name, body) in [
-            (
-                "a",
-                "<modules><module>child</module><module>../shared</module></modules><profiles><profile><id>only-a</id></profile></profiles>",
-            ),
-            ("a/child", ""),
-            ("shared", ""),
-            ("b", ""),
-        ] {
-            std::fs::create_dir_all(root.join(name)).unwrap();
-            std::fs::write(
-                root.join(name).join("pom.xml"),
-                format!("<project><artifactId>{name}</artifactId>{body}</project>"),
-            )
-            .unwrap();
-        }
-        let original = load_with_repo(root, None);
-        let settings = MavenSettings { unlinked_projects: vec!["./a/pom.xml".into()], ..Default::default() };
-        let unlinked = UnlinkedProjects::from_model(&original, &settings);
-        assert!(unlinked.contains("a/child/pom.xml"));
-        assert!(unlinked.contains("shared/pom.xml"));
-        assert!(unlinked.contains("a/../shared/pom.xml"));
-        assert!(!unlinked.contains("b/pom.xml"));
-        let mut model = original.clone();
-        unlinked.filter(&mut model);
-        assert_eq!(model.projects.iter().map(|p| p.pom.as_str()).collect::<Vec<_>>(), ["b/pom.xml"]);
-        assert!(model.profiles.is_empty());
-        let mut restored = original.clone();
-        UnlinkedProjects::from_model(&original, &MavenSettings::default()).filter(&mut restored);
-        assert_eq!(restored, original);
-    }
-
-    #[test]
-    fn language_server_imports_reactor_modules_individually_once_one_is_unlinked() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        // r ─┬─ x
-        //    ├─ y ─┬─ y/y1
-        //    │     └─ y/y2
-        //    └─ z          other/ is a separate root.
-        for (dir, modules) in [
-            ("r", "<modules><module>x</module><module>y</module><module>z</module></modules>"),
-            ("r/x", ""),
-            ("r/y", "<modules><module>y1</module><module>y2</module></modules>"),
-            ("r/y/y1", ""),
-            ("r/y/y2", ""),
-            ("r/z", ""),
-            ("other", ""),
-        ] {
-            std::fs::create_dir_all(root.join(dir)).unwrap();
-            std::fs::write(
-                root.join(dir).join("pom.xml"),
-                format!("<project><artifactId>{dir}</artifactId>{modules}</project>"),
-            )
-            .unwrap();
-        }
-        let model = load_with_repo(root, None);
-        let cases: [(&[&str], Option<&[&str]>); 5] = [
-            // Nothing unlinked, or whole roots: the import exclusions do it.
-            (&[], None),
-            (&["other/pom.xml"], None),
-            (&["r/pom.xml"], None),
-            // A module of a linked reactor: every other linked POM, minus the aggregators above it.
-            (&["r/y/y1/pom.xml"], Some(&["other/pom.xml", "r/x/pom.xml", "r/y/y2/pom.xml", "r/z/pom.xml"])),
-            (&["./r/y/pom.xml"], Some(&["other/pom.xml", "r/x/pom.xml", "r/z/pom.xml"])),
-        ];
-        for (unlinked, expected) in cases {
-            let settings = MavenSettings {
-                unlinked_projects: unlinked.iter().map(|s| s.to_string()).collect(),
-                ..Default::default()
-            };
-            let mut poms = UnlinkedProjects::from_model(&model, &settings).import_poms(&model);
-            if let Some(poms) = &mut poms {
-                poms.sort();
-            }
-            assert_eq!(poms, expected.map(|e| e.iter().map(|s| s.to_string()).collect::<Vec<_>>()), "{unlinked:?}");
-        }
-    }
-}

crates/ide-build/src/process.rs

@@ -2,12 +2,11 @@
 //! line to a callback, and cancellation kills the whole process group (the
 //! `mvnw` / `gradlew` wrapper scripts start the JVM as a child).
 
-use ide_core::process::kill_tree;
 use ide_core::{CancellationToken, IdeError, IdeResult};
 use std::collections::BTreeMap;
 use std::io::{BufRead, BufReader, Read};
 use std::path::Path;
-use std::process::{Command, Stdio};
+use std::process::{Child, Command, Stdio};
 use std::sync::mpsc;
 use std::time::Duration;
 
@@ -23,20 +22,16 @@ pub(crate) struct Output {
     pub text: String,
 }
 
-/// `program` as spawnable: a bare name (`mvn`, `mvn.cmd`) resolves on the IDE's
-/// search path — the login shell's `PATH` plus version-manager shims — since the
-/// app's own `PATH` can be minimal and `Command` would not see `mvn` there.
-pub(crate) fn program_path(program: &str, env: &BTreeMap<String, String>) -> std::path::PathBuf {
-    let path = std::path::Path::new(program);
-    if !path.is_relative() || path.components().count() > 1 {
-        return path.to_path_buf();
+fn kill_tree(child: &mut Child) {
+    #[cfg(unix)]
+    if let Ok(pid) = i32::try_from(child.id()) {
+        // SAFETY: plain syscall; the group was created by `process_group(0)` at spawn.
+        unsafe {
+            libc::kill(-pid, libc::SIGKILL);
+        }
     }
-    let search = env
-        .iter()
-        .find(|(k, _)| k.eq_ignore_ascii_case("PATH"))
-        .map(|(_, v)| std::ffi::OsString::from(v))
-        .unwrap_or_else(ide_core::tool_path::search_path);
-    ide_core::process::find_executable(program, &search).unwrap_or_else(|| path.to_path_buf())
+    let _ = child.kill();
+    let _ = child.wait();
 }
 
 /// Runs `program args` in `cwd`, feeding each output line to `on_line`; kills
@@ -47,35 +42,22 @@ pub(crate) fn run(
     cwd: &Path,
     env: &BTreeMap<String, String>,
     cancel: &CancellationToken,
-    on_line: impl FnMut(Stream, &str),
-) -> IdeResult<Output> {
-    run_with_env(program, args, cwd, env, false, cancel, on_line)
-}
-
-pub(crate) fn run_with_env(
-    program: &str,
-    args: &[String],
-    cwd: &Path,
-    env: &BTreeMap<String, String>,
-    clear_env: bool,
-    cancel: &CancellationToken,
     mut on_line: impl FnMut(Stream, &str),
 ) -> IdeResult<Output> {
     tracing::info!("build: {program} {} (in {})", args.join(" "), cwd.display());
     // Output is read as UTF-8: JVMs on Windows are told to write it (see `ide_core::output_encoding`).
     let encoding =
         ide_core::output_encoding::fix(program, args, env, |k| std::env::var(k).ok(), "UTF-8", cfg!(windows));
-    let program = program_path(program, env);
-    let mut command = Command::new(&program);
-    command.args(args).current_dir(cwd).envs(env).envs(encoding.env.iter().map(|(k, v)| (k, v))).stdin(Stdio::null());
+    let mut command = Command::new(program);
+    command.args(args).current_dir(cwd).envs(env).envs(encoding.env).stdin(Stdio::null());
     command.stdout(Stdio::piped()).stderr(Stdio::piped());
-    // Its own group: `mvnw` / `gradlew` start the JVM as a child, and cancelling kills both.
-    ide_core::process::prepare(ide_core::process::own_group(&mut command));
-    if clear_env {
-        command.env_clear().envs(env).envs(encoding.env);
+    #[cfg(unix)]
+    {
+        use std::os::unix::process::CommandExt;
+        command.process_group(0);
     }
-    let mut child =
-        command.spawn().map_err(|e| IdeError::unavailable(format!("cannot start {}: {e}", program.display())))?;
+    ide_core::process::prepare(&mut command);
+    let mut child = command.spawn().map_err(|e| IdeError::unavailable(format!("cannot start {program}: {e}")))?;
     let (tx, rx) = mpsc::channel::<(Stream, String)>();
     let pump = |stream: Box<dyn Read + Send>, kind: Stream, tx: mpsc::Sender<(Stream, String)>| {
         std::thread::spawn(move || {
@@ -86,7 +68,7 @@ pub(crate) fn run_with_env(
                 match reader.read_until(b'\n', &mut buf) {
                     Ok(0) | Err(_) => break,
                     Ok(_) => {
-                        let line = ide_core::output_encoding::decode_tool_output(&buf);
+                        let line = String::from_utf8_lossy(&buf);
                         let line = line.trim_end_matches(['\n', '\r']).to_owned();
                         if tx.send((kind, line)).is_err() {
                             break;

crates/ide-build/src/sync.rs

@@ -4,16 +4,14 @@
 //! per project (`maven.json`, `gradle.json` in the cache directory) and merged
 //! into the static model by [`crate::load`]; a changed build file marks them stale.
 
-use crate::gradle::{self, GradleModel, GradleTask, ReportedProject, parse_reported_projects};
+use crate::gradle::{self, GradleModel, GradleTask};
 use crate::maven::{self, MavenDependency, MavenModel, MavenPlugin};
 use crate::process::{self, Output};
 use ide_core::{CancellationToken, IdeError, IdeResult};
 use serde::{Deserialize, Serialize, de::DeserializeOwned};
 use specta::Type;
-use std::collections::{BTreeMap, HashMap};
+use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
-use std::sync::{Arc, LazyLock, Mutex};
-use std::time::SystemTime;
 
 #[derive(Clone, Debug, Serialize, Deserialize, Type)]
 #[serde(rename_all = "camelCase")]
@@ -25,7 +23,6 @@ pub struct SyncProgress {
 
 #[derive(Clone, Debug, Default)]
 pub struct SyncOptions {
-    pub maven_settings: ide_core::settings::MavenSettings,
     /// `-o` / `--offline`.
     pub offline: bool,
     /// Maven profiles (`-P`), `!id` deactivates.
@@ -34,8 +31,6 @@ pub struct SyncOptions {
     pub env: BTreeMap<String, String>,
     /// Maven launcher replacing the project's `mvnw` / `mvn` (Settings › Maven home).
     pub maven_command: Option<String>,
-    /// Resolved Gradle launcher from Settings.
-    pub gradle_command: Option<String>,
     /// Maven options before the goals (`-s`, `-Dmaven.repo.local=`).
     pub maven_options: Vec<String>,
 }
@@ -50,11 +45,6 @@ struct CachedMavenProject {
 
 #[derive(Clone, Debug, Default, Serialize, Deserialize)]
 struct MavenCache {
-    /// Bumped whenever what the cache holds stops matching what the model would be
-    /// built as now (plugin goals read from a descriptor, say): an older cache is
-    /// dropped instead of shadowing the model.
-    #[serde(default)]
-    version: u32,
     hash: String,
     at_ms: f64,
     error: Option<String>,
@@ -70,16 +60,9 @@ struct GradleCache {
     at_ms: f64,
     error: Option<String>,
     tasks: Vec<(String, GradleTask)>,
-    /// The projects as Gradle evaluated them; empty in caches from before they were read.
-    #[serde(default)]
-    projects: Vec<ReportedProject>,
 }
 
-/// Init script printing every project, its source sets and Java version once configured.
-const MODEL_INIT_SCRIPT: &str = include_str!("gradle-model.gradle");
-
 const MAVEN_CACHE: &str = "maven.json";
-const MAVEN_CACHE_VERSION: u32 = 1;
 
 /// `dependency:tree` of a plugin version whose `-Dverbose` lists the occurrences Maven
 /// omitted (conflicts, duplicates): verbose output was dropped in 3.0 and is back since 3.2.
@@ -96,24 +79,6 @@ fn maven_sync_goals(effective: &Path, offline: bool) -> Vec<String> {
     ]
 }
 const GRADLE_CACHE: &str = "gradle.json";
-const MAVEN_PROFILES: &str = "maven-profiles.json";
-
-/// The Maven profiles (`-P` entries, `!id` deactivates) the project was last synced
-/// with: what the IDE resolves it with besides `mvn` (the Java language server, Build Project).
-pub fn maven_profiles(cache_dir: &Path) -> Vec<String> {
-    read_cache(cache_dir, MAVEN_PROFILES).unwrap_or_default()
-}
-
-/// Records the profiles of a sync for [`maven_profiles`]; `true` when they changed.
-pub fn save_maven_profiles(cache_dir: &Path, profiles: &[String]) -> IdeResult<bool> {
-    if maven_profiles(cache_dir) == profiles {
-        return Ok(false);
-    }
-    std::fs::create_dir_all(cache_dir)?;
-    let json = serde_json::to_vec(profiles).map_err(|e| IdeError::internal(e.to_string()))?;
-    std::fs::write(cache_dir.join(MAVEN_PROFILES), json)?;
-    Ok(true)
-}
 
 fn read_cache<T: DeserializeOwned>(dir: &Path, name: &str) -> Option<T> {
     serde_json::from_slice(&std::fs::read(dir.join(name)).ok()?).ok()
@@ -130,20 +95,6 @@ fn write_cache<T: Serialize>(dir: &Path, name: &str, value: &T) -> IdeResult<()>
 
 /// FNV-1a over the paths and contents of `files` (missing files count as empty).
 fn hash_files(files: &[PathBuf]) -> String {
-    hash_contents(files, |f| std::fs::read(f).unwrap_or_default())
-}
-
-/// Like IDEA's auto-import CRC: editing a comment or reformatting a build script
-/// does not make the last sync stale.
-fn hash_gradle_files(files: &[PathBuf]) -> String {
-    hash_contents(files, |f| {
-        let text = std::fs::read_to_string(f).unwrap_or_default();
-        let script = f.extension().is_some_and(|e| e == "gradle" || e == "kts");
-        if script { gradle::script_fingerprint(&text) } else { text }.into_bytes()
-    })
-}
-
-fn hash_contents(files: &[PathBuf], read: impl Fn(&Path) -> Vec<u8>) -> String {
     let mut h: u64 = 0xcbf29ce484222325;
     let mut feed = |bytes: &[u8]| {
         for b in bytes {
@@ -154,7 +105,7 @@ fn hash_contents(files: &[PathBuf], read: impl Fn(&Path) -> Vec<u8>) -> String {
     for f in files {
         feed(f.to_string_lossy().as_bytes());
         feed(&[0]);
-        feed(&read(f));
+        feed(&std::fs::read(f).unwrap_or_default());
         feed(&[0]);
     }
     format!("{h:016x}")
@@ -167,19 +118,6 @@ fn now_ms() -> f64 {
 /// Merges the cached effective build into `model`.
 pub fn apply_maven_cache(root: &Path, cache_dir: &Path, model: &mut MavenModel) {
     let Some(cache) = read_cache::<MavenCache>(cache_dir, MAVEN_CACHE) else { return };
-    if cache.version != MAVEN_CACHE_VERSION {
-        return; // built by an older IDE: what it holds no longer matches the model
-    }
-    model.synced_at = Some(cache.at_ms);
-    model.sync_error = cache.error;
-    let changed = cache.hash != hash_files(&maven::build_files(root, model));
-    model.stale = !cache.verbose || changed;
-    // A cache older than the current build files: its effective-POM plugins and
-    // resolved dependencies would hide what the POMs declare now (a just added
-    // dependency never appears). The static parse stays until Reload.
-    if changed {
-        return;
-    }
     for p in &mut model.projects {
         if let Some(c) = cache.projects.iter().find(|c| c.key == p.key()) {
             if !c.plugins.is_empty() {
@@ -188,35 +126,14 @@ pub fn apply_maven_cache(root: &Path, cache_dir: &Path, model: &mut MavenModel)
             p.dependencies = c.dependencies.clone();
         }
     }
-}
-
-/// The projects of the last successful Gradle sync.
-/// Parsed once per change of the cache file (modification time and size): content and source
-/// roots are read on hot paths (every references search, Find in Files, repository scans).
-pub fn reported_gradle_projects(cache_dir: &Path) -> Arc<Vec<ReportedProject>> {
-    type Memo = HashMap<PathBuf, (Option<SystemTime>, u64, Arc<Vec<ReportedProject>>)>;
-    static MEMO: LazyLock<Mutex<Memo>> = LazyLock::new(Default::default);
-    let path = cache_dir.join(GRADLE_CACHE);
-    let Ok(meta) = std::fs::metadata(&path) else {
-        MEMO.lock().unwrap_or_else(|e| e.into_inner()).remove(&path);
-        return Arc::default();
-    };
-    let stamp = (meta.modified().ok(), meta.len());
-    let mut memo = MEMO.lock().unwrap_or_else(|e| e.into_inner());
-    if let Some((modified, len, projects)) = memo.get(&path)
-        && (*modified, *len) == stamp
-    {
-        return projects.clone();
-    }
-    let projects = Arc::new(read_cache::<GradleCache>(cache_dir, GRADLE_CACHE).map(|c| c.projects).unwrap_or_default());
-    memo.insert(path, (stamp.0, stamp.1, projects.clone()));
-    projects
+    model.synced_at = Some(cache.at_ms);
+    model.sync_error = cache.error;
+    model.stale = !cache.verbose || cache.hash != hash_files(&maven::build_files(root, model));
 }
 
 /// Merges the cached task list into `model`.
 pub fn apply_gradle_cache(root: &Path, cache_dir: &Path, model: &mut GradleModel) {
     let Some(cache) = read_cache::<GradleCache>(cache_dir, GRADLE_CACHE) else { return };
-    gradle::merge_reported_projects(root, model, &cache.projects);
     if !cache.tasks.is_empty() {
         for p in &mut model.projects {
             let tasks: Vec<GradleTask> =
@@ -226,11 +143,9 @@ pub fn apply_gradle_cache(root: &Path, cache_dir: &Path, model: &mut GradleModel
             }
         }
     }
-    // A successful sync from before projects were cached has not seen computed includes.
-    let without_projects = cache.error.is_none() && cache.projects.is_empty();
     model.synced_at = Some(cache.at_ms);
     model.sync_error = cache.error;
-    model.stale = without_projects || cache.hash != hash_gradle_files(&gradle::build_files(root, model));
+    model.stale = cache.hash != hash_files(&gradle::build_files(root, model));
 }
 
 // ---------------------------------------------------------------- processes
@@ -283,34 +198,10 @@ pub fn sync_maven(
     cancel: &CancellationToken,
     progress: &dyn Fn(SyncProgress),
 ) -> IdeResult<()> {
-    let mut model = maven::load(root);
-    maven::UnlinkedProjects::from_model(&model, &options.maven_settings).filter(&mut model);
+    let model = maven::load(root);
     std::fs::create_dir_all(cache_dir)?;
-    let mut cache = MavenCache {
-        version: MAVEN_CACHE_VERSION,
-        hash: hash_files(&maven::build_files(root, &model)),
-        verbose: true,
-        ..MavenCache::default()
-    };
-    // Where the build resolves its jars, and therefore where the plugin goals are read
-    // from: `-Dmaven.repo.local=` first, then `<localRepository>` of the `-s` settings,
-    // then the user's default repository (which `plugin()` resolves itself).
-    let local_repo: Option<PathBuf> =
-        options.maven_options.iter().find_map(|a| a.strip_prefix("-Dmaven.repo.local=")).map(PathBuf::from).or_else(
-            || {
-                let mut args = options.maven_options.iter();
-                while let Some(arg) = args.next() {
-                    let path = match arg.as_str() {
-                        "-s" | "--settings" => args.next().map(String::as_str),
-                        _ => arg.strip_prefix("-s=").or_else(|| arg.strip_prefix("--settings=")),
-                    };
-                    if let Some(path) = path {
-                        return maven::local_repository_of(Path::new(path));
-                    }
-                }
-                None
-            },
-        );
+    let mut cache =
+        MavenCache { hash: hash_files(&maven::build_files(root, &model)), verbose: true, ..MavenCache::default() };
     let mut errors: Vec<String> = Vec::new();
     for (n, top) in model.projects.iter().filter(|p| !p.aggregated).enumerate() {
         let effective = cache_dir.join(format!("effective-pom-{n}.xml"));
@@ -339,9 +230,8 @@ pub fn sync_maven(
                 });
             }
         })?;
-        let effective_projects = std::fs::read_to_string(&effective)
-            .map(|t| maven::parse_effective_pom_in(&t, local_repo.as_deref()))
-            .unwrap_or_default();
+        let effective_projects =
+            std::fs::read_to_string(&effective).map(|t| maven::parse_effective_pom(&t)).unwrap_or_default();
         let trees = maven::parse_dependency_tree(&out.text);
         for (key, plugins, deps) in effective_projects {
             let dependencies = trees.iter().find(|(k, _)| *k == key).map(|(_, t)| t.clone()).unwrap_or(deps);
@@ -370,39 +260,18 @@ pub fn sync_gradle(
     cancel: &CancellationToken,
     progress: &dyn Fn(SyncProgress),
 ) -> IdeResult<()> {
-    let mut model = gradle::load(root).ok_or_else(|| IdeError::not_found("no Gradle build in this project"))?;
-    std::fs::create_dir_all(cache_dir)?;
-    let init_script = cache_dir.join("openidea-model.gradle");
-    std::fs::write(&init_script, MODEL_INIT_SCRIPT)?;
-    let mut args: Vec<String> = vec![
-        "--console=plain".into(),
-        "-q".into(),
-        "--init-script".into(),
-        init_script.to_string_lossy().into_owned(),
-        "tasks".into(),
-        "--all".into(),
-    ];
+    let model = gradle::load(root).ok_or_else(|| IdeError::not_found("no Gradle build in this project"))?;
+    let mut args: Vec<String> = vec!["--console=plain".into(), "-q".into(), "tasks".into(), "--all".into()];
     if options.offline {
         args.push("--offline".into());
     }
     progress(SyncProgress { message: "Loading Gradle tasks".into(), fraction: None });
-    let out = run(
-        options.gradle_command.as_deref().unwrap_or(&model.command),
-        &args,
-        &root.join(&model.dir),
-        &options.env,
-        cancel,
-        |_| {},
-    )?;
-    let projects = if out.success { parse_reported_projects(&out.text) } else { Vec::new() };
-    // Hash the build files of the reported projects, or the model is stale right after the sync.
-    gradle::merge_reported_projects(root, &mut model, &projects);
+    let out = run(&model.command, &args, &root.join(&model.dir), &options.env, cancel, |_| {})?;
     let cache = GradleCache {
-        hash: hash_gradle_files(&gradle::build_files(root, &model)),
+        hash: hash_files(&gradle::build_files(root, &model)),
         at_ms: now_ms(),
         error: (!out.success).then(|| error_summary(&out.text)),
         tasks: if out.success { gradle::parse_tasks(&out.text) } else { Vec::new() },
-        projects,
     };
     write_cache(cache_dir, GRADLE_CACHE, &cache)
 }
@@ -411,29 +280,6 @@ pub fn sync_gradle(
 mod tests {
     use super::*;
 
-    #[cfg(unix)]
-    #[test]
-    fn gradle_sync_uses_resolved_command_and_environment() {
-        use std::os::unix::fs::PermissionsExt;
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path();
-        std::fs::write(root.join("build.gradle"), "").unwrap();
-        let launcher = root.join("configured-gradle");
-        std::fs::write(&launcher, "#!/bin/sh\nprintf '%s\\n' \"$JAVA_HOME\" \"$GRADLE_USER_HOME\" > actual-env\n")
-            .unwrap();
-        std::fs::set_permissions(&launcher, std::fs::Permissions::from_mode(0o755)).unwrap();
-        let options = SyncOptions {
-            gradle_command: Some(launcher.to_string_lossy().into_owned()),
-            env: BTreeMap::from([
-                ("JAVA_HOME".into(), "/jdk21".into()),
-                ("GRADLE_USER_HOME".into(), "/gradle-cache".into()),
-            ]),
-            ..Default::default()
-        };
-        sync_gradle(root, &root.join("cache"), &options, &CancellationToken::new(), &|_| {}).unwrap();
-        assert_eq!(std::fs::read_to_string(root.join("actual-env")).unwrap(), "/jdk21\n/gradle-cache\n");
-    }
-
     #[test]
     fn caches_merge_and_go_stale() {
         let tmp = tempfile::tempdir().unwrap();
@@ -445,7 +291,6 @@ mod tests {
         let mut model = maven::load_with_repo(&root, None);
         assert!(model.synced_at.is_none());
         let cache = MavenCache {
-            version: MAVEN_CACHE_VERSION,
             hash: hash_files(&maven::build_files(&root, &model)),
             at_ms: 5.0,
             error: None,
@@ -457,7 +302,6 @@ mod tests {
                     "maven-clean-plugin",
                     Some("3.2.0".into()),
                     &[],
-                    None,
                 )],
                 dependencies: vec![MavenDependency { artifact_id: "dep".into(), ..MavenDependency::default() }],
             }],
@@ -471,138 +315,12 @@ mod tests {
 
         std::fs::write(
             root.join("pom.xml"),
-            "<project><groupId>g</groupId><artifactId>a</artifactId><version>2</version>\
-             <dependencies><dependency><groupId>g</groupId><artifactId>fresh</artifactId><version>1</version></dependency></dependencies>\
-             </project>",
+            "<project><groupId>g</groupId><artifactId>a</artifactId><version>2</version></project>",
         )
         .unwrap();
         let mut model = maven::load_with_repo(&root, None);
         apply_maven_cache(&root, &cache_dir, &mut model);
         assert!(model.stale);
-        // The POM changed: the stale effective dependencies must not hide the new one (#249).
-        assert_eq!(model.projects[0].dependencies[0].artifact_id, "fresh");
-    }
-
-    #[test]
-    fn a_cache_from_an_older_ide_is_ignored() {
-        let tmp = tempfile::tempdir().unwrap();
-        let root = tmp.path().join("p");
-        let cache_dir = tmp.path().join("cache");
-        std::fs::create_dir_all(&root).unwrap();
-        std::fs::write(root.join("pom.xml"), "<project><groupId>g</groupId><artifactId>a</artifactId></project>")
-            .unwrap();
-        let mut model = maven::load_with_repo(&root, None);
-        let cache = MavenCache {
-            // What an older build wrote: no plugin descriptors were read back then, so
-            // its goal lists would shadow the ones the model now knows.
-            version: 0,
-            hash: hash_files(&maven::build_files(&root, &model)),
-            at_ms: 5.0,
-            error: None,
-            verbose: true,
-            projects: vec![CachedMavenProject {
-                key: "g:a".into(),
-                plugins: vec![maven::plugin(
-                    "org.apache.maven.plugins",
-                    "maven-clean-plugin",
-                    Some("3.2.0".into()),
-                    &[],
-                    None,
-                )],
-                dependencies: vec![MavenDependency { artifact_id: "cached".into(), ..MavenDependency::default() }],
-            }],
-        };
-        write_cache(&cache_dir, MAVEN_CACHE, &cache).unwrap();
-        apply_maven_cache(&root, &cache_dir, &mut model);
-        assert!(model.synced_at.is_none(), "the cache is dropped, the model stays unsynced");
-        assert!(model.projects[0].dependencies.iter().all(|d| d.artifact_id != "cached"));
-    }
-
-    #[test]
-    fn gradle_reported_projects_replace_static_ones() {
-        let tmp = tempfile::tempdir().unwrap();
-        let ws = dunce::canonicalize(tmp.path()).unwrap();
-        let root = ws.join("app");
-        let billing = ws.join("billing");
-        std::fs::create_dir_all(root.join("shared")).unwrap();
-        std::fs::create_dir_all(billing.join("modules/core")).unwrap();
-        // Computed includes: nothing a static reading can see.
-        std::fs::write(root.join("settings.gradle"), "rootProject.name = 'Shop'\n['billing'].each { includeFlat it }")
-            .unwrap();
-        std::fs::write(billing.join("modules/core/build.gradle"), "apply plugin: 'java'").unwrap();
-        // Built with serde: a Windows path holds backslashes, which raw JSON text would leave unescaped.
-        let line = |p: ReportedProject| format!("@openidea-model\t{}\n", serde_json::to_string(&p).unwrap());
-        let (r, b) = (root.display().to_string(), billing.display().to_string());
-        let core_src = |p: &str| format!("{b}/modules/core/src/{p}");
-        let set = |name: &str, test: bool, src: &[&str], res: &[&str]| gradle::ReportedSourceSet {
-            name: name.into(),
-            test,
-            src: src.iter().map(|p| core_src(p)).collect(),
-            res: res.iter().map(|p| core_src(p)).collect(),
-        };
-        // A settings script's own println comes first; task listing lines follow.
-        let out = format!(
-            "configuring billing\n{}{}{}@openidea-model\t{{broken\n\nOther tasks\n-----------\nbilling:core:jar\n",
-            line(ReportedProject { path: ":".into(), dir: r.clone(), ..ReportedProject::default() }),
-            line(ReportedProject {
-                path: ":billing".into(),
-                dir: b.clone(),
-                java: Some(17),
-                ..ReportedProject::default()
-            }),
-            line(ReportedProject {
-                path: ":billing:core".into(),
-                dir: format!("{b}/modules/core"),
-                java: Some(21),
-                source_sets: vec![
-                    set("main", false, &["main/java"], &["main/resources"]),
-                    set("test", true, &["main/java", "test/java"], &[]),
-                ],
-                ..ReportedProject::default()
-            }),
-        );
-        let projects = parse_reported_projects(&out);
-        assert_eq!(projects.len(), 3, "the malformed line is skipped");
-        let src = |p: &str| PathBuf::from(core_src(p));
-        assert_eq!(
-            gradle::reported_source_roots(&projects),
-            [
-                (src("main/java"), gradle::ReportedRoot::Source),
-                (src("main/resources"), gradle::ReportedRoot::Resources),
-                (src("test/java"), gradle::ReportedRoot::Test),
-            ]
-        );
-        let mut model = gradle::load(&root).unwrap();
-        assert_eq!(model.projects.len(), 1);
-        gradle::merge_reported_projects(&root, &mut model, &projects);
-        let paths: Vec<_> = model.projects.iter().map(|p| (p.path.as_str(), p.name.as_str())).collect();
-        assert_eq!(paths, [(":", "Shop"), (":billing", "billing"), (":billing:core", "core")]);
-        assert_eq!(model.projects[0].dir, "");
-        assert!(root.join(model.projects[2].build_file.as_ref().unwrap()).is_file());
-        assert_eq!(
-            gradle::external_roots(&root, model.projects.iter().map(|p| p.dir.as_str())),
-            std::slice::from_ref(&billing)
-        );
-        assert_eq!(model.java_version, Some(21), "the newest version any module needs");
-        assert_eq!(
-            gradle::parse_tasks(&out),
-            [(":billing:core".into(), GradleTask { name: "jar".into(), group: "other".into(), description: None })]
-        );
-
-        // The cached projects are parsed once per change of the cache file.
-        let cache_dir = ws.join("cache");
-        let write = |projects: &[ReportedProject]| {
-            let cache = GradleCache { projects: projects.to_vec(), ..GradleCache::default() };
-            write_cache(&cache_dir, GRADLE_CACHE, &cache).unwrap();
-        };
-        write(&projects);
-        let first = reported_gradle_projects(&cache_dir);
-        assert!(Arc::ptr_eq(&first, &reported_gradle_projects(&cache_dir)), "unchanged: not parsed again");
-        assert_eq!(crate::gradle_external_roots(&root, &cache_dir), [billing]);
-        write(&projects[..1]);
-        assert_eq!(reported_gradle_projects(&cache_dir).len(), 1, "a new sync is read");
-        std::fs::remove_file(cache_dir.join(GRADLE_CACHE)).unwrap();
-        assert!(reported_gradle_projects(&cache_dir).is_empty());
     }
 
     #[test]
@@ -615,39 +333,16 @@ mod tests {
         std::fs::write(root.join("app/build.gradle"), "apply plugin: 'java'").unwrap();
         let mut model = gradle::load(&root).unwrap();
         let cache = GradleCache {
-            hash: hash_gradle_files(&gradle::build_files(&root, &model)),
+            hash: hash_files(&gradle::build_files(&root, &model)),
             at_ms: 1.0,
             error: None,
             tasks: vec![(":app".into(), GradleTask { name: "hello".into(), group: "demo".into(), description: None })],
-            projects: [":", ":app"]
-                .iter()
-                .zip([root.clone(), root.join("app")])
-                .map(|(path, dir)| ReportedProject {
-                    path: (*path).into(),
-                    dir: dir.to_string_lossy().into_owned(),
-                    ..Default::default()
-                })
-                .collect(),
         };
         write_cache(&cache_dir, GRADLE_CACHE, &cache).unwrap();
         apply_gradle_cache(&root, &cache_dir, &mut model);
         assert_eq!(model.projects[1].tasks.len(), 1);
         assert!(model.projects[0].tasks.iter().any(|t| t.name == "wrapper"), "root keeps its defaults");
         assert!(!model.stale);
-
-        let stale_after = |script: &str| {
-            std::fs::write(root.join("app/build.gradle"), script).unwrap();
-            let mut m = gradle::load(&root).unwrap();
-            apply_gradle_cache(&root, &cache_dir, &mut m);
-            m.stale
-        };
-        assert!(!stale_after("// a note\napply   plugin: 'java'\n"), "comments and spacing don't count");
-        assert!(stale_after("apply plugin: 'groovy'"));
-        std::fs::write(root.join("app/build.gradle"), "apply plugin: 'java'").unwrap();
-        std::fs::write(root.join("gradle.properties"), "org.gradle.jvmargs=-Xmx2g").unwrap();
-        let mut m = gradle::load(&root).unwrap();
-        apply_gradle_cache(&root, &cache_dir, &mut m);
-        assert!(m.stale, "gradle.properties is watched");
     }
 
     #[test]

crates/ide-build/src/web.rs

@@ -1,268 +0,0 @@
-//! WAR modules and build-tool-owned archive resolution (including custom output names).
-use crate::BuildModel;
-use ide_core::{CancellationToken, IdeError, IdeResult};
-use serde::{Deserialize, Serialize};
-use specta::Type;
-use std::{collections::BTreeMap, fs, path::Path};
-
-#[derive(Clone, Debug, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct WebArtifact {
-    pub id: String,
-    pub name: String,
-    pub module: String,
-    pub tool: String,
-}
-
-pub fn artifacts(root: &Path, model: &BuildModel) -> Vec<WebArtifact> {
-    let mut out = Vec::new();
-    if let Some(maven) = &model.maven {
-        for p in maven.projects.iter().filter(|p| p.packaging == "war") {
-            out.push(WebArtifact {
-                id: format!("maven:{}", p.pom),
-                name: p.artifact_id.clone(),
-                module: p.dir.clone(),
-                tool: "maven".into(),
-            });
-        }
-    }
-    if let Some(gradle) = &model.gradle {
-        for p in &gradle.projects {
-            let script = p.build_file.as_ref().and_then(|f| fs::read_to_string(root.join(f)).ok()).unwrap_or_default();
-            if p.tasks.iter().any(|t| t.name == "war") || crate::gradle::has_war_plugin(&script) {
-                out.push(WebArtifact {
-                    id: format!("gradle:{}", p.path),
-                    name: p.name.clone(),
-                    module: p.dir.clone(),
-                    tool: "gradle".into(),
-                });
-            }
-        }
-    }
-    out
-}
-
-pub struct WebBuild {
-    pub command: String,
-    pub args: Vec<String>,
-    pub cwd: String,
-    pub env: BTreeMap<String, String>,
-    maven_project: Option<(Vec<String>, std::path::PathBuf)>,
-}
-
-impl WebBuild {
-    /// Resolve the selected module's effective identity using the build's options and environment.
-    /// Runs off the UI thread, before launching the reactor build.
-    pub fn resolve_project(
-        &mut self,
-        root: &Path,
-        env: &BTreeMap<String, String>,
-        cancel: &CancellationToken,
-    ) -> IdeResult<()> {
-        let Some((args, output)) = &self.maven_project else {
-            return Ok(());
-        };
-        if output.exists() {
-            fs::remove_file(output)?;
-        }
-        let cwd = root.join(&self.cwd).canonicalize()?;
-        let mut env = env.clone();
-        if !env.iter().any(|(k, v)| k.eq_ignore_ascii_case("MAVEN_BASEDIR") && !v.is_empty()) {
-            // -f changes Maven's .mvn search origin; keep the reactor's launcher settings.
-            let base = cwd.ancestors().find(|p| p.join(".mvn").is_dir()).unwrap_or(&cwd);
-            env.retain(|k, _| !k.eq_ignore_ascii_case("MAVEN_BASEDIR"));
-            env.insert("MAVEN_BASEDIR".into(), base.to_string_lossy().into_owned());
-        }
-        let result = crate::process::run_with_env(&self.command, args, &cwd, &env, true, cancel, |_, _| {})?;
-        if !result.success {
-            return Err(IdeError::invalid(format!("Cannot resolve Maven WAR artifact: {}", result.text.trim())));
-        }
-        let id = fs::read_to_string(output)?;
-        let parts: Vec<_> = id.trim().split(':').collect();
-        if parts.len() != 4 || parts[2] != "war" || parts.iter().any(|s| s.is_empty()) {
-            return Err(IdeError::invalid(format!("Cannot resolve Maven WAR artifact: {}", id.trim())));
-        }
-        let project = format!("{}:{}:{}", parts[0], parts[1], parts[3]);
-        self.args.push(format!("-Dexpression=session.projectMap({project}).artifact.file"));
-        self.maven_project = None;
-        Ok(())
-    }
-}
-
-fn groovy_literal(s: &str) -> String {
-    format!("'{}'", s.replace('\\', "\\\\").replace('\'', "\\'"))
-}
-
-pub fn build(root: &Path, model: &BuildModel, id: &str, cache: &Path) -> IdeResult<WebBuild> {
-    fs::create_dir_all(cache)?;
-    let manifest = cache.join("artifact-path.txt");
-    // A failed build must never silently reuse an older archive manifest.
-    if manifest.exists() {
-        fs::remove_file(&manifest)?;
-    }
-    fs::write(cache.join("artifact-id.txt"), id)?;
-    if let Some(pom) = id.strip_prefix("maven:") {
-        let p = model
-            .maven
-            .as_ref()
-            .and_then(|m| m.projects.iter().find(|p| p.pom == pom && p.packaging == "war"))
-            .ok_or_else(|| IdeError::invalid("Choose a Maven WAR module"))?;
-        let projects = &model.maven.as_ref().unwrap().projects;
-        let top = projects
-            .iter()
-            .filter(|t| {
-                !t.aggregated && (t.dir.is_empty() || p.dir == t.dir || p.dir.starts_with(&format!("{}/", t.dir)))
-            })
-            .max_by_key(|t| t.dir.len())
-            .unwrap_or(p);
-        let mut args = top.options.clone();
-        if top.pom != p.pom {
-            let module = root
-                .join(&p.dir)
-                .strip_prefix(root.join(&top.dir))
-                .map_err(|e| IdeError::invalid(e.to_string()))?
-                .to_string_lossy()
-                .replace('\\', "/");
-            args.extend(["-pl".into(), module, "-am".into()]);
-        }
-        // help:evaluate runs once, in the reactor's first project. Query the selected
-        // POM's effective identity first; profiles and -D options can change its GAV.
-        let output = cache.join("artifact-project.txt");
-        let mut probe = top.options.clone();
-        probe.extend([
-            "-f".into(),
-            root.join(&p.pom).to_string_lossy().into_owned(),
-            "help:evaluate".into(),
-            "-Dexpression=project.id".into(),
-            format!("-Doutput={}", output.display()),
-        ]);
-        args.extend([
-            "-DskipTests".into(),
-            "package".into(),
-            "help:evaluate".into(),
-            format!("-Doutput={}", manifest.display()),
-        ]);
-        return Ok(WebBuild {
-            command: top.command.clone(),
-            args,
-            cwd: top.dir.clone(),
-            env: p.env.clone(),
-            maven_project: Some((probe, output)),
-        });
-    }
-    if let Some(path) = id.strip_prefix("gradle:") {
-        let g = model.gradle.as_ref().ok_or_else(|| IdeError::invalid("Choose a Gradle WAR module"))?;
-        if !artifacts(root, model).iter().any(|a| a.id == id) {
-            return Err(IdeError::invalid("Choose a Gradle WAR module"));
-        }
-        let script = cache.join("war.init.gradle");
-        fs::write(
-            &script,
-            format!(
-                r#"gradle.projectsEvaluated {{
-    def p = gradle.rootProject.project({})
-    def warTask = p.tasks.named('war')
-    p.tasks.register('openideaTomcatArtifact') {{
-        dependsOn warTask
-        doLast {{ new File({}).setText(warTask.get().archiveFile.get().asFile.absolutePath, 'UTF-8') }}
-    }}
-}}
-"#,
-                groovy_literal(path),
-                groovy_literal(&manifest.to_string_lossy())
-            ),
-        )?;
-        let task = format!("{}:openideaTomcatArtifact", path.trim_end_matches(':'));
-        return Ok(WebBuild {
-            command: g.command.clone(),
-            args: vec!["--init-script".into(), script.to_string_lossy().into_owned(), task],
-            cwd: g.dir.clone(),
-            env: g.env.clone(),
-            maven_project: None,
-        });
-    }
-    Err(IdeError::invalid("Choose a WAR artifact"))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    #[test]
-    fn maven_war_modules_use_resolved_artifact_file() {
-        let tmp = tempfile::tempdir().unwrap();
-        fs::write(tmp.path().join("pom.xml"), "<project><modelVersion>4.0.0</modelVersion><groupId>test</groupId><artifactId>web</artifactId><version>1</version><packaging>war</packaging><build><directory>custom</directory><finalName>renamed</finalName></build></project>").unwrap();
-        let model = crate::load(tmp.path(), &tmp.path().join("cache"), None);
-        let a = artifacts(tmp.path(), &model);
-        assert_eq!(a.len(), 1);
-        assert_eq!(a[0].name, "web");
-        let plan = build(tmp.path(), &model, &a[0].id, &tmp.path().join("base with spaces")).unwrap();
-        let (probe, _) = plan.maven_project.as_ref().unwrap();
-        assert!(probe.contains(&"-Dexpression=project.id".into()));
-        assert!(probe.contains(&tmp.path().join("pom.xml").to_string_lossy().into_owned()));
-        assert!(
-            plan.args.iter().any(|a| a.ends_with("base with spaces/artifact-path.txt")
-                || a.ends_with("base with spaces\\artifact-path.txt"))
-        );
-    }
-    #[test]
-    fn maven_module_build_includes_reactor_dependencies() {
-        let tmp = tempfile::tempdir().unwrap();
-        fs::create_dir_all(tmp.path().join("web")).unwrap();
-        fs::write(tmp.path().join("pom.xml"), "<project><groupId>test</groupId><artifactId>parent</artifactId><version>1</version><packaging>pom</packaging><modules><module>web</module></modules></project>").unwrap();
-        fs::write(tmp.path().join("web/pom.xml"), "<project><parent><groupId>test</groupId><artifactId>parent</artifactId><version>1</version></parent><artifactId>web</artifactId><packaging>war</packaging></project>").unwrap();
-        let model = crate::load(tmp.path(), &tmp.path().join("cache"), None);
-        let plan = build(tmp.path(), &model, "maven:web/pom.xml", &tmp.path().join("base")).unwrap();
-        assert_eq!(plan.cwd, "");
-        assert_eq!(&plan.args[..3], &["-pl", "web", "-am"]);
-        assert!(
-            plan.maven_project
-                .as_ref()
-                .unwrap()
-                .0
-                .contains(&tmp.path().join("web/pom.xml").to_string_lossy().into_owned())
-        );
-    }
-    #[test]
-    fn gradle_war_uses_archive_provider_and_ignores_comments() {
-        let tmp = tempfile::tempdir().unwrap();
-        fs::write(
-            tmp.path().join("build.gradle.kts"),
-            "plugins { war }\ntasks.war { archiveFileName.set(\"custom.war\") }",
-        )
-        .unwrap();
-        let model = crate::load(tmp.path(), &tmp.path().join("cache"), None);
-        let a = artifacts(tmp.path(), &model);
-        assert_eq!(a.len(), 1);
-        let plan = build(tmp.path(), &model, &a[0].id, &tmp.path().join("base")).unwrap();
-        assert!(plan.args.contains(&":openideaTomcatArtifact".into()));
-        assert!(fs::read_to_string(tmp.path().join("base/war.init.gradle")).unwrap().contains("archiveFile.get()"));
-        assert!(!crate::gradle::has_war_plugin("// plugins { war }"));
-    }
-
-    #[test]
-    fn gradle_manifest_paths_preserve_windows_characters() {
-        for path in [r"C:\工作 区\Tomcat's cache\artifact-path.txt", r"\\server\share\artifact-path.txt"] {
-            let literal = groovy_literal(path);
-            assert_eq!(literal[1..literal.len() - 1].replace("\\'", "'").replace("\\\\", "\\"), path);
-        }
-    }
-
-    #[test]
-    fn gradle_root_and_nested_modules_write_utf8_archive_paths() {
-        for module in [":", ":apps:timesheet"] {
-            let tmp = tempfile::tempdir().unwrap();
-            let dir = if module == ":" { "" } else { "apps/timesheet" };
-            fs::create_dir_all(tmp.path().join(dir)).unwrap();
-            fs::write(tmp.path().join("settings.gradle"), "rootProject.name = 'timesheet'\ninclude 'apps:timesheet'")
-                .unwrap();
-            fs::write(tmp.path().join(dir).join("build.gradle"), "plugins { id 'war' }").unwrap();
-            let model = crate::load(tmp.path(), &tmp.path().join("cache"), None);
-            let cache = tmp.path().join("工作 cache");
-            let plan = build(tmp.path(), &model, &format!("gradle:{module}"), &cache).unwrap();
-            assert!(plan.args.contains(&format!("{}:openideaTomcatArtifact", module.trim_end_matches(':'))));
-            let script = fs::read_to_string(cache.join("war.init.gradle")).unwrap();
-            assert!(script.contains(&format!("rootProject.project('{}')", module)));
-            assert!(script.contains("archiveFile.get().asFile.absolutePath, 'UTF-8'"));
-        }
-    }
-}

crates/ide-clipboard/src/lib.rs

@@ -1,8 +1,6 @@
 //! The file list on the OS clipboard: what Explorer copies when the user
 //! copies files, so the project view can paste them, and what the project view
-//! writes so Explorer can paste the files it copied (IDEA does both). The
-//! written list comes with the paths as text, so a paste into an editor
-//! inserts them instead of doing nothing.
+//! writes so Explorer can paste the files it copied (IDEA does both).
 //!
 //! Windows keeps it as `CF_HDROP`: a `DROPFILES` header and a double-NUL
 //! terminated list of absolute paths, wide when `fWide` is set. The data is set
@@ -12,9 +10,6 @@
 //! macOS keeps one `public.file-url` item per file on the general
 //! `NSPasteboard`; `NSURL` reads and writes them, so Finder's copies paste here
 //! and ours paste in Finder.
-//! On macOS, [`files`], [`has_files`] and [`set_files`] must run on the main
-//! thread: AppKit and WebKit also access the general pasteboard there, and its
-//! mutable type cache cannot be protected by a mutex in this crate.
 //!
 //! Other platforms (`text/uri-list` on X11) are not wired up: [`files`] is
 //! empty and [`set_files`] fails there.
@@ -25,8 +20,7 @@ use std::path::PathBuf;
 const HEADER: usize = 20;
 
 /// The absolute paths on the clipboard, empty when it holds no file list.
-/// Read failures remain errors so callers can retain an internal copy.
-pub fn files() -> std::io::Result<Vec<PathBuf>> {
+pub fn files() -> Vec<PathBuf> {
     imp::files()
 }
 
@@ -35,8 +29,9 @@ pub fn has_files() -> bool {
     imp::has_files()
 }
 
-/// Replaces the clipboard with `paths`. True only when the file list was
-/// accepted; writing just the accompanying text is not a successful hand-off.
+/// Replaces the clipboard with `paths`. False when it is busy or holds nothing
+/// to write; the clipboard is a shared resource, so callers treat this as
+/// best-effort.
 pub fn set_files(paths: &[PathBuf]) -> bool {
     if paths.is_empty() {
         return false;
@@ -116,8 +111,6 @@ mod imp {
 
     /// `CF_HDROP`, the clipboard format holding a file list.
     const CF_HDROP: u32 = 15;
-    /// `CF_UNICODETEXT`, so an editor paste of copied files inserts the paths.
-    const CF_UNICODETEXT: u32 = 13;
 
     /// An `HGLOBAL` or a `HANDLE`: both are opaque pointers here.
     type Handle = *mut c_void;
@@ -163,29 +156,25 @@ mod imp {
         (unsafe { IsClipboardFormatAvailable(CF_HDROP) }) != 0
     }
 
-    pub fn files() -> std::io::Result<Vec<PathBuf>> {
-        if !open() {
-            return Err(std::io::Error::last_os_error());
-        }
-        if !has_files() {
-            unsafe { CloseClipboard() };
-            return Ok(Vec::new());
+    pub fn files() -> Vec<PathBuf> {
+        if !has_files() || !open() {
+            return Vec::new();
         }
         let memory = unsafe { GetClipboardData(CF_HDROP) };
         let paths = if memory.is_null() {
-            Err(std::io::Error::last_os_error())
+            Vec::new()
         } else {
             // SAFETY: the clipboard keeps the block alive while it is open, and
             // `GlobalSize` bounds the bytes read from it.
             unsafe {
                 let data = GlobalLock(memory);
                 if data.is_null() {
-                    Err(std::io::Error::last_os_error())
+                    Vec::new()
                 } else {
                     let bytes = std::slice::from_raw_parts(data as *const u8, GlobalSize(memory));
                     let paths = decode(bytes);
                     GlobalUnlock(memory);
-                    Ok(paths)
+                    paths
                 }
             }
         };
@@ -193,37 +182,12 @@ mod imp {
         paths
     }
 
-    /// An `HGLOBAL` holding `text` as UTF-16 with a terminating NUL, and its
-    /// byte size. Null when the allocation failed.
-    fn global_text(text: &str) -> (Handle, usize) {
-        let mut units: Vec<u16> = text.encode_utf16().collect();
-        units.push(0);
-        let bytes = units.len() * 2;
-        unsafe {
-            let memory = GlobalAlloc(GMEM_MOVEABLE, bytes);
-            if memory.is_null() {
-                return (ptr::null_mut(), 0);
-            }
-            let data = GlobalLock(memory);
-            if data.is_null() {
-                GlobalFree(memory);
-                return (ptr::null_mut(), 0);
-            }
-            ptr::copy_nonoverlapping(units.as_ptr() as *const u8, data as *mut u8, bytes);
-            GlobalUnlock(memory);
-            (memory, bytes)
-        }
-    }
-
     pub fn set_files(paths: &[PathBuf]) -> bool {
         let bytes = encode(paths);
         if bytes.len() <= HEADER {
             return false;
         }
-        // The paths as text, newline-separated, so pasting into an editor
-        // inserts them (IDEA writes the list and the text together).
-        let text = paths.iter().map(|p| p.to_string_lossy().into_owned()).collect::<Vec<_>>().join("\r\n");
-        // SAFETY: the blocks are allocated, filled, handed to the clipboard and
+        // SAFETY: the block is allocated, filled, handed to the clipboard and
         // freed only on the paths where the clipboard did not take ownership.
         unsafe {
             let memory = GlobalAlloc(GMEM_MOVEABLE, bytes.len());
@@ -241,26 +205,17 @@ mod imp {
                 GlobalFree(memory);
                 return false;
             }
-            // Replacing the list also drops the text the user copied before;
-            // the paths' own text is set back with it.
+            // Replacing the list also drops the text the user copied before.
             if EmptyClipboard() == 0 {
                 CloseClipboard();
                 GlobalFree(memory);
                 return false;
             }
             let taken = !SetClipboardData(CF_HDROP, memory).is_null();
+            CloseClipboard();
             if !taken {
                 GlobalFree(memory);
             }
-            let (text_memory, _) = global_text(&text);
-            if !text_memory.is_null() {
-                // The text alone still pastes somewhere useful.
-                let text_taken = !SetClipboardData(CF_UNICODETEXT, text_memory).is_null();
-                if !text_taken {
-                    GlobalFree(text_memory);
-                }
-            }
-            CloseClipboard();
             taken
         }
     }
@@ -268,14 +223,13 @@ mod imp {
 
 #[cfg(target_os = "macos")]
 mod imp {
+    use objc2::ClassType;
     use objc2::rc::{Retained, autoreleasepool};
     use objc2::runtime::{AnyClass, AnyObject, ProtocolObject};
-    use objc2::{ClassType, MainThreadMarker};
     use objc2_app_kit::{
-        NSPasteboard, NSPasteboardReadingOptionKey, NSPasteboardTypeString, NSPasteboardURLReadingFileURLsOnlyKey,
-        NSPasteboardWriting,
+        NSPasteboard, NSPasteboardReadingOptionKey, NSPasteboardURLReadingFileURLsOnlyKey, NSPasteboardWriting,
     };
-    use objc2_foundation::{NSArray, NSDictionary, NSNumber, NSString, NSURL};
+    use objc2_foundation::{NSArray, NSDictionary, NSNumber, NSURL};
     use std::path::PathBuf;
 
     /// `NSURL` as the one class to read, limited to file URLs: a web link the
@@ -283,7 +237,6 @@ mod imp {
     fn read_file_urls<R>(
         f: impl FnOnce(&NSPasteboard, &NSArray<AnyClass>, &NSDictionary<NSPasteboardReadingOptionKey, AnyObject>) -> R,
     ) -> R {
-        debug_assert!(MainThreadMarker::new().is_some(), "NSPasteboard access requires the main thread");
         autoreleasepool(|_| {
             let board = NSPasteboard::generalPasteboard();
             let classes = NSArray::from_slice(&[NSURL::class()]);
@@ -303,28 +256,23 @@ mod imp {
         })
     }
 
-    pub fn files() -> std::io::Result<Vec<PathBuf>> {
+    pub fn files() -> Vec<PathBuf> {
         read_file_urls(|board, classes, options| {
             // SAFETY: as in `has_files`; every object read for `NSURL` is one.
             let Some(objects) = (unsafe { board.readObjectsForClasses_options(classes, Some(options)) }) else {
-                return if unsafe { board.canReadObjectForClasses_options(classes, Some(options)) } {
-                    Err(std::io::Error::other("Cannot read clipboard files"))
-                } else {
-                    Ok(Vec::new())
-                };
+                return Vec::new();
             };
-            Ok(objects
+            objects
                 .iter()
                 .filter_map(|object| object.downcast::<NSURL>().ok())
                 .filter_map(|url| url.to_file_path())
                 // Finder ends a folder's URL in `/`; the project view names it without.
                 .map(|path| path.components().collect())
-                .collect())
+                .collect()
         })
     }
 
     pub fn set_files(paths: &[PathBuf]) -> bool {
-        debug_assert!(MainThreadMarker::new().is_some(), "NSPasteboard access requires the main thread");
         autoreleasepool(|_| {
             // Folders get a directory URL (ending in `/`), as Finder writes them.
             let urls: Vec<Retained<NSURL>> = paths
@@ -337,16 +285,9 @@ mod imp {
             let writers: Vec<&ProtocolObject<dyn NSPasteboardWriting>> =
                 urls.iter().map(|url| ProtocolObject::from_ref(&**url)).collect();
             let board = NSPasteboard::generalPasteboard();
-            // Replacing the list also drops the text the user copied before;
-            // the paths' own text is set back with it, so an editor paste
-            // inserts them (IDEA writes the list and the text together).
+            // Replacing the list also drops the text the user copied before.
             board.clearContents();
-            let written = board.writeObjects(&NSArray::from_slice(&writers));
-            let text = NSString::from_str(
-                &paths.iter().map(|p| p.to_string_lossy().into_owned()).collect::<Vec<_>>().join("\n"),
-            );
-            board.setString_forType(&text, unsafe { NSPasteboardTypeString });
-            written
+            board.writeObjects(&NSArray::from_slice(&writers))
         })
     }
 }
@@ -359,8 +300,8 @@ mod imp {
         false
     }
 
-    pub fn files() -> std::io::Result<Vec<PathBuf>> {
-        Ok(Vec::new())
+    pub fn files() -> Vec<PathBuf> {
+        Vec::new()
     }
 
     pub fn set_files(_paths: &[PathBuf]) -> bool {

crates/ide-core/Cargo.toml

@@ -7,7 +7,6 @@ license.workspace = true
 
 [dependencies]
 dunce.workspace = true
-encoding_rs.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 specta.workspace = true
@@ -17,9 +16,3 @@ tokio-util.workspace = true
 
 [dev-dependencies]
 tempfile.workspace = true
-
-[target.'cfg(unix)'.dependencies]
-libc = "0.2"
-
-[target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.61", features = ["Win32_Globalization", "Win32_Security", "Win32_System_Registry", "Win32_Foundation"] }

crates/ide-core/src/editor_settings.rs

@@ -12,8 +12,6 @@ use std::collections::BTreeMap;
 pub struct EditorGeneralSettings {
     /// Change font size with ⌘ + mouse wheel.
     pub wheel_zoom: bool,
-    pub markdown_image_folder: String,
-    pub markdown_image_name_pattern: String,
     /// Drag-and-drop of selected text inside the editor.
     pub drag_and_drop: bool,
     /// When the caret moves out of view: `minimize` scrolling | `center` the caret line.
@@ -37,8 +35,6 @@ impl Default for EditorGeneralSettings {
     fn default() -> Self {
         Self {
             wheel_zoom: false,
-            markdown_image_folder: "assets".into(),
-            markdown_image_name_pattern: "image-{timestamp}".into(),
             drag_and_drop: true,
             caret_scroll: "minimize".into(),
             soft_wrap_files: "*.md; *.txt; *.rst; *.adoc".into(),
@@ -371,12 +367,6 @@ pub struct TextAttributesOverride {
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct LanguageCodeStyle {
-    /// Java formatter: `default` | `intellij` | `custom` (other languages ignore it).
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub formatter: Option<String>,
-    /// Eclipse formatter XML; relative paths start at the project root.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub formatter_path: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub use_tab: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -444,8 +434,6 @@ pub struct EncodingSettings {
     pub project: String,
     /// Fallback for `.properties` files.
     pub properties: String,
-    /// Display properties Unicode escapes as characters and save non-ASCII as escapes.
-    pub native_to_ascii: bool,
     /// Create UTF-8 files: `never` (no BOM) | `always` (with BOM) | `windows` (with BOM on Windows).
     pub utf8_bom: String,
 }
@@ -456,7 +444,6 @@ impl Default for EncodingSettings {
             global: "utf-8".into(),
             project: "utf-8".into(),
             properties: "iso-8859-1".into(),
-            native_to_ascii: false,
             utf8_bom: "never".into(),
         }
     }

crates/ide-core/src/error.rs

@@ -12,15 +12,6 @@ pub type IdeResult<T> = Result<T, IdeError>;
 pub struct IdeError {
     pub kind: ErrorKind,
     pub message: String,
-    /// Structured detail for errors the UI acts on; `null` for plain errors.
-    #[specta(optional)]
-    pub data: Option<ErrorData>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(tag = "type", rename_all = "camelCase")]
-pub enum ErrorData {
-    Tool { tool: String, missing: bool },
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
@@ -33,7 +24,6 @@ pub enum ErrorKind {
     /// Document version mismatch; the UI must resync the full text.
     OutOfSync,
     Cancelled,
-    TimedOut,
     /// A required external tool (language server, git, debugger) is unavailable.
     Unavailable,
     Io,
@@ -43,21 +33,7 @@ pub enum ErrorKind {
 
 impl IdeError {
     pub fn new(kind: ErrorKind, message: impl Into<String>) -> Self {
-        Self { kind, message: message.into(), data: None }
-    }
-    pub fn with_tool(mut self, tool: impl Into<String>) -> Self {
-        if self.data.is_none() {
-            self.data = Some(ErrorData::Tool { tool: tool.into(), missing: false });
-        }
-        self
-    }
-    pub fn missing_tool(tool: impl Into<String>) -> Self {
-        let tool = tool.into();
-        Self {
-            kind: ErrorKind::NotFound,
-            message: format!("{tool} is not installed"),
-            data: Some(ErrorData::Tool { tool, missing: true }),
-        }
+        Self { kind, message: message.into() }
     }
     pub fn not_found(m: impl Into<String>) -> Self {
         Self::new(ErrorKind::NotFound, m)
@@ -89,30 +65,3 @@ impl From<std::io::Error> for IdeError {
         Self::new(kind, e.to_string())
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn tool_errors_round_trip_without_changing_diagnostics() {
-        let message = "[error] file.css: Unexpected token\n  1 | }\n";
-        let error = IdeError::invalid(message).with_tool("prettier");
-        let decoded: IdeError = serde_json::from_str(&serde_json::to_string(&error).unwrap()).unwrap();
-        assert_eq!(decoded.message, message);
-        assert_eq!(decoded.data, Some(ErrorData::Tool { tool: "prettier".into(), missing: false }));
-        let missing = IdeError::missing_tool("prettier").with_tool("prettier");
-        assert_eq!(missing.kind, ErrorKind::NotFound);
-        assert_eq!(missing.data, Some(ErrorData::Tool { tool: "prettier".into(), missing: true }));
-    }
-
-    #[test]
-    fn legacy_errors_need_no_data() {
-        let error: IdeError = serde_json::from_str(r#"{"kind":"unavailable","message":"no server"}"#).unwrap();
-        assert!(error.data.is_none());
-        assert_eq!(
-            serde_json::to_value(error).unwrap(),
-            serde_json::json!({"kind":"unavailable","message":"no server","data":null})
-        );
-    }
-}

crates/ide-core/src/event.rs

@@ -13,22 +13,12 @@ use std::sync::Arc;
 #[derive(Clone, Debug, Serialize, Deserialize, Type)]
 #[serde(tag = "type", rename_all = "camelCase", rename_all_fields = "camelCase")]
 pub enum IdeEvent {
-    /// Project window membership or selection changed.
-    WindowGroupsChanged,
-    ProjectTrustChanged {
-        root: crate::IpcPath,
-        trusted: bool,
-    },
     /// Files or directories changed on disk (after debouncing, ignore rules applied).
     FsChanged {
         created: Vec<crate::IpcPath>,
         modified: Vec<crate::IpcPath>,
         removed: Vec<crate::IpcPath>,
     },
-    /// Excluded or ignored folders whose contents changed; they stay out of `FsChanged`.
-    ExcludedDirsChanged {
-        dirs: Vec<crate::IpcPath>,
-    },
     /// The backend changed a document (reload from disk, formatting, refactoring).
     /// The UI applies `changes` on top of `base_version`, yielding `version`.
     DocPatched {
@@ -36,28 +26,16 @@ pub enum IdeEvent {
         base_version: u32,
         version: u32,
         changes: Vec<TextChange>,
-        /// Part of a grouped transaction; the editor must not record a file-local undo.
-        #[serde(default)]
-        #[specta(optional)]
-        workspace_edit: bool,
     },
     /// A document's dirty flag changed (saved / modified externally).
     DocDirty {
         doc: DocId,
         dirty: bool,
     },
-    /// A complete workspace edit can be undone as one operation.
-    WorkspaceEditApplied {
-        id: u32,
-        paths: Vec<crate::IpcPath>,
-    },
-    /// An open document's language changed (Settings › File Types, Override File
-    /// Type), or its UI mode (a framework's root marker appeared or went).
+    /// An open document's language changed (Settings › File Types, Override File Type).
     DocLanguage {
         doc: DocId,
         language: crate::LanguageId,
-        /// See `DocumentInfo::ui_mode`.
-        ui_mode: Option<String>,
     },
     /// Full replacement of diagnostics for one file from one producer.
     Diagnostics {
@@ -91,12 +69,6 @@ pub enum IdeEvent {
         status: ServerStatus,
         message: Option<String>,
     },
-    /// A running server lacks a capability; the UI offers the managed tool as a replacement.
-    LanguageServerWarning {
-        name: String,
-        message: String,
-        install_tool: String,
-    },
     /// A stopped language server left the project's list (disabled in settings, or a
     /// fallback that a preferred server took over from again).
     LanguageServerRemoved {
@@ -140,22 +112,11 @@ pub enum IdeEvent {
         id: u64,
         prompt: String,
         kind: AskpassKind,
-        /// The dialog offers "Remember" for the answer (git HTTPS passwords).
-        remember: bool,
     },
     /// Prompt `id` was answered (in any window) or gave up.
     AskpassDone {
         id: u64,
     },
-    /// The kernel of an open notebook changed state (`starting`, `idle`, `busy`,
-    /// `dead`); `message` says why it failed to start or died.
-    NotebookKernel {
-        /// Backend document incarnation; stale queued events cannot target a reopen.
-        id: String,
-        path: crate::IpcPath,
-        state: String,
-        message: Option<String>,
-    },
 }
 
 /// What an askpass prompt asks for.

crates/ide-core/src/java_runtime.rs

@@ -1,25 +0,0 @@
-//! Capabilities needed by the JVM hosting Java language-server bundles.
-
-use std::path::Path;
-
-/// jdtls' javac bundle, java-debug / hot code replace, and Lombok / Gradle tooling.
-const BUNDLE_MODULES: &[&str] = &["jdk.compiler", "jdk.jdi", "jdk.unsupported"];
-
-/// Require a full JDK, including the modules used by jdtls and its bundles.
-/// Temurin JREs can list the build JDK's modules in `release` even when the runtime
-/// image omits them, so module metadata alone does not establish suitability.
-pub fn supports_java_bundles(home: &Path) -> bool {
-    let Ok(release) = std::fs::read_to_string(home.join("release")) else { return false };
-    let property =
-        |key: &str| release.lines().find_map(|line| line.trim().strip_prefix(key)).map(|v| v.trim().trim_matches('"'));
-    let javac = if cfg!(windows) { "javac.exe" } else { "javac" };
-    if property("IMAGE_TYPE=").is_some_and(|image| image.eq_ignore_ascii_case("jre"))
-        || !home.join("bin").join(javac).is_file()
-    {
-        return false;
-    }
-    match property("MODULES=") {
-        Some(modules) => BUNDLE_MODULES.iter().all(|required| modules.split_whitespace().any(|m| m == *required)),
-        None => BUNDLE_MODULES.iter().all(|m| home.join("jmods").join(format!("{m}.jmod")).is_file()),
-    }
-}

crates/ide-core/src/lib.rs

@@ -11,7 +11,6 @@ pub mod ids;
 pub mod ignored;
 pub mod inspection_settings;
 pub mod ipc_path;
-pub mod java_runtime;
 pub mod jsonc;
 pub mod output_encoding;
 pub mod process;
@@ -21,7 +20,6 @@ pub mod remote_settings;
 pub mod settings;
 pub mod task;
 pub mod text;
-pub mod tool_path;
 pub mod version_managers;
 pub mod workflow_settings;
 

crates/ide-core/src/output_encoding.rs

@@ -13,99 +13,24 @@
 //!   they fork get them too (`spring-boot:run`, Surefire, `bootRun`, test workers).
 //!   Each JVM then reports "Picked up JAVA_TOOL_OPTIONS: …" on stderr (which a build tool
 //!   may copy to its stdout); that line is hidden again ([`NoticeFilter`]). `file.encoding` is left alone there: it would change
-//!   how a build reads sources that declare no encoding. The application JVMs a build
-//!   forks get `file.encoding=UTF-8` for a UTF-8 console instead, through the build's own
-//!   options: `-Dspring-boot.run.jvmArguments` for Maven `spring-boot:run`, an init script
-//!   ([`GRADLE_FILE_ENCODING_SCRIPT`]) for Gradle `JavaExec` tasks (`bootRun`, `run`).
+//!   how a build reads sources that declare no encoding.
 //! - Python: `PYTHONIOENCODING`.
 
 use std::collections::BTreeMap;
 
-/// Decodes complete lines or collected output from IDE-managed tools, preferring UTF-8.
-/// Windows launcher/native diagnostics fall back to the system ANSI code page.
-/// Callers must buffer incomplete lines so multibyte characters are never split.
-/// Run consoles and protocol streams have their own encoding contracts.
-pub fn decode_tool_output(bytes: &[u8]) -> String {
-    #[cfg(windows)]
-    // SAFETY: GetACP is an argument-less query with no preconditions.
-    let code_page = unsafe { windows_sys::Win32::Globalization::GetACP() };
-    #[cfg(not(windows))]
-    let code_page = 65001;
-    decode_tool_output_with_code_page(bytes, code_page)
-}
-
-fn decode_tool_output_with_code_page(bytes: &[u8], code_page: u32) -> String {
-    if let Ok(text) = std::str::from_utf8(bytes) {
-        return text.to_owned();
-    }
-    let encoding = encoding_for_code_page(code_page).unwrap_or(encoding_rs::UTF_8);
-    // Collected output can mix UTF-8 JVM lines with native launcher diagnostics.
-    let mut text = String::new();
-    for line in bytes.split_inclusive(|b| *b == b'\n') {
-        match std::str::from_utf8(line) {
-            Ok(line) => text.push_str(line),
-            Err(_) => text.push_str(&encoding.decode_without_bom_handling(line).0),
-        }
-    }
-    text
-}
-
-fn encoding_for_code_page(cp: u32) -> Option<&'static encoding_rs::Encoding> {
-    Some(match cp {
-        65001 => encoding_rs::UTF_8,
-        936 => encoding_rs::GBK,
-        54936 => encoding_rs::GB18030,
-        950 => encoding_rs::BIG5,
-        932 => encoding_rs::SHIFT_JIS,
-        949 => encoding_rs::EUC_KR,
-        866 => encoding_rs::IBM866,
-        874 => encoding_rs::WINDOWS_874,
-        1250 => encoding_rs::WINDOWS_1250,
-        1251 => encoding_rs::WINDOWS_1251,
-        1252 => encoding_rs::WINDOWS_1252,
-        1253 => encoding_rs::WINDOWS_1253,
-        1254 => encoding_rs::WINDOWS_1254,
-        1255 => encoding_rs::WINDOWS_1255,
-        1256 => encoding_rs::WINDOWS_1256,
-        1257 => encoding_rs::WINDOWS_1257,
-        1258 => encoding_rs::WINDOWS_1258,
-        20866 => encoding_rs::KOI8_R,
-        21866 => encoding_rs::KOI8_U,
-        _ => return None,
-    })
-}
-
 const STD_PROPERTIES: &[&str] = &["stdout.encoding", "stderr.encoding", "sun.stdout.encoding", "sun.stderr.encoding"];
 const FILE_ENCODING: &str = "file.encoding";
 const TOOL_OPTIONS: &str = "JAVA_TOOL_OPTIONS";
-const SPRING_BOOT_JVM_ARGS: &str = "-Dspring-boot.run.jvmArguments=";
 
 /// Build tools and launcher scripts that run on (and may fork) JVMs.
-const JVM_TOOLS: &[&str] = &["sbt", "ant", "kotlin", "kotlinc", "groovy", "scala", "jbang"];
-const MAVEN: &[&str] = &["mvn", "mvnw", "mvnd"];
-const GRADLE: &[&str] = &["gradle", "gradlew"];
-
-/// Gradle init script giving the `JavaExec` tasks (`bootRun`, `run`, custom ones) a UTF-8
-/// default charset before the build configures them, so the build can override it.
-/// Gradle's own JVM and the compiler's source encoding are untouched.
-pub const GRADLE_FILE_ENCODING_SCRIPT: &str = "\
-// Written by OpenIDEA: a UTF-8 default charset for applications run by Gradle, as the Run console decodes UTF-8.
-allprojects {
-    tasks.withType(JavaExec).configureEach {
-        defaultCharacterEncoding = 'UTF-8'
-    }
-}
-";
+const JVM_TOOLS: &[&str] =
+    &["mvn", "mvnw", "mvnd", "gradle", "gradlew", "sbt", "ant", "kotlin", "kotlinc", "groovy", "scala", "jbang"];
 
 /// What a launch needs: `-D` options to put first on a `java` command line,
 /// environment variables to set, and the notice line its JVMs print because of them.
 #[derive(Debug, Default, PartialEq, Eq)]
 pub struct EncodingFix {
     pub java_args: Vec<String>,
-    /// The build tool's arguments, rewritten to pass options to the JVM it forks.
-    pub args: Option<Vec<String>>,
-    /// Gradle: pass [`GRADLE_FILE_ENCODING_SCRIPT`] with `--init-script`.
-    pub gradle_init_script: bool,
     pub env: Vec<(String, String)>,
     /// "Picked up JAVA_TOOL_OPTIONS: …" for a variable set here alone, to drop from the output.
     pub notice: Option<String>,
@@ -137,8 +62,6 @@ fn options(properties: &[&str], encoding: &str) -> Vec<String> {
 #[derive(Clone, Copy, PartialEq, Eq)]
 enum Kind {
     Java,
-    Maven,
-    Gradle,
     JvmTool,
     Python,
     Other,
@@ -148,10 +71,6 @@ fn kind(program: &str) -> Kind {
     let name = program_name(program);
     if name == "java" || name == "javaw" {
         Kind::Java
-    } else if MAVEN.contains(&name.as_str()) {
-        Kind::Maven
-    } else if GRADLE.contains(&name.as_str()) {
-        Kind::Gradle
     } else if JVM_TOOLS.contains(&name.as_str()) {
         Kind::JvmTool
     } else if is_python(&name) {
@@ -220,17 +139,7 @@ fn fix_kind(
                 out.java_args.push(format!("-D{FILE_ENCODING}=UTF-8"));
             }
         }
-        (Kind::Java | Kind::Maven | Kind::Gradle | Kind::JvmTool, _) => {
-            if let Some(args) = args
-                && is_utf8(encoding)
-                && !sets(&tool_options, &[FILE_ENCODING])
-            {
-                match kind {
-                    Kind::Maven => out.args = spring_boot_file_encoding(args),
-                    Kind::Gradle => out.gradle_init_script = true,
-                    _ => {}
-                }
-            }
+        (Kind::Java | Kind::JvmTool, _) => {
             if !sets(&tool_options, STD_PROPERTIES) {
                 let added = options(STD_PROPERTIES, encoding).join(" ");
                 let value = match tool_options.trim() {
@@ -251,42 +160,14 @@ fn fix_kind(
     out
 }
 
-fn spring_boot_file_encoding(args: &[String]) -> Option<Vec<String>> {
-    if !args.iter().any(|a| a == "spring-boot:run" || (a.contains(":spring-boot-maven-plugin:") && a.ends_with(":run")))
-    {
-        return None;
-    }
-    let option = format!("-D{FILE_ENCODING}=UTF-8");
-    let mut out = args.to_vec();
-    match out.iter_mut().rfind(|a| a.starts_with(SPRING_BOOT_JVM_ARGS)) {
-        Some(own) if sets(own, &[FILE_ENCODING]) => return None,
-        Some(own) => {
-            if own.len() > SPRING_BOOT_JVM_ARGS.len() {
-                own.push(' ');
-            }
-            own.push_str(&option);
-        }
-        None => out.push(format!("{SPRING_BOOT_JVM_ARGS}{option}")),
-    }
-    Some(out)
-}
-
 /// `vmArgs` of a launch by java-debug, which decodes the JVM's output as `encoding`
-/// (its launch attribute, UTF-8 when unset). java-debug sets `file.encoding` only
-/// when that attribute is nonblank; use the same defaults and user overrides as [`fix`].
-pub fn java_debug_vm_args(
-    vm_args: &str,
-    vars: &BTreeMap<String, String>,
-    inherited: impl Fn(&str) -> Option<String>,
-    encoding: Option<&str>,
-    windows: bool,
-) -> Option<String> {
+/// (its launch attribute, UTF-8 when unset) and sets `file.encoding` itself.
+pub fn java_debug_vm_args(vm_args: &str, encoding: Option<&str>, windows: bool) -> Option<String> {
     let encoding = encoding.map(str::trim).filter(|e| !e.is_empty()).unwrap_or("UTF-8");
-    let added = fix_kind(Kind::Java, Some(&[vm_args.to_owned()]), vars, inherited, encoding, windows).java_args;
-    if added.is_empty() {
+    if (!windows && is_utf8(encoding)) || sets(vm_args, STD_PROPERTIES) {
         return None;
     }
-    let added = added.join(" ");
+    let added = options(STD_PROPERTIES, encoding).join(" ");
     Some(match vm_args.trim() {
         "" => added,
         own => format!("{own} {added}"),
@@ -356,29 +237,6 @@ impl NoticeFilter {
 mod tests {
     use super::*;
 
-    #[test]
-    fn tool_output_prefers_utf8() {
-        for cp in [936, 1252, 65001, 0] {
-            for text in ["", "plain ASCII\r\n", "中文 café 🦀\n"] {
-                assert_eq!(decode_tool_output_with_code_page(text.as_bytes(), cp), text);
-            }
-        }
-    }
-
-    #[test]
-    fn tool_output_decodes_native_diagnostics_and_mixed_lines() {
-        const GBK: &[u8] = b"\xcf\xb5\xcd\xb3\xd5\xd2\xb2\xbb\xb5\xbd\xd6\xb8\xb6\xa8\xb5\xc4\xc2\xb7\xbe\xb6\xa1\xa3";
-        assert_eq!(decode_tool_output_with_code_page(GBK, 936), "系统找不到指定的路径。");
-        let mut mixed = "JVM: 中文\r\n".as_bytes().to_vec();
-        mixed.extend_from_slice(GBK);
-        mixed.extend_from_slice(b"\r\nlast");
-        assert_eq!(decode_tool_output_with_code_page(&mixed, 936), "JVM: 中文\r\n系统找不到指定的路径。\r\nlast");
-        assert_eq!(decode_tool_output_with_code_page(b"caf\xe9", 1252), "café");
-        for cp in [65001, 0] {
-            assert_eq!(decode_tool_output_with_code_page(b"a\xffb", cp), "a�b");
-        }
-    }
-
     const STD_UTF8: [&str; 4] = [
         "-Dstdout.encoding=UTF-8",
         "-Dstderr.encoding=UTF-8",
@@ -492,64 +350,6 @@ mod tests {
         assert_eq!(run("python3", &[], &[], "GBK", false).env, [("PYTHONIOENCODING".to_owned(), "GBK".to_owned())]);
     }
 
-    #[test]
-    fn spring_boot_run_forks_get_a_utf8_default_charset() {
-        let boot = |args: &[&str], env: &[(&str, &str)]| run("mvn.cmd", args, env, "UTF-8", true).args;
-        let utf8 = "-Dspring-boot.run.jvmArguments=-Dfile.encoding=UTF-8";
-        assert_eq!(boot(&["spring-boot:run"], &[]).unwrap(), ["spring-boot:run", utf8]);
-        let plugin = "org.springframework.boot:spring-boot-maven-plugin:3.2.0:run";
-        assert_eq!(boot(&["-pl", "app", plugin], &[]).unwrap(), ["-pl", "app", plugin, utf8]);
-        // The user's VM options are kept; their own `file.encoding` wins.
-        assert_eq!(
-            boot(&["spring-boot:run", "-Dspring-boot.run.jvmArguments=-Xmx1g \"-Da=b c\""], &[]).unwrap(),
-            ["spring-boot:run", "-Dspring-boot.run.jvmArguments=-Xmx1g \"-Da=b c\" -Dfile.encoding=UTF-8"]
-        );
-        assert_eq!(boot(&["spring-boot:run", "-Dspring-boot.run.jvmArguments="], &[]).unwrap()[1], utf8);
-        assert!(boot(&["spring-boot:run", "-Dspring-boot.run.jvmArguments=-Dfile.encoding=GBK"], &[]).is_none());
-        assert!(boot(&["spring-boot:run"], &[(TOOL_OPTIONS, "-Dfile.encoding=GBK")]).is_none());
-        // Other goals and tools, other consoles, and other platforms are left alone.
-        assert!(boot(&["package"], &[]).is_none());
-        assert!(run("mvn", &["spring-boot:run"], &[], "GBK", true).args.is_none());
-        assert!(run("mvn", &["spring-boot:run"], &[], "UTF-8", false).args.is_none());
-    }
-
-    #[test]
-    fn forked_application_jvms_get_a_utf8_default_charset() {
-        // Reported: a Spring Boot app run by the build on Chinese Windows (JDK 8–17, GBK default).
-        for (tool, args) in [
-            ("C:\\p\\gradlew.bat", &["bootRun"][..]),
-            ("gradle", &[":app:run"]),
-            ("mvnw.cmd", &["spring-boot:run"]),
-            ("mvnd", &["org.springframework.boot:spring-boot-maven-plugin:2.7.18:run"]),
-        ] {
-            let f = run(tool, args, &[], "UTF-8", true);
-            let gradle = tool.contains("gradle");
-            assert_eq!(f.gradle_init_script, gradle, "{tool}");
-            assert_eq!(f.args.is_some(), !gradle, "{tool}");
-            // The build tool's own JVM keeps its default charset.
-            assert!(!tool_env(&f).unwrap().contains("file.encoding"), "{tool}");
-            // The user's choice, a GBK console and other platforms are left alone.
-            let own = run(tool, args, &[(TOOL_OPTIONS, "-Dfile.encoding=GBK")], "UTF-8", true);
-            assert!(!own.gradle_init_script && own.args.is_none(), "{tool}");
-            let gbk = run(tool, args, &[], "GBK", true);
-            assert!(!gbk.gradle_init_script && gbk.args.is_none(), "{tool}");
-            assert_eq!(run(tool, args, &[], "UTF-8", false), EncodingFix::default(), "{tool}");
-        }
-        // Shell command lines can't take arguments; other JVM tools fork no application.
-        assert!(!fix_command_line("gradlew bootRun", &BTreeMap::new(), |_| None, "UTF-8", true).gradle_init_script);
-        let sbt = run("sbt", &["run"], &[], "UTF-8", true);
-        assert!(!sbt.gradle_init_script && sbt.args.is_none());
-    }
-
-    #[test]
-    fn gradle_script_respects_the_builds_own_file_encoding() {
-        let s = GRADLE_FILE_ENCODING_SCRIPT;
-        assert!(s.contains("tasks.withType(JavaExec).configureEach"), "{s}");
-        assert!(s.contains("defaultCharacterEncoding = 'UTF-8'"), "{s}");
-        assert!(!s.contains("doFirst"), "the build must be able to override the default: {s}");
-        assert!(!s.contains("withType(Test)") && !s.contains("JavaCompile"), "{s}");
-    }
-
     #[test]
     fn shell_command_lines_get_variables_from_their_first_word() {
         let line = |l: &str| fix_command_line(l, &BTreeMap::new(), |_| None, "UTF-8", true);
@@ -569,53 +369,12 @@ mod tests {
 
     #[test]
     fn java_debug_launches_write_what_java_debug_decodes() {
-        let debug =
-            |args: &str, encoding, windows| java_debug_vm_args(args, &BTreeMap::new(), |_| None, encoding, windows);
-        for encoding in [None, Some(""), Some("  "), Some("UTF-8"), Some("utf8")] {
-            let streams = encoding.filter(|e| !e.trim().is_empty()).unwrap_or("UTF-8");
-            let utf8 = format!("{} -Dfile.encoding=UTF-8", options(STD_PROPERTIES, streams).join(" "));
-            assert_eq!(debug("", encoding, true), Some(utf8.clone()));
-            assert_eq!(debug("-Xmx1g", encoding, true), Some(format!("-Xmx1g {utf8}")));
-            assert_eq!(debug("-Xmx1g", encoding, false), None);
-        }
-        for windows in [true, false] {
-            assert_eq!(debug("", Some("GBK"), windows), Some(options(STD_PROPERTIES, "GBK").join(" ")));
-        }
-    }
-
-    #[test]
-    fn java_debug_preserves_user_options_independently() {
-        let debug = |args: &str| java_debug_vm_args(args, &BTreeMap::new(), |_| None, None, true);
-        assert_eq!(debug("-Dfile.encoding=GBK"), Some(format!("-Dfile.encoding=GBK {TOOL_UTF8}")));
-        for property in STD_PROPERTIES {
-            let args = format!("-D{property}=GBK");
-            assert_eq!(debug(&args), Some(format!("{args} -Dfile.encoding=UTF-8")));
-            assert_eq!(debug(&format!("{args} -Dfile.encoding=GBK")), None);
-        }
-        for key in ["JDK_JAVA_OPTIONS", TOOL_OPTIONS] {
-            for (own, expected) in [
-                ("-Dfile.encoding=GBK", Some(TOOL_UTF8.to_owned())),
-                ("-Dstdout.encoding=GBK", Some("-Dfile.encoding=UTF-8".to_owned())),
-                ("-Dstdout.encoding=GBK -Dfile.encoding=GBK", None),
-            ] {
-                assert_eq!(java_debug_vm_args("", &vars(&[(key, own)]), |_| None, None, true), expected);
-                assert_eq!(
-                    java_debug_vm_args("", &BTreeMap::new(), |k| (k == key).then(|| own.to_owned()), None, true),
-                    expected
-                );
-            }
-            // A launch environment value overrides the inherited one, as in Run.
-            assert_eq!(
-                java_debug_vm_args(
-                    "",
-                    &vars(&[(key, "")]),
-                    |k| (k == key).then(|| "-Dfile.encoding=GBK".into()),
-                    None,
-                    true
-                ),
-                Some(format!("{TOOL_UTF8} -Dfile.encoding=UTF-8"))
-            );
-        }
+        assert_eq!(java_debug_vm_args("", None, true).as_deref(), Some(TOOL_UTF8));
+        assert_eq!(java_debug_vm_args("-Xmx1g", Some(""), true), Some(format!("-Xmx1g {TOOL_UTF8}")));
+        assert_eq!(java_debug_vm_args("", Some("GBK"), true).unwrap().split(' ').next(), Some("-Dstdout.encoding=GBK"));
+        assert_eq!(java_debug_vm_args("-Dstdout.encoding=GBK", None, true), None);
+        assert_eq!(java_debug_vm_args("-Xmx1g", None, false), None);
+        assert!(java_debug_vm_args("", Some("GBK"), false).is_some());
     }
 
     fn filtered(chunks: &[&str]) -> String {

crates/ide-core/src/process.rs

@@ -1,11 +1,8 @@
 //! Child-process helpers shared by every crate that spawns tools.
 
 use std::ffi::{OsStr, OsString};
-#[cfg(windows)]
-use std::process::Stdio;
-use std::process::{Child, Command};
+use std::process::Command;
 use std::sync::{Arc, RwLock};
-use std::time::Duration;
 
 /// Windows `CREATE_NO_WINDOW` creation flag, for call sites that combine it
 /// with other flags (and then call [`host_env`] themselves). Prefer [`prepare`] otherwise.
@@ -28,95 +25,6 @@ pub fn prepare(cmd: &mut Command) -> &mut Command {
     host_env(cmd)
 }
 
-/// Starts the child as the leader of its own process group on Unix, so [`kill_tree`] and
-/// [`terminate_tree`] reach what it starts in turn (`gh` → `git`, `npm` → `node`, `mvnw` →
-/// the JVM). A no-op elsewhere: on Windows the tree is found from the child's process id.
-pub fn own_group(cmd: &mut Command) -> &mut Command {
-    #[cfg(unix)]
-    {
-        use std::os::unix::process::CommandExt;
-        cmd.process_group(0);
-    }
-    cmd
-}
-
-/// Kills the child and everything it started, then reaps it.
-///
-/// - Unix: `SIGKILL` to its process group, so spawn it with [`own_group`].
-/// - Windows: `taskkill /T /F`, which walks the tree from the child's process id.
-pub fn kill_tree(child: &mut Child) {
-    #[cfg(unix)]
-    signal_group(child, libc::SIGKILL);
-    #[cfg(windows)]
-    taskkill_tree(child);
-    let _ = child.kill();
-    let _ = child.wait();
-}
-
-/// [`kill_tree`] for a child known by its process id (a `tokio` child): `SIGKILL` to its
-/// process group (spawn it with [`own_group`]) or `taskkill /T /F`. Call it before the child
-/// is reaped, so the id still names it. The child itself is left to its owner to kill and reap.
-pub fn kill_tree_of(pid: u32) {
-    #[cfg(unix)]
-    if let Ok(pid) = libc::pid_t::try_from(pid) {
-        // SAFETY: plain syscall; see `signal_group`.
-        unsafe {
-            libc::kill(-pid, libc::SIGKILL);
-        }
-    }
-    #[cfg(windows)]
-    {
-        let mut taskkill = Command::new("taskkill");
-        prepare(&mut taskkill)
-            .args(["/T", "/F", "/PID", &pid.to_string()])
-            .stdin(Stdio::null())
-            .stdout(Stdio::null())
-            .stderr(Stdio::null());
-        let _ = taskkill.status();
-    }
-    #[cfg(not(any(unix, windows)))]
-    let _ = pid;
-}
-
-/// [`kill_tree`] that first asks the group to exit: `SIGTERM`, then `grace`, then `SIGKILL`.
-/// Git removes its `index.lock` on `SIGTERM`, where `SIGKILL` leaves it behind and the next
-/// git command fails. Windows has no such signal to send from outside the child's console,
-/// so there it is [`kill_tree`].
-pub fn terminate_tree(child: &mut Child, grace: Duration) {
-    #[cfg(unix)]
-    {
-        signal_group(child, libc::SIGTERM);
-        // Sleep rather than `try_wait`: the child stays unreaped, so its process id (and the
-        // group id) cannot be reused before the `SIGKILL` below.
-        std::thread::sleep(grace);
-    }
-    #[cfg(not(unix))]
-    let _ = grace;
-    kill_tree(child);
-}
-
-#[cfg(unix)]
-fn signal_group(child: &Child, signal: libc::c_int) {
-    if let Ok(pid) = libc::pid_t::try_from(child.id()) {
-        // SAFETY: plain syscall. The child is not reaped yet, so `-pid` is still its group (or
-        // no group at all when it was not spawned with `own_group`, and the call fails).
-        unsafe {
-            libc::kill(-pid, signal);
-        }
-    }
-}
-
-#[cfg(windows)]
-fn taskkill_tree(child: &Child) {
-    let mut taskkill = Command::new("taskkill");
-    prepare(&mut taskkill)
-        .args(["/T", "/F", "/PID", &child.id().to_string()])
-        .stdin(Stdio::null())
-        .stdout(Stdio::null())
-        .stderr(Stdio::null());
-    let _ = taskkill.status();
-}
-
 /// 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
@@ -310,246 +218,10 @@ pub fn executable_names(name: &str, windows: bool, pathext: Option<&str>) -> Vec
     exts.iter().map(|e| format!("{name}{}", e.to_ascii_lowercase())).collect()
 }
 
-/// First `search` directory holding `name` (see [`executable_names`]).
-pub fn find_executable_in(
-    name: &str,
-    search: &OsStr,
-    windows: bool,
-    pathext: Option<&str>,
-) -> Option<std::path::PathBuf> {
-    let names = executable_names(name, windows, pathext);
-    std::env::split_paths(search)
-        .filter(|d| !d.as_os_str().is_empty())
-        .find_map(|dir| names.iter().map(|n| dir.join(n)).find(|p| p.is_file()))
-}
-
-/// [`find_executable_in`] for this platform (`PATHEXT` from the environment).
-pub fn find_executable(name: &str, search: &OsStr) -> Option<std::path::PathBuf> {
-    let pathext = host_var_os("PATHEXT");
-    find_executable_in(name, search, cfg!(windows), pathext.as_deref().and_then(|p| p.to_str()))
-}
-
-/// The user's own `PATH` entries on Windows (`HKCU\Environment`), the part of the
-/// merged `PATH` a process may not inherit — an IDE started before the variable was
-/// edited, or as a different user, sees only the machine entries. `%VAR%` references
-/// (`REG_EXPAND_SZ`) are expanded against the current environment. `None` elsewhere:
-/// there a login shell already supplies the user's whole `PATH`.
-#[cfg(windows)]
-pub fn user_path() -> Option<OsString> {
-    use windows_sys::Win32::Foundation::ERROR_SUCCESS;
-    use windows_sys::Win32::System::Registry::{HKEY, HKEY_CURRENT_USER, KEY_READ, RegCloseKey, RegOpenKeyExW};
-
-    fn wide(s: &str) -> Vec<u16> {
-        s.encode_utf16().chain(std::iter::once(0)).collect()
-    }
-
-    unsafe {
-        let mut key: HKEY = std::ptr::null_mut();
-        if RegOpenKeyExW(HKEY_CURRENT_USER, wide("Environment").as_ptr(), 0, KEY_READ, &mut key) != ERROR_SUCCESS {
-            return None;
-        }
-        let value = read_registry_string(key, &wide("Path"));
-        RegCloseKey(key);
-        value.filter(|v| !v.trim().is_empty()).map(OsString::from)
-    }
-}
-
-/// The string of value `name` under open `key`: `REG_SZ` as-is, `REG_EXPAND_SZ` expanded
-/// against the current environment. `None` when the value is missing or unreadable.
-///
-/// A `REG_EXPAND_SZ` value's first size query reports the unexpanded size, so a value
-/// that grows when expanded is re-read at the size the failed call reports. And the
-/// terminating NUL can leak into the read buffer with a stray UTF-16 unit behind it —
-/// seen with a `REG_EXPAND_SZ` user `Path`, where it made `env::set_var("PATH", …)`
-/// panic with "strings passed to WinAPI cannot contain NULs" — so the text is cut at
-/// the first NUL, not just stripped of trailing ones.
-#[cfg(windows)]
-fn read_registry_string(key: windows_sys::Win32::System::Registry::HKEY, name: &[u16]) -> Option<String> {
-    use windows_sys::Win32::Foundation::{ERROR_MORE_DATA, ERROR_SUCCESS};
-    use windows_sys::Win32::System::Registry::{RRF_RT_REG_EXPAND_SZ, RRF_RT_REG_SZ, RegGetValueW};
-
-    const FLAGS: u32 = RRF_RT_REG_SZ | RRF_RT_REG_EXPAND_SZ;
-    let mut kind = 0u32;
-    let mut len = 0u32;
-    // SAFETY: `name` is NUL-terminated and the size query writes only `kind` and `len`.
-    let status =
-        unsafe { RegGetValueW(key, std::ptr::null(), name.as_ptr(), FLAGS, &mut kind, std::ptr::null_mut(), &mut len) };
-    if status != ERROR_SUCCESS || len == 0 {
-        return None;
-    }
-    let buf = loop {
-        let mut buf = vec![0u16; len as usize / 2 + 1];
-        // SAFETY: as above; the buffer holds at least the `len` bytes the call may write.
-        let status = unsafe {
-            RegGetValueW(key, std::ptr::null(), name.as_ptr(), FLAGS, &mut kind, buf.as_mut_ptr() as *mut _, &mut len)
-        };
-        if status == ERROR_SUCCESS {
-            break buf;
-        }
-        if status != ERROR_MORE_DATA || len == 0 {
-            return None;
-        }
-    };
-    let text = String::from_utf16_lossy(&buf);
-    let end = text.find('\0').unwrap_or(text.len());
-    Some(text[..end].to_owned())
-}
-
-/// The user's own `PATH` entries; `None` outside Windows (see the Windows impl).
-#[cfg(not(windows))]
-pub fn user_path() -> Option<OsString> {
-    None
-}
-
-/// `path` followed by the [`user_path`] entries it lacks.
-pub fn with_user_path(path: &OsStr) -> OsString {
-    user_path().map_or_else(|| path.to_owned(), |user| append_path_entries(path, &user))
-}
-
-fn append_path_entries(path: &OsStr, extra: &OsStr) -> OsString {
-    let mut dirs: Vec<std::path::PathBuf> = std::env::split_paths(path).filter(|d| !d.as_os_str().is_empty()).collect();
-    for dir in std::env::split_paths(extra).filter(|d| !d.as_os_str().is_empty()) {
-        if !dirs.contains(&dir) {
-            dirs.push(dir);
-        }
-    }
-    std::env::join_paths(dirs).unwrap_or_else(|_| path.to_owned())
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
 
-    #[cfg(unix)]
-    #[test]
-    fn kill_tree_of_reaches_what_the_child_started() {
-        use std::io::BufRead;
-        let mut cmd = Command::new("sh");
-        own_group(&mut cmd).args(["-c", "sleep 30 & echo $!; wait"]).stdout(std::process::Stdio::piped());
-        let mut child = cmd.spawn().unwrap();
-        let mut line = String::new();
-        std::io::BufReader::new(child.stdout.take().unwrap()).read_line(&mut line).unwrap();
-        let grandchild: libc::pid_t = line.trim().parse().unwrap();
-        let alive = |pid: libc::pid_t| unsafe { libc::kill(pid, 0) } == 0;
-        assert!(alive(grandchild));
-        kill_tree_of(child.id());
-        let _ = child.wait();
-        // Reparented to init once its parent is gone, which reaps it.
-        let gone = (0..100).any(|_| {
-            std::thread::sleep(Duration::from_millis(20));
-            !alive(grandchild)
-        });
-        assert!(gone, "the grandchild {grandchild} survived");
-    }
-
-    #[cfg(windows)]
-    #[test]
-    fn user_path_reads_the_current_users_path() {
-        // This host has a user `Path` only when the test account set one; either way the call
-        // must not fail, and a present value is a non-empty `;`-joined list of directories.
-        if let Some(path) = user_path() {
-            let dirs: Vec<_> = std::env::split_paths(&path).collect();
-            assert!(!dirs.is_empty(), "user PATH should hold at least one directory");
-        }
-    }
-
-    #[cfg(windows)]
-    #[test]
-    fn registry_strings_expand_and_stay_terminator_free() {
-        use windows_sys::Win32::Foundation::ERROR_SUCCESS;
-        use windows_sys::Win32::System::Registry::{
-            HKEY, HKEY_CURRENT_USER, KEY_READ, KEY_WRITE, REG_EXPAND_SZ, REG_SZ, RegCloseKey, RegCreateKeyExW,
-            RegDeleteTreeW, RegSetValueExW,
-        };
-
-        fn wide(s: &str) -> Vec<u16> {
-            s.encode_utf16().chain(std::iter::once(0)).collect()
-        }
-
-        struct TestState {
-            key: HKEY,
-            name: String,
-            variable: String,
-            previous: Option<OsString>,
-        }
-        impl Drop for TestState {
-            fn drop(&mut self) {
-                // SAFETY: the key belongs to this test; Windows environment mutation is safe.
-                unsafe {
-                    RegCloseKey(self.key);
-                    RegDeleteTreeW(HKEY_CURRENT_USER, wide(&self.name).as_ptr());
-                    match &self.previous {
-                        Some(value) => std::env::set_var(&self.variable, value),
-                        None => std::env::remove_var(&self.variable),
-                    }
-                }
-            }
-        }
-        let name = format!("Software\\ai.l0ng.openidea.registry-read-test-{}", std::process::id());
-        let variable = format!("OPENIDEA_TEST_REGVAR_{}", std::process::id());
-        let long = "x".repeat(600);
-        let mut key: HKEY = std::ptr::null_mut();
-        let opened = unsafe {
-            RegCreateKeyExW(
-                HKEY_CURRENT_USER,
-                wide(&name).as_ptr(),
-                0,
-                std::ptr::null(),
-                0,
-                KEY_READ | KEY_WRITE,
-                std::ptr::null(),
-                &mut key,
-                std::ptr::null_mut(),
-            )
-        };
-        assert_eq!(opened, ERROR_SUCCESS, "the test key must be creatable under HKCU\\Software");
-        let _cleanup = TestState { key, name, previous: std::env::var_os(&variable), variable: variable.clone() };
-        // SAFETY: Windows permits environment mutation. No other test uses this process-specific name.
-        unsafe { std::env::set_var(&variable, &long) };
-        let set = |value: &str, kind: u32, data: &[u16]| {
-            // SAFETY: `key` is open for writing and `data` holds `data.len() * 2` bytes.
-            assert_eq!(
-                unsafe {
-                    RegSetValueExW(
-                        key,
-                        wide(value).as_ptr(),
-                        0,
-                        kind,
-                        data.as_ptr() as *const _,
-                        (data.len() * 2) as u32,
-                    )
-                },
-                ERROR_SUCCESS
-            );
-        };
-        let read = |value: &str| read_registry_string(key, &wide(value));
-        set("Plain", REG_SZ, &wide("plain"));
-        set("Expand", REG_EXPAND_SZ, &wide(&format!("%{variable}%\\bin")));
-        set("ExpandLong", REG_EXPAND_SZ, &wide(&format!("%{variable}%")));
-        // Reproduce the reported interior terminator followed by a stale UTF-16 unit.
-        set("TrailingGarbage", REG_SZ, &wide("C:\\Zed\\bin\0n"));
-        set("ExpandTrailingGarbage", REG_EXPAND_SZ, &wide(&format!("%{variable}%\\bin\0n")));
-        set("Empty", REG_SZ, &wide(""));
-        let plain = read("Plain");
-        let expand = read("Expand");
-        let expand_long = read("ExpandLong");
-        assert_eq!(plain.as_deref(), Some("plain"));
-        assert_eq!(expand.as_deref(), Some(format!("{long}\\bin")).as_deref());
-        // Longer than its unexpanded form: needs the re-read at the expanded size.
-        assert_eq!(expand_long.as_deref(), Some(long.as_str()));
-        assert_eq!(read("TrailingGarbage").as_deref(), Some("C:\\Zed\\bin"));
-        assert_eq!(read("ExpandTrailingGarbage").as_deref(), Some(format!("{long}\\bin")).as_deref());
-        assert_eq!(read("Empty").as_deref(), Some(""));
-        assert_eq!(read("Missing"), None);
-    }
-
-    #[test]
-    fn append_path_entries_keeps_the_order_and_adds_what_is_missing() {
-        let join = |dirs: &[&str]| std::env::join_paths(dirs).unwrap();
-        assert_eq!(append_path_entries(&join(&["a", "b"]), &join(&["b", "c"])), join(&["a", "b", "c"]));
-        assert_eq!(append_path_entries(OsStr::new(""), &join(&["c"])), join(&["c"]));
-    }
-
     #[test]
     fn shell_env_adds_only_what_the_process_lacks_and_the_overlay_wins() {
         set_shell_env(vec![("OPENIDEA_SHELL_ONLY_VAR".into(), "1".into()), ("PATH".into(), "/from/shell".into())]);
@@ -691,91 +363,4 @@ mod tests {
         prepare(&mut cmd);
         assert_eq!(cmd.get_envs().find(|(k, _)| *k == "PATH").and_then(|(_, v)| v), Some(OsStr::new("/custom")));
     }
-
-    #[test]
-    fn find_executable_finds_bare_names_on_the_given_path() {
-        let dir = tempfile::tempdir().unwrap();
-        let a = dir.path().join("a");
-        let b = dir.path().join("b");
-        std::fs::create_dir_all(&a).unwrap();
-        std::fs::create_dir_all(&b).unwrap();
-        std::fs::write(a.join("agent"), "#!/bin/sh\n").unwrap();
-        std::fs::write(b.join("agent.cmd"), "@echo off\n").unwrap();
-        let search = std::env::join_paths([&a, &b]).unwrap();
-        if cfg!(windows) {
-            // The `.cmd` shim wins over a POSIX script `Command` can't start.
-            assert_eq!(find_executable("agent", &search), Some(b.join("agent.cmd")));
-        } else {
-            assert_eq!(find_executable("agent", &search), Some(a.join("agent")));
-        }
-        assert_eq!(find_executable("nope", &search), None);
-    }
-}
-
-#[cfg(all(test, unix))]
-mod kill_tests {
-    use super::*;
-    use std::path::Path;
-    use std::time::Instant;
-
-    /// Runs `script` in `sh` as its own group's leader and waits for it to write `ready`.
-    fn start(script: &str, ready: &Path) -> Child {
-        let mut cmd = Command::new("sh");
-        cmd.arg("-c").arg(script);
-        let child = own_group(&mut cmd).spawn().unwrap();
-        let deadline = Instant::now() + Duration::from_secs(5);
-        while !ready.exists() {
-            assert!(Instant::now() < deadline, "the script never got ready");
-            std::thread::sleep(Duration::from_millis(10));
-        }
-        child
-    }
-
-    fn assert_gone(pid: libc::pid_t) {
-        let deadline = Instant::now() + Duration::from_secs(5);
-        // SAFETY: signal 0 only checks that the process exists.
-        while unsafe { libc::kill(pid, 0) } == 0 {
-            assert!(Instant::now() < deadline, "process {pid} survived");
-            std::thread::sleep(Duration::from_millis(20));
-        }
-    }
-
-    #[test]
-    fn kill_tree_kills_what_the_child_started() {
-        let dir = tempfile::tempdir().unwrap();
-        let pid_file = dir.path().join("pid");
-        let script = format!("sleep 30 & echo $! > '{0}.tmp' && mv '{0}.tmp' '{0}'; wait", pid_file.display());
-        let mut child = start(&script, &pid_file);
-        let grandchild: libc::pid_t = std::fs::read_to_string(&pid_file).unwrap().trim().parse().unwrap();
-        kill_tree(&mut child);
-        assert!(child.try_wait().unwrap().is_some(), "the child is reaped");
-        assert_gone(grandchild);
-    }
-
-    #[test]
-    fn terminate_tree_lets_the_child_clean_up() {
-        let dir = tempfile::tempdir().unwrap();
-        let (ready, cleaned) = (dir.path().join("ready"), dir.path().join("cleaned"));
-        let script = format!(
-            "trap 'touch \"{}\"; exit 0' TERM; touch \"{}\"; sleep 30 & wait",
-            cleaned.display(),
-            ready.display()
-        );
-        let mut child = start(&script, &ready);
-        terminate_tree(&mut child, Duration::from_millis(500));
-        assert!(cleaned.exists(), "the SIGTERM handler ran before the SIGKILL");
-        assert!(child.try_wait().unwrap().is_some(), "the child is reaped");
-    }
-
-    #[test]
-    fn terminate_tree_still_kills_a_child_that_ignores_sigterm() {
-        let dir = tempfile::tempdir().unwrap();
-        let ready = dir.path().join("ready");
-        let script = format!("trap '' TERM; touch \"{}\"; while :; do sleep 1; done", ready.display());
-        let mut child = start(&script, &ready);
-        let started = Instant::now();
-        terminate_tree(&mut child, Duration::from_millis(50));
-        assert!(child.try_wait().unwrap().is_some(), "the child is reaped");
-        assert!(started.elapsed() < Duration::from_secs(5));
-    }
 }

crates/ide-core/src/proxy_settings.rs

@@ -207,58 +207,6 @@ impl ProxySettings {
         env.push((OsString::from("no_proxy"), Some(OsString::from(no_proxy))));
         env
     }
-
-    /// System properties that make a JVM follow this configuration. A JVM reads none of
-    /// [`Self::child_env`]: a Java tool (jetty, Maven's resolver, a language server's own
-    /// HTTP client) goes direct without these, and a repository its proxy answers in
-    /// milliseconds can then hang it instead.
-    pub fn jvm_args(&self) -> Vec<String> {
-        match self.mode {
-            // macOS and Windows JVMs read the system proxy with this one.
-            ProxyMode::Auto => vec!["-Djava.net.useSystemProxies=true".into()],
-            ProxyMode::None => Vec::new(),
-            ProxyMode::Manual if self.manual() => self.manual_jvm_args(),
-            ProxyMode::Manual => Vec::new(),
-        }
-    }
-
-    fn manual_jvm_args(&self) -> Vec<String> {
-        let (host, port) = (self.host.trim(), self.port);
-        match self.kind {
-            ProxyKind::Http => {
-                // HTTPS hosts read `https.proxyHost`, plain ones `http.proxyHost`.
-                let mut args = vec![
-                    format!("-Dhttp.proxyHost={host}"),
-                    format!("-Dhttp.proxyPort={port}"),
-                    format!("-Dhttps.proxyHost={host}"),
-                    format!("-Dhttps.proxyPort={port}"),
-                ];
-                let hosts = self.non_proxy_hosts();
-                if !hosts.is_empty() {
-                    args.push(format!("-Dhttp.nonProxyHosts={}", hosts.join("|")));
-                }
-                args
-            }
-            // SOCKS proxies every TCP connection, so there is one property pair.
-            ProxyKind::Socks => vec![
-                format!("-DsocksProxyHost={host}"),
-                format!("-DsocksProxyPort={port}"),
-                "-Djava.net.useSystemProxies=false".into(),
-            ],
-        }
-    }
-
-    /// [`Self::no_proxy`] in the JVM's `http.nonProxyHosts` format: `|` between host
-    /// globs. CIDR ranges and IPv6 literals have no equivalent there and are dropped.
-    fn non_proxy_hosts(&self) -> Vec<String> {
-        let mut hosts: Vec<String> = LOOPBACK.iter().filter(|h| !h.contains(':')).map(|h| (*h).to_owned()).collect();
-        for entry in self.no_proxy_entries() {
-            if !entry.contains(['/', ':', '[', ']']) && !hosts.contains(&entry) {
-                hosts.push(entry);
-            }
-        }
-        hosts
-    }
 }
 
 /// Case-insensitive host glob (`pattern` is lowercase): `*` matches any run of characters.
@@ -344,34 +292,6 @@ mod tests {
         assert!(p.child_env().is_empty());
     }
 
-    #[test]
-    fn jvm_args_carry_the_proxy_as_system_properties() {
-        // A JVM reads none of `child_env`: a Java language server needs these to not go
-        // direct while curl, git and Node follow the environment.
-        assert_eq!(ProxySettings::default().jvm_args(), ["-Djava.net.useSystemProxies=true"]);
-        assert!(ProxySettings { mode: ProxyMode::None, ..manual("proxy", 3128) }.jvm_args().is_empty());
-        assert_eq!(
-            manual("proxy.corp", 3128).jvm_args(),
-            [
-                "-Dhttp.proxyHost=proxy.corp",
-                "-Dhttp.proxyPort=3128",
-                "-Dhttps.proxyHost=proxy.corp",
-                "-Dhttps.proxyPort=3128",
-                "-Dhttp.nonProxyHosts=localhost|127.0.0.1",
-            ]
-        );
-        let socks = ProxySettings { kind: ProxyKind::Socks, ..manual("10.0.0.1", 1080) };
-        assert_eq!(socks.jvm_args()[..2], ["-DsocksProxyHost=10.0.0.1", "-DsocksProxyPort=1080"]);
-        // `http.nonProxyHosts` takes host globs: CIDR ranges and IPv6 literals drop out.
-        let p = ProxySettings {
-            no_proxy: "*.corp.com, 172.0.0.0/8, [::1], ::1, localhost".into(),
-            ..manual("proxy.corp", 3128)
-        };
-        assert_eq!(p.jvm_args().last().unwrap(), "-Dhttp.nonProxyHosts=localhost|127.0.0.1|*.corp.com");
-        // A manual proxy without a host connects directly, and so does its JVM.
-        assert!(manual(" ", 80).jvm_args().is_empty());
-    }
-
     #[test]
     fn manual_http_and_socks_urls() {
         let p = manual("proxy.corp", 3128);

crates/ide-core/src/remote_settings.rs

@@ -103,19 +103,10 @@ impl Default for DeploymentSettings {
     }
 }
 
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub enum DeploymentType {
-    #[default]
-    Sftp,
-    Local,
-}
-
-/// A deployment filesystem and how project folders map onto it.
+/// An SFTP server and how project folders map onto it.
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct DeploymentServer {
-    pub kind: DeploymentType,
     pub id: String,
     pub name: String,
     /// [`SshConfiguration::id`].
@@ -132,7 +123,7 @@ pub struct DeploymentServer {
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct DeploymentMapping {
-    /// Project-relative folder, or absolute inside the project; empty = the project root.
+    /// Project-relative folder; empty = the project root.
     pub local: String,
     /// Remote folder, relative to the server root (a leading `/` is the root too).
     pub deployment: String,
@@ -157,23 +148,3 @@ pub struct RunTarget {
     pub node: String,
     pub java: String,
 }
-
-#[cfg(test)]
-mod deployment_tests {
-    use super::*;
-
-    #[test]
-    fn deployment_type_defaults_and_round_trips() {
-        let legacy: DeploymentServer =
-            serde_json::from_str(r#"{"id":"existing","sshConfig":"ssh","rootPath":"/srv"}"#).unwrap();
-        assert_eq!(legacy.kind, DeploymentType::Sftp);
-        assert_eq!(legacy.ssh_config, "ssh");
-        for kind in [DeploymentType::Sftp, DeploymentType::Local] {
-            let server = DeploymentServer { kind, ..legacy.clone() };
-            assert_eq!(
-                serde_json::from_str::<DeploymentServer>(&serde_json::to_string(&server).unwrap()).unwrap(),
-                server
-            );
-        }
-    }
-}

crates/ide-core/src/settings.rs

@@ -58,68 +58,6 @@ pub struct Settings {
     pub deployment: DeploymentSettings,
     /// Build, Execution, Deployment › Run Targets.
     pub run_targets: Vec<RunTarget>,
-    pub cmake: CMakeSettings,
-    /// Tools › Agents › Chat.
-    pub agents: AgentSettings,
-    /// 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.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
-#[serde(default, rename_all = "camelCase")]
-pub struct AgentSettings {
-    /// Context window use.
-    pub show_context_usage: bool,
-    /// Time the agent spent on the task.
-    pub show_work_time: bool,
-    /// The account's usage-limit windows (Claude's 5-hour and weekly limits).
-    pub show_usage_limits: bool,
-    /// What the session has cost so far, as the agent reports it.
-    pub show_cost: bool,
-}
-
-impl Default for AgentSettings {
-    fn default() -> Self {
-        Self { show_context_usage: true, show_work_time: true, show_usage_limits: true, show_cost: false }
-    }
-}
-
-/// Absent profiles retain automatic discovery for existing projects.
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
-#[serde(default, rename_all = "camelCase")]
-pub struct CMakeSettings {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[specta(optional)]
-    pub profiles: Option<Vec<CMakeProfile>>,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
-#[serde(default, rename_all = "camelCase")]
-pub struct CMakeProfile {
-    pub name: String,
-    pub build_type: String,
-    pub generator: String,
-    pub cmake_args: Vec<String>,
-    /// Empty uses cmake-build-<lowercase build type>.
-    pub build_dir: String,
-    pub build_args: Vec<String>,
-    pub env: BTreeMap<String, String>,
-}
-
-impl Default for CMakeProfile {
-    fn default() -> Self {
-        Self {
-            name: "Debug".into(),
-            build_type: "Debug".into(),
-            generator: String::new(),
-            cmake_args: Vec::new(),
-            build_dir: String::new(),
-            build_args: Vec::new(),
-            env: BTreeMap::new(),
-        }
-    }
 }
 
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
@@ -216,9 +154,6 @@ impl Default for Settings {
             ssh: SshSettings::default(),
             deployment: DeploymentSettings::default(),
             run_targets: Vec::new(),
-            cmake: CMakeSettings::default(),
-            agents: AgentSettings::default(),
-            plugins: BTreeMap::new(),
         }
     }
 }
@@ -243,7 +178,7 @@ pub struct CustomKeymap {
 pub struct GeneralSettings {
     pub reopen_last_project: bool,
     pub confirm_exit: bool,
-    /// Where Open… puts a project while one is open: `ask` | `new` | `same` | `attach`.
+    /// Where Open… puts a project while one is open: `ask` | `new` | `same`.
     pub open_project_in: String,
     /// Initial folder of the Open / Clone dialogs; empty = the OS default.
     pub default_project_directory: String,
@@ -262,7 +197,7 @@ impl Default for GeneralSettings {
     fn default() -> Self {
         Self {
             reopen_last_project: true,
-            confirm_exit: true,
+            confirm_exit: false,
             open_project_in: "ask".into(),
             default_project_directory: String::new(),
             save_on_idle: false,
@@ -327,8 +262,7 @@ impl Default for NotificationGroupSettings {
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct AppearanceSettings {
-    /// A built-in theme id (`light`, `dark`, `dark-hc`, …), `system` (legacy
-    /// "Sync with OS"), or a plugin's theme: `plugin:<plugin-id>/<theme-id>`.
+    /// `dark` | `light` | `system` | `dark-hc` (high-contrast dark)
     pub theme: String,
     pub accent: String,
     pub ui_font_size: f32,
@@ -337,15 +271,11 @@ pub struct AppearanceSettings {
     pub sync_with_os: bool,
     pub preferred_light_theme: String,
     pub preferred_dark_theme: String,
-    /// A plugin's file icon theme (`<plugin-id>/<theme-id>`); empty = the built-in icons.
-    pub file_icon_theme: String,
     /// IDE zoom in percent (50–300).
     pub zoom: u32,
     /// Apply `ui_font_family` / `ui_font_size` (otherwise the theme's).
     pub use_custom_font: bool,
     pub ui_font_family: String,
-    /// Font tried when `ui_font_family` lacks a glyph; empty = none.
-    pub ui_font_fallback: String,
     pub contrast_scrollbars: bool,
     /// Adjust colours for red-green vision deficiency.
     pub red_green_vision: bool,
@@ -355,14 +285,11 @@ pub struct AppearanceSettings {
     pub project_colors_in_toolbar: bool,
     pub dnd_with_alt_only: bool,
     pub menu_icons: bool,
-    /// `hamburger` | `merged`: main menu presentation in the frameless title bar.
-    pub main_menu_style: String,
     /// `subpixel` | `greyscale` | `none`
     pub ide_antialiasing: String,
     pub editor_antialiasing: String,
     pub show_tool_window_bars: bool,
     pub show_tool_window_names: bool,
-    pub show_tool_window_badges: bool,
     pub widescreen_tool_windows: bool,
     /// Status bar widgets shown (`true`) or hidden (`false`) by the user
     /// (status bar context menu); widgets not listed use their default.
@@ -393,11 +320,9 @@ impl Default for AppearanceSettings {
             sync_with_os: false,
             preferred_light_theme: "light".into(),
             preferred_dark_theme: "dark".into(),
-            file_icon_theme: String::new(),
             zoom: 100,
             use_custom_font: false,
             ui_font_family: "Inter".into(),
-            ui_font_fallback: String::new(),
             contrast_scrollbars: false,
             red_green_vision: false,
             different_tool_window_background: false,
@@ -406,12 +331,10 @@ impl Default for AppearanceSettings {
             project_colors_in_toolbar: true,
             dnd_with_alt_only: false,
             menu_icons: true,
-            main_menu_style: "hamburger".into(),
             ide_antialiasing: "greyscale".into(),
             editor_antialiasing: "greyscale".into(),
             show_tool_window_bars: true,
             show_tool_window_names: false,
-            show_tool_window_badges: true,
             widescreen_tool_windows: false,
             status_bar_widgets: BTreeMap::new(),
             main_toolbar: None,
@@ -419,15 +342,6 @@ impl Default for AppearanceSettings {
     }
 }
 
-/// Imported editor colour scheme on top of a built-in base.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct CustomColorScheme {
-    pub name: String,
-    pub parent: String,
-    pub attributes: BTreeMap<String, TextAttributesOverride>,
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct EditorSettings {
@@ -443,8 +357,6 @@ pub struct EditorSettings {
     pub format_on_save: bool,
     /// Editor colour scheme id; `theme-default` follows the IDE theme.
     pub color_scheme: String,
-    /// Imported editor schemes, stored in user settings.
-    pub custom_schemes: BTreeMap<String, CustomColorScheme>,
     /// Color Scheme edits: scheme id → attribute id → override.
     pub color_overrides: BTreeMap<String, BTreeMap<String, TextAttributesOverride>>,
     /// Color Scheme › Language Defaults › Semantic highlighting: local variables and
@@ -492,7 +404,6 @@ impl Default for EditorSettings {
             format_on_save: false,
             color_scheme: "theme-default".into(),
             color_overrides: BTreeMap::new(),
-            custom_schemes: BTreeMap::new(),
             semantic_highlighting: false,
             rainbow_brackets: false,
             ligatures: false,
@@ -523,8 +434,6 @@ impl Default for EditorSettings {
 pub struct FileSettings {
     /// Save on focus loss / tab switch, like IDEA.
     pub auto_save: bool,
-    /// Re-check open files against disk when the IDE window gains focus.
-    pub sync_on_focus: bool,
     pub exclude: Vec<String>,
     /// Ignored Files and Folders: name patterns hidden everywhere; see [`crate::ignored`].
     pub ignored_names: Vec<String>,
@@ -556,7 +465,6 @@ impl Default for FileSettings {
     fn default() -> Self {
         Self {
             auto_save: true,
-            sync_on_focus: true,
             exclude: vec!["**/.git".into(), "**/node_modules".into(), "**/target".into()],
             ignored_names: crate::ignored::DEFAULT_IGNORED_NAMES.iter().map(|s| (*s).into()).collect(),
             trim_trailing_whitespace: true,
@@ -574,91 +482,10 @@ impl Default for FileSettings {
 pub struct LanguagesSettings {
     pub python: PythonSettings,
     pub node: NodeSettings,
-    pub php: PhpSettings,
     pub rust: RustSettings,
     pub go: GoSettings,
     pub typescript: TypeScriptSettings,
-    pub prettier: ExternalFormatterSettings,
-    pub oxfmt: ExternalFormatterSettings,
     pub java: JavaSettings,
-    pub ruby: RubySettings,
-    pub markdown: MarkdownSettings,
-}
-
-/// Languages & Frameworks › Markdown. Like IDEA's, it is application-level only.
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
-#[serde(default, rename_all = "camelCase")]
-pub struct MarkdownSettings {
-    /// Preview (and notebook Markdown cell) font size in px; unset follows the editor font size.
-    pub preview_font_size: Option<u32>,
-}
-
-impl LanguagesSettings {
-    pub fn formatter(&self, tool: ExternalFormatter) -> &ExternalFormatterSettings {
-        match tool {
-            ExternalFormatter::Prettier => &self.prettier,
-            ExternalFormatter::Oxfmt => &self.oxfmt,
-        }
-    }
-}
-
-/// A formatter that runs outside the language servers, with its own settings group.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "lowercase")]
-pub enum ExternalFormatter {
-    Prettier,
-    Oxfmt,
-}
-
-impl ExternalFormatter {
-    /// The name of the tool in the tool registry.
-    pub fn name(self) -> &'static str {
-        match self {
-            Self::Prettier => "prettier",
-            Self::Oxfmt => "oxfmt",
-        }
-    }
-}
-
-/// An external formatter (Prettier, oxfmt) and the languages it formats.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
-#[serde(default, rename_all = "camelCase")]
-pub struct ExternalFormatterSettings {
-    /// Empty path: project node_modules, managed installation, then PATH.
-    pub path: String,
-    pub languages: Vec<String>,
-    /// Prefer this formatter even when a language server offers formatting.
-    pub prefer: bool,
-    pub run_on_save: bool,
-}
-
-impl Default for ExternalFormatterSettings {
-    fn default() -> Self {
-        Self {
-            path: String::new(),
-            languages: [
-                "markdown",
-                "yaml",
-                "css",
-                "scss",
-                "less",
-                "html",
-                "graphql",
-                "javascript",
-                "javascriptreact",
-                "typescript",
-                "typescriptreact",
-                "json",
-                "jsonc",
-                "vue",
-            ]
-            .into_iter()
-            .map(String::from)
-            .collect(),
-            prefer: false,
-            run_on_save: false,
-        }
-    }
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
@@ -676,20 +503,6 @@ impl Default for PythonSettings {
     }
 }
 
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
-#[serde(default, rename_all = "camelCase")]
-pub struct PhpSettings {
-    /// `php` CLI executable; empty = the one on `PATH`.
-    pub interpreter: String,
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
-#[serde(default, rename_all = "camelCase")]
-pub struct RubySettings {
-    /// Project interpreter executable; empty = auto-detect (`.ruby-version`, mise / asdf, else `ruby` on PATH).
-    pub interpreter: String,
-}
-
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct NodeSettings {
@@ -733,35 +546,6 @@ pub struct GoSettings {
     pub goroot: String,
     /// Empty = `go env GOPATH`.
     pub gopath: String,
-    pub build_tags: GoBuildTags,
-    pub modules: GoModules,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
-#[serde(default, rename_all = "camelCase")]
-pub struct GoModules {
-    pub env: BTreeMap<String, String>,
-    pub auto_vendor: bool,
-}
-
-impl Default for GoModules {
-    fn default() -> Self {
-        Self { env: BTreeMap::new(), auto_vendor: true }
-    }
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
-#[serde(default, rename_all = "camelCase")]
-pub struct GoBuildTags {
-    /// Empty values inherit the selected toolchain's defaults.
-    pub os: String,
-    pub arch: String,
-    pub version: String,
-    pub compiler: String,
-    /// Empty = automatic, "1" = enabled, "0" = disabled.
-    pub cgo: String,
-    pub custom: String,
-    pub experiments: String,
 }
 
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
@@ -779,50 +563,12 @@ pub struct JavaSettings {
     pub jdtls_vm_args: String,
     /// Build Tools › Maven.
     pub maven: MavenSettings,
-    /// Build Tools › Gradle.
-    pub gradle: GradleSettings,
-}
-
-/// Build Tools › Gradle.
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
-#[serde(default, rename_all = "camelCase")]
-pub struct GradleSettings {
-    /// Empty = Project JDK; otherwise a JDK home.
-    pub jvm: String,
-    pub distribution: GradleDistribution,
-    /// Used only for the local distribution.
-    pub home: String,
-    /// Empty = Gradle's default user home.
-    pub user_home: String,
-    /// IDEA's "Build and run using": who builds and launches an Application main.
-    pub run_using: GradleRunUsing,
-}
-
-/// IDEA's "Build and run using" for Gradle builds; IDEA defaults to Gradle.
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub enum GradleRunUsing {
-    /// A `JavaExec` task on the source set's runtime classpath (`gradleRun.gradle`).
-    #[default]
-    Gradle,
-    /// The Java language server's classpath, launched by OpenIDEA.
-    Ide,
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub enum GradleDistribution {
-    #[default]
-    Wrapper,
-    Local,
 }
 
 /// Build Tools › Maven.
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct MavenSettings {
-    /// Project-relative root POMs removed from the Maven project model.
-    pub unlinked_projects: Vec<String>,
     /// Maven home (or its `mvn` executable); empty = the project's `mvnw`, else `mvn` on `PATH`.
     pub home: String,
     /// User `settings.xml` (`-s`); empty = `~/.m2/settings.xml`.
@@ -901,76 +647,6 @@ impl Settings {
 mod tests {
     use super::*;
 
-    #[test]
-    fn cmake_profile_argument_arrays_round_trip() {
-        let mut settings = Settings::default();
-        assert!(settings.cmake.profiles.is_none());
-        assert!(CMakeProfile::default().cmake_args.is_empty());
-        assert!(CMakeProfile::default().build_args.is_empty());
-        let profile = CMakeProfile {
-            cmake_args: ["-DMESSAGE=two words", "-DQUOTE=\"hello\"", ""].map(String::from).into(),
-            build_args: ["-j", "8", "--", "LABEL=it's a build"].map(String::from).into(),
-            ..Default::default()
-        };
-        settings.cmake.profiles = Some(vec![profile.clone()]);
-        let value = serde_json::to_value(&settings).unwrap();
-        assert_eq!(value["cmake"]["profiles"][0]["cmakeArgs"], serde_json::json!(profile.cmake_args));
-        assert_eq!(value["cmake"]["profiles"][0]["buildArgs"], serde_json::json!(profile.build_args));
-        assert_eq!(serde_json::from_value::<Settings>(value).unwrap(), settings);
-    }
-
-    #[test]
-    fn ui_font_fallback_defaults_empty_and_round_trips() {
-        let old: Settings = serde_json::from_str(r#"{"appearance":{"useCustomFont":true}}"#).unwrap();
-        assert!(old.appearance.ui_font_fallback.is_empty());
-        for family in ["", "Songti SC", "Maple Mono NF CN"] {
-            let mut settings = Settings::default();
-            settings.appearance.ui_font_fallback = family.into();
-            let json = serde_json::to_value(&settings).unwrap();
-            assert_eq!(json["appearance"]["uiFontFallback"], family);
-            let restored: Settings = serde_json::from_value(json).unwrap();
-            assert_eq!(restored.appearance.ui_font_fallback, family);
-        }
-    }
-
-    #[test]
-    fn tool_window_badges_default_on_and_round_trip() {
-        let old: Settings = serde_json::from_str(r#"{"appearance":{"showToolWindowNames":true}}"#).unwrap();
-        assert!(old.appearance.show_tool_window_badges);
-        assert!(Settings::default().appearance.show_tool_window_badges);
-        for enabled in [false, true] {
-            let mut settings = Settings::default();
-            settings.appearance.show_tool_window_badges = enabled;
-            let json = serde_json::to_value(&settings).unwrap();
-            assert_eq!(json["appearance"]["showToolWindowBadges"], enabled);
-            let restored: Settings = serde_json::from_value(json).unwrap();
-            assert_eq!(restored.appearance.show_tool_window_badges, enabled);
-        }
-    }
-
-    #[test]
-    fn agent_meters_default_and_round_trip() {
-        let old: Settings = serde_json::from_str(r#"{"agents":{"showCost":true}}"#).unwrap();
-        assert!(old.agents.show_cost);
-        assert!(old.agents.show_context_usage && old.agents.show_work_time && old.agents.show_usage_limits);
-        assert!(!Settings::default().agents.show_cost);
-        let mut settings = Settings::default();
-        settings.agents.show_usage_limits = false;
-        let json = serde_json::to_value(&settings).unwrap();
-        assert_eq!(json["agents"]["showUsageLimits"], false);
-        let restored: Settings = serde_json::from_value(json).unwrap();
-        assert_eq!(restored.agents, settings.agents);
-    }
-
-    #[test]
-    fn main_menu_style_defaults_and_round_trips() {
-        let old: Settings = serde_json::from_str(r#"{"appearance":{"compactMode":true}}"#).unwrap();
-        assert_eq!(old.appearance.main_menu_style, "hamburger");
-        let merged: Settings = serde_json::from_str(r#"{"appearance":{"mainMenuStyle":"merged"}}"#).unwrap();
-        assert_eq!(merged.appearance.main_menu_style, "merged");
-        assert_eq!(serde_json::to_value(merged).unwrap()["appearance"]["mainMenuStyle"], "merged");
-    }
-
     #[test]
     fn editor_font_weights_default_to_regular_and_bold() {
         let json = serde_json::to_value(Settings::default()).unwrap();
@@ -1015,58 +691,3 @@ mod tests {
         assert!(Settings::default().files.file_types.is_empty());
     }
 }
-
-#[cfg(test)]
-mod maven_linkage_tests {
-    use super::*;
-
-    #[test]
-    fn maven_linkage_defaults_and_round_trips() {
-        let old: MavenSettings = serde_json::from_str(r#"{"home":"/opt/maven"}"#).unwrap();
-        assert!(old.unlinked_projects.is_empty());
-        let settings =
-            MavenSettings { unlinked_projects: vec!["pom.xml".into(), "services/api/pom.xml".into()], ..old };
-        let encoded = serde_json::to_string(&settings).unwrap();
-        assert!(encoded.contains("unlinkedProjects"));
-        assert_eq!(serde_json::from_str::<MavenSettings>(&encoded).unwrap(), settings);
-    }
-}
-
-#[cfg(test)]
-mod gradle_settings_tests {
-    use super::*;
-
-    #[test]
-    fn defaults_and_round_trip() {
-        let old: JavaSettings = serde_json::from_str(r#"{"jdk":"/jdk"}"#).unwrap();
-        assert_eq!(old.gradle, GradleSettings::default());
-        for distribution in [GradleDistribution::Wrapper, GradleDistribution::Local] {
-            let mut settings = Settings::default();
-            settings.languages.java.gradle = GradleSettings {
-                jvm: "/jdk21".into(),
-                distribution,
-                home: "/gradle".into(),
-                user_home: "/cache/gradle".into(),
-                run_using: GradleRunUsing::Ide,
-            };
-            let restored: Settings = serde_json::from_str(&serde_json::to_string(&settings).unwrap()).unwrap();
-            assert_eq!(restored.languages.java.gradle, settings.languages.java.gradle);
-        }
-    }
-}
-
-#[cfg(test)]
-mod go_module_tests {
-    use super::*;
-    #[test]
-    fn old_go_settings_inherit_module_defaults() {
-        let old: GoSettings = serde_json::from_str(r#"{"goroot":"/go"}"#).unwrap();
-        assert!(old.modules.auto_vendor);
-        assert!(old.modules.env.is_empty());
-        let configured: GoSettings =
-            serde_json::from_str(r#"{"modules":{"autoVendor":false,"env":{"GOPRIVATE":"example.com/private"}}}"#)
-                .unwrap();
-        assert!(!configured.modules.auto_vendor);
-        assert_eq!(configured.modules.env["GOPRIVATE"], "example.com/private");
-    }
-}

crates/ide-core/src/task.rs

@@ -44,39 +44,6 @@ pub fn cancel(id: TaskId) -> bool {
     }
 }
 
-/// A progress title a tool reported, made readable: a leading absolute executable path
-/// (rust-analyzer reports `/…/bin/cargo check`) shows as its program name (`cargo check`).
-pub fn display_title(title: &str) -> String {
-    let is_sep = |c: char| c == '/' || c == '\\';
-    let b = title.as_bytes();
-    let absolute = title.starts_with(is_sep)
-        || (b.len() > 2 && b[0].is_ascii_alphabetic() && b[1] == b':' && is_sep(b[2] as char));
-    if !absolute {
-        return title.to_owned();
-    }
-    // The path runs on through spaces (`Application Support/…`) while the next word still
-    // continues it; the first word without a separator, an option or a new path ends it.
-    let mut end = title.find(' ').unwrap_or(title.len());
-    while end < title.len() {
-        let rest = &title[end + 1..];
-        let word = rest.split(' ').next().unwrap_or_default();
-        if word.is_empty() || !word.contains(is_sep) || word.starts_with(is_sep) || word.starts_with('-') {
-            break;
-        }
-        end += 1 + word.len();
-    }
-    let (path, rest) = title.split_at(end);
-    let name = path.rsplit(is_sep).next().unwrap_or(path);
-    let name = [".exe", ".cmd", ".bat"]
-        .iter()
-        .find_map(|ext| {
-            let cut = name.len().checked_sub(ext.len())?;
-            (name.is_char_boundary(cut) && name[cut..].eq_ignore_ascii_case(ext)).then(|| &name[..cut])
-        })
-        .unwrap_or(name);
-    if name.is_empty() { title.to_owned() } else { format!("{name}{rest}") }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -104,28 +71,4 @@ mod tests {
         assert!(!cancel(other), "an ended task is not cancelled");
         assert_eq!(hits.load(Ordering::SeqCst), 1);
     }
-
-    #[test]
-    fn display_title_shows_a_leading_executable_path_as_its_name() {
-        for (title, shown) in [
-            ("/Users/thomas/Library/Application Support/mbx/bin/cargo check", "cargo check"),
-            ("/home/me/.cargo/bin/cargo clippy (#2)", "cargo clippy (#2)"),
-            (
-                "/opt/my tools/bin/cargo check --manifest-path /x/Cargo.toml",
-                "cargo check --manifest-path /x/Cargo.toml",
-            ),
-            (r"C:\Users\me\.cargo\bin\cargo.exe check", "cargo check"),
-            (r"C:\Program Files\Rust\bin\cargo.EXE check", "cargo check"),
-            (r"\\server\share\tools\x.cmd build", "x build"),
-            ("/usr/bin/make", "make"),
-            ("cargo check", "cargo check"),
-            ("Indexing", "Indexing"),
-            ("Building compile-time-deps", "Building compile-time-deps"),
-            ("Loading /src/app (2/3)", "Loading /src/app (2/3)"),
-            ("/", "/"),
-            ("", ""),
-        ] {
-            assert_eq!(display_title(title), shown, "{title:?}");
-        }
-    }
 }

crates/ide-core/src/text.rs

@@ -97,88 +97,15 @@ pub struct TextEdit {
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
 pub struct WorkspaceEdit {
     pub files: Vec<FileEdit>,
-    /// Content fingerprints captured before presenting an edit for confirmation.
-    #[serde(default)]
-    #[specta(optional)]
-    pub preconditions: Vec<WorkspaceEditPrecondition>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-pub struct WorkspaceEditPrecondition {
-    pub path: crate::IpcPath,
-    pub hash: String,
-}
-
-impl WorkspaceEdit {
-    /// Coalesces aliases of the same file before applying edits against its original text.
-    /// Resource operations separate batches because later edits may use the new contents.
-    pub fn deduplicate(&mut self) {
-        let mut files = Vec::new();
-        let mut batch = std::collections::HashMap::<std::path::PathBuf, usize>::new();
-        let mut resolve_aliases = true;
-        for file in std::mem::take(&mut self.files) {
-            match file {
-                FileEdit::Edit { path, edits, version } => {
-                    let path = if resolve_aliases {
-                        dunce::canonicalize(&path).unwrap_or_else(|_| path.to_path_buf())
-                    } else {
-                        path.to_path_buf()
-                    };
-                    let index = *batch.entry(path.clone()).or_insert_with(|| {
-                        files.push(FileEdit::Edit { path: path.clone().into(), edits: Vec::new(), version });
-                        files.len() - 1
-                    });
-                    let FileEdit::Edit { edits: own, version: expected, .. } = &mut files[index] else {
-                        unreachable!()
-                    };
-                    if expected.is_some() && version.is_some() && *expected != version {
-                        // Keep incompatible constraints so application rejects them
-                        // before changing any file instead of silently losing one.
-                        files.push(FileEdit::Edit { path: path.into(), edits, version });
-                        continue;
-                    }
-                    *expected = expected.or(version);
-                    for edit in edits {
-                        if !own.contains(&edit) {
-                            own.push(edit);
-                        }
-                    }
-                }
-                op => {
-                    batch.clear();
-                    // Later paths refer to a filesystem state the resource operation has yet to create.
-                    resolve_aliases = false;
-                    files.push(op);
-                }
-            }
-        }
-        self.files = files;
-    }
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
 #[serde(tag = "kind", rename_all = "camelCase")]
 pub enum FileEdit {
-    Edit {
-        path: crate::IpcPath,
-        edits: Vec<TextEdit>,
-        /// LSP TextDocumentEdit version; null/unversioned edits use content preconditions.
-        #[serde(default)]
-        #[specta(optional)]
-        version: Option<i32>,
-    },
-    Create {
-        path: crate::IpcPath,
-        overwrite: bool,
-    },
-    Rename {
-        from: crate::IpcPath,
-        to: crate::IpcPath,
-    },
-    Delete {
-        path: crate::IpcPath,
-        recursive: bool,
-    },
+    Edit { path: crate::IpcPath, edits: Vec<TextEdit> },
+    Create { path: crate::IpcPath, overwrite: bool },
+    Rename { from: crate::IpcPath, to: crate::IpcPath },
+    Delete { path: crate::IpcPath, recursive: bool },
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, Type)]
@@ -276,35 +203,3 @@ pub struct OutlineItem {
 
 /// Fuzzy-match highlight: indices (in chars of the displayed string) that matched.
 pub type MatchIndices = Vec<u32>;
-
-#[cfg(all(test, unix))]
-mod workspace_edit_tests {
-    use super::*;
-
-    #[test]
-    fn aliases_are_one_edit_but_resource_operations_preserve_order() {
-        let dir = tempfile::tempdir().unwrap();
-        let real = dir.path().join("main.cpp");
-        let alias = dir.path().join("alias.cpp");
-        std::fs::write(&real, "add()").unwrap();
-        std::os::unix::fs::symlink(&real, &alias).unwrap();
-        let change = TextEdit { range: Range::new(Pos::new(0, 0), Pos::new(0, 3)), new_text: "sum_values".into() };
-        let edit = |path: PathBuf| FileEdit::Edit { path: path.into(), edits: vec![change.clone()], version: None };
-        let mut workspace = WorkspaceEdit {
-            files: vec![
-                edit(real.clone()),
-                edit(alias),
-                FileEdit::Create { path: dir.path().join("other").into(), overwrite: false },
-                edit(real),
-            ],
-            ..Default::default()
-        };
-        workspace.deduplicate();
-        assert_eq!(workspace.files.len(), 3);
-        let FileEdit::Edit { edits, .. } = &workspace.files[0] else { panic!() };
-        assert_eq!(edits, &[change]);
-        let once = workspace.clone();
-        workspace.deduplicate();
-        assert_eq!(workspace, once);
-    }
-}

crates/ide-core/src/tool_path.rs

@@ -1,233 +0,0 @@
-//! Where the IDE looks up the executables it runs: language servers, the tools
-//! their settings come from, installers. An app started from the desktop gets a
-//! minimal `PATH`, and version managers set theirs up in shell rc files.
-
-use crate::process::{host_var_os, login_env};
-use crate::version_managers;
-use std::collections::HashSet;
-use std::ffi::{OsStr, OsString};
-use std::path::{Path, PathBuf};
-
-/// Where executables are looked up: this process's `PATH` (the login shell's in the
-/// app), the login shell's `PATH` as last read, then per-user directories and mise's,
-/// asdf's and pyenv's shims, for when the shell's setup didn't reach the app. Language server
-/// launchers, their settings hooks and tool detection all look here, so a settings
-/// hook finds the executable its server is launched from.
-pub fn search_path() -> OsString {
-    let home = std::env::var_os("HOME").or_else(|| std::env::var_os("USERPROFILE")).map(PathBuf::from);
-    let shell_path = login_env().and_then(|env| env.iter().find(|(k, _)| k == "PATH").map(|(_, v)| v.clone()));
-    let shims: Vec<PathBuf> = version_managers::managers().iter().map(|m| m.shims()).collect();
-    // The Windows user `PATH` may not reach a process started before it was set; append its
-    // entries after the inherited ones so missing user tools still resolve.
-    let user_path = crate::process::user_path();
-    let dirs = search_dirs(
-        host_var_os("PATH").as_deref(),
-        shell_path.as_deref(),
-        user_path.as_deref(),
-        home.as_deref(),
-        &shims,
-    );
-    std::env::join_paths(dirs).unwrap_or_default()
-}
-
-/// Resolves a command on the shared path, or an explicit path relative to `root`.
-pub fn find_command(command: &str, search: &OsStr, root: &Path) -> Option<PathBuf> {
-    let path = Path::new(command);
-    let explicit = path.parent().is_some_and(|p| !p.as_os_str().is_empty());
-    let pathext = host_var_os("PATHEXT");
-    let names = crate::process::executable_names(command, cfg!(windows), pathext.as_deref().and_then(OsStr::to_str));
-    let dirs = if explicit {
-        vec![root.to_path_buf()]
-    } else {
-        std::env::split_paths(search).filter(|p| !p.as_os_str().is_empty()).map(|p| root.join(p)).collect()
-    };
-    dirs.into_iter().find_map(|dir| names.iter().map(|name| dir.join(name)).find(|p| is_executable(p)))
-}
-
-fn is_executable(path: &Path) -> bool {
-    let Ok(metadata) = path.metadata() else { return false };
-    if !metadata.is_file() {
-        return false;
-    }
-    #[cfg(unix)]
-    {
-        use std::os::unix::fs::PermissionsExt;
-        metadata.permissions().mode() & 0o111 != 0
-    }
-    #[cfg(not(unix))]
-    true
-}
-
-/// [`search_path`]'s directories, in order and once each. Only absolute ones: a
-/// relative entry (`.`, `node_modules/.bin`) resolves against the project, which
-/// could then supply the tools the IDE runs. One that can't be joined (a `:` in a
-/// directory name) is left out rather than failing the whole path.
-fn search_dirs(
-    process_path: Option<&OsStr>,
-    shell_path: Option<&OsStr>,
-    user_path: Option<&OsStr>,
-    home: Option<&Path>,
-    shims: &[PathBuf],
-) -> Vec<PathBuf> {
-    let mut dirs: Vec<PathBuf> =
-        process_path.into_iter().chain(shell_path).chain(user_path).flat_map(std::env::split_paths).collect();
-    if let Some(home) = home {
-        dirs.extend(USER_DIRS.iter().map(|d| home.join(d)));
-        dirs.extend(nvm_bins(&home.join(".nvm/versions/node")));
-    }
-    // Version managers' shims after real tool directories: a shim exists for a command any
-    // installed version has, and fails when the selected one lacks it. Before the system's,
-    // as the managers' shell setup puts them.
-    dirs.extend(home.map(|h| h.join(".pyenv/shims")));
-    dirs.extend(shims.iter().cloned());
-    dirs.extend(SYSTEM_DIRS.iter().map(PathBuf::from));
-    let mut seen = HashSet::new();
-    dirs.retain(|d| d.is_absolute() && std::env::join_paths([d]).is_ok() && seen.insert(d.clone()));
-    dirs
-}
-
-/// Tool directories below the home directory.
-const USER_DIRS: &[&str] = &[
-    ".cargo/bin",
-    ".local/bin",
-    "go/bin",
-    // `dotnet tool install --global` puts fsautocomplete, csharp-ls and friends here.
-    ".dotnet/tools",
-    ".bun/bin",
-    ".deno/bin",
-    ".npm-global/bin",
-    ".volta/bin",
-    // Set up in shell rc files: fnm's default Node and pnpm's global bin (Linux, then macOS).
-    ".local/share/fnm/aliases/default/bin",
-    "Library/Application Support/fnm/aliases/default/bin",
-    ".fnm/aliases/default/bin",
-    ".local/share/pnpm/bin",
-    ".local/share/pnpm",
-    "Library/pnpm/bin",
-    "Library/pnpm",
-];
-
-const SYSTEM_DIRS: &[&str] = &["/opt/homebrew/bin", "/usr/local/go/bin", "/usr/local/bin", "/usr/bin", "/bin"];
-
-/// Whether `dir` is one of the system's own bin directories, which [`search_path`] adds
-/// whatever `PATH` holds.
-pub fn is_system_dir(dir: &Path) -> bool {
-    SYSTEM_DIRS.iter().any(|d| Path::new(d) == dir)
-}
-
-/// The `bin` directories of nvm's Node versions in `dir`, newest first.
-fn nvm_bins(dir: &Path) -> Vec<PathBuf> {
-    let mut versions: Vec<(Vec<u64>, PathBuf)> = std::fs::read_dir(dir)
-        .into_iter()
-        .flatten()
-        .flatten()
-        .map(|e| (version_key(&e.file_name().to_string_lossy()), e.path().join("bin")))
-        .collect();
-    versions.sort();
-    versions.into_iter().rev().map(|(_, bin)| bin).collect()
-}
-
-/// `v22.10.1` as `[22, 10, 1]`: v22 is newer than v9, v20.10 newer than v20.9.
-fn version_key(name: &str) -> Vec<u64> {
-    name.trim_start_matches('v').split('.').map(|n| n.parse().unwrap_or(0)).collect()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn commands_resolve_on_path_and_explicit_paths_under_root() {
-        let dir = tempfile::tempdir().unwrap();
-        let bin = dir.path().join("bin");
-        std::fs::create_dir(&bin).unwrap();
-        let name = if cfg!(windows) { "ngserver.cmd" } else { "ngserver" };
-        std::fs::write(bin.join(name), "").unwrap();
-        #[cfg(unix)]
-        {
-            use std::os::unix::fs::PermissionsExt;
-            std::fs::set_permissions(bin.join(name), std::fs::Permissions::from_mode(0o755)).unwrap();
-        }
-        let search = std::env::join_paths([&bin]).unwrap();
-        assert_eq!(find_command("ngserver", &search, dir.path()), Some(bin.join(name)));
-        assert_eq!(find_command("bin/ngserver", &search, dir.path()), Some(bin.join(name)));
-        assert_eq!(find_command(bin.join(name).to_str().unwrap(), &search, dir.path()), Some(bin.join(name)));
-        assert_eq!(find_command("absent", &search, dir.path()), None);
-        for command in ["bin/ngserver", bin.join(name).to_str().unwrap()] {
-            assert_eq!(find_command(command, OsStr::new(""), dir.path()), Some(bin.join(name)));
-        }
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn non_executable_files_do_not_shadow_commands() {
-        use std::os::unix::fs::PermissionsExt;
-        let tmp = tempfile::tempdir().unwrap();
-        let dirs = [tmp.path().join("first"), tmp.path().join("second")];
-        for (dir, mode) in dirs.iter().zip([0o644, 0o755]) {
-            std::fs::create_dir(dir).unwrap();
-            let file = dir.join("ngserver");
-            std::fs::write(&file, "#!/bin/sh\n").unwrap();
-            std::fs::set_permissions(file, std::fs::Permissions::from_mode(mode)).unwrap();
-        }
-        let path = std::env::join_paths(&dirs).unwrap();
-        assert_eq!(find_command("ngserver", &path, tmp.path()), Some(dirs[1].join("ngserver")));
-        assert_eq!(find_command("first/ngserver", &path, tmp.path()), None);
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn search_dirs_put_the_process_path_first_and_shims_after_real_tools() {
-        let shims = [PathBuf::from("/home/me/.local/share/mise/shims"), "/home/me/.asdf/shims".into()];
-        let dirs = search_dirs(
-            Some(OsStr::new("/usr/bin:.:node_modules/.bin:/opt/tools")),
-            // nushell prints `$PATH` as is.
-            Some(OsStr::new("$PATH:/opt/tools:/home/me/.asdf/shims")),
-            None,
-            Some(Path::new("/home/me")),
-            &shims,
-        );
-        let at = |d: &str| dirs.iter().position(|p| p == Path::new(d)).unwrap();
-        assert_eq!(dirs[..3], [PathBuf::from("/usr/bin"), "/opt/tools".into(), "/home/me/.asdf/shims".into()]);
-        assert!(at("/home/me/.npm-global/bin") < at("/home/me/.pyenv/shims"));
-        // Global .NET tools (fsautocomplete, csharp-ls) install here, off PATH.
-        assert!(at("/home/me/.dotnet/tools") < at("/usr/local/bin"));
-        assert!(at("/home/me/.local/share/mise/shims") < at("/usr/local/bin"));
-        assert!(dirs.iter().all(|d| d.is_absolute()));
-        let unique: HashSet<&PathBuf> = dirs.iter().collect();
-        assert_eq!(unique.len(), dirs.len());
-        // A `:` can't be in a `PATH` entry: those below such a home are left out.
-        let dirs = search_dirs(Some(OsStr::new("/usr/bin")), None, None, Some(Path::new("/home/a:b")), &[]);
-        assert!(dirs.contains(&PathBuf::from("/usr/bin")) && !dirs.iter().any(|d| d.starts_with("/home")));
-    }
-
-    #[test]
-    fn search_dirs_append_user_path_entries_once_after_the_inherited_path() {
-        let (system, dup, usertool) =
-            if cfg!(windows) { ("C:/system", "C:/dup", "C:/usertool") } else { ("/system", "/dup", "/usertool") };
-        let home = Path::new(if cfg!(windows) { "C:/home/me" } else { "/home/me" });
-        let join = |dirs: &[&str]| std::env::join_paths(dirs.iter().map(PathBuf::from)).unwrap();
-        let inherited = join(&[system, dup]);
-        let user = join(&[dup, usertool]);
-        let dirs = search_dirs(Some(inherited.as_os_str()), None, Some(user.as_os_str()), Some(home), &[]);
-        let at = |d: &str| dirs.iter().position(|p| p == Path::new(d)).unwrap();
-        // User entries follow the inherited PATH, de-duplicated, ahead of the fallbacks.
-        assert_eq!(dirs.iter().filter(|d| *d == Path::new(dup)).count(), 1);
-        assert!(at(dup) < at(usertool));
-        // And before this platform's home/system fallbacks.
-        let fallback = dirs.iter().position(|d| d == &home.join(USER_DIRS[0])).unwrap();
-        assert!(at(usertool) < fallback);
-    }
-
-    #[test]
-    fn nvm_versions_newest_first() {
-        let dir = std::env::temp_dir().join(format!("openidea-nvm-{}", std::process::id()));
-        for v in ["v9.11.2", "v20.9.0", "v22.1.0", "v20.10.0"] {
-            std::fs::create_dir_all(dir.join(v).join("bin")).unwrap();
-        }
-        let bins = nvm_bins(&dir);
-        std::fs::remove_dir_all(&dir).unwrap();
-        let names: Vec<_> = bins.iter().map(|b| b.parent().unwrap().file_name().unwrap().to_owned()).collect();
-        assert_eq!(names, ["v22.1.0", "v20.10.0", "v20.9.0", "v9.11.2"]);
-    }
-}

crates/ide-core/src/version_managers.rs

@@ -18,7 +18,6 @@ pub enum Tool {
     Go,
     Maven,
     Gradle,
-    Ruby,
 }
 
 impl Tool {
@@ -31,7 +30,6 @@ impl Tool {
             Tool::Go => &["go", "golang"],
             Tool::Maven => &["maven"],
             Tool::Gradle => &["gradle"],
-            Tool::Ruby => &["ruby"],
         }
     }
 }

crates/ide-core/src/workflow_settings.rs

@@ -41,8 +41,6 @@ impl Default for VcsSettings {
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
 #[serde(default, rename_all = "camelCase")]
 pub struct GitSettings {
-    /// Show blame after the current editor line.
-    pub inline_blame: bool,
     /// Path to the git executable; empty = auto-detect.
     pub executable: String,
     /// Default of Update Project: `merge` | `rebase`.
@@ -73,7 +71,6 @@ pub struct GitSettings {
 impl Default for GitSettings {
     fn default() -> Self {
         Self {
-            inline_blame: false,
             executable: String::new(),
             update_method: "merge".into(),
             auto_update_on_push_rejected: false,

crates/ide-coverage/src/lib.rs

@@ -213,12 +213,8 @@ pub fn collect(spec: &CoverageReportSpec) -> IdeResult<CoverageSuite> {
                 .output()
                 .map_err(|e| IdeError::unavailable(format!("cannot run {program}: {e}")))?;
             if !out.status.success() {
-                let text = ide_core::output_encoding::decode_tool_output(&out.stderr).trim().to_owned();
-                let text = if text.is_empty() {
-                    ide_core::output_encoding::decode_tool_output(&out.stdout).trim().to_owned()
-                } else {
-                    text
-                };
+                let text = String::from_utf8_lossy(&out.stderr).trim().to_owned();
+                let text = if text.is_empty() { String::from_utf8_lossy(&out.stdout).trim().to_owned() } else { text };
                 return Err(IdeError::not_found(format!("exporting the coverage data failed: {text}")));
             }
             let text = read_report(lcov)?;

crates/ide-dap/Cargo.toml

@@ -6,7 +6,6 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
-tempfile.workspace = true
 ide-core.workspace = true
 ide-language.workspace = true
 ide-jsonrpc.workspace = true

crates/ide-dap/src/adapter.rs

@@ -8,7 +8,7 @@
 
 use ide_core::process::executable_names;
 use ide_core::{IdeError, IdeResult};
-use ide_language::{DebuggerConfig, LanguageRegistry, ProgramPin};
+use ide_language::{DebuggerConfig, LanguageRegistry};
 use std::future::Future;
 use std::path::{Path, PathBuf};
 use std::pin::Pin;
@@ -44,8 +44,6 @@ pub struct AdapterSpec {
     /// `host:port` of an adapter inside another program (the Godot editor): connected to
     /// when it accepts, else `command` is started.
     pub connect: Option<String>,
-    /// A plugin language's adapter: start exactly this approved program.
-    pub pinned: Option<ProgramPin>,
 }
 
 /// Built-in adapters used when no language definition names `adapter`.
@@ -57,7 +55,6 @@ fn builtin(adapter: &str) -> Option<DebuggerConfig> {
         transport: transport.to_owned(),
         connect: None,
         install_hint: Some(hint.to_owned()),
-        pinned: None,
     };
     Some(match adapter {
         "codelldb" => cfg(
@@ -66,12 +63,6 @@ fn builtin(adapter: &str) -> Option<DebuggerConfig> {
             "tcp",
             "Install the CodeLLDB adapter (https://github.com/vadimcn/codelldb/releases) and put `codelldb` on PATH",
         ),
-        "kotlin-debug-adapter" => cfg(
-            "kotlin-debug-adapter",
-            &[],
-            "stdio",
-            "Install the Kotlin Debug Adapter from Settings > Language Servers",
-        ),
         "debugpy" => cfg("python3", &["-m", "debugpy.adapter"], "stdio", "pip install debugpy"),
         "js-debug" => cfg(
             "js-debug-adapter",
@@ -136,7 +127,6 @@ pub fn resolve(config: &DebuggerConfig, cwd: PathBuf) -> AdapterSpec {
         env: Vec::new(),
         server_host: None,
         connect: config.connect.clone(),
-        pinned: config.pinned.clone(),
     }
 }
 
@@ -352,17 +342,8 @@ pub struct AdapterIo {
     pub port: Option<u16>,
     /// Recent stderr lines of the adapter process, for error messages.
     pub stderr: Arc<parking_lot::Mutex<Vec<String>>>,
-    /// (category, line) printed by the debuggee when it shares the adapter's stdio.
-    pub program_output: Option<ProgramOutput>,
 }
 
-pub type ProgramOutput = tokio::sync::mpsc::UnboundedReceiver<(&'static str, String)>;
-type ProgramSink = tokio::sync::mpsc::UnboundedSender<(&'static str, String)>;
-
-/// Delve's debuggee inherits its stdio; no DAP output event carries what the program prints.
-const SHARES_STDIO: &str = "delve";
-const DELVE_BANNER: &str = "DAP server listening at:";
-
 pub type LaunchFuture = Pin<Box<dyn Future<Output = IdeResult<AdapterIo>> + Send>>;
 
 /// Starts adapters. Tests substitute in-memory adapters.
@@ -398,7 +379,6 @@ impl AdapterLauncher for ProcessLauncher {
                     child: None,
                     port: Some(port),
                     stderr,
-                    program_output: None,
                 });
             }
             let embedded = match spec.connect.as_deref().filter(|_| spec.transport == Transport::Tcp) {
@@ -421,7 +401,6 @@ impl AdapterLauncher for ProcessLauncher {
                     child: None,
                     port: Some(*port),
                     stderr,
-                    program_output: None,
                 });
             }
             if spec.adapter == DEBUGPY_TOOL {
@@ -430,20 +409,12 @@ impl AdapterLauncher for ProcessLauncher {
             if is_plugin_bundle(&spec.command) {
                 return Err(not_standalone(&spec));
             }
-            let binary = match spec.pinned.clone() {
-                Some(pin) => tokio::task::spawn_blocking(move || pin.verify().map(Path::to_path_buf))
-                    .await
-                    .map_err(|e| IdeError::internal(e.to_string()))?
-                    .map_err(|e| IdeError::new(ide_core::error::ErrorKind::PermissionDenied, e))?,
-                None => {
-                    let (command, cwd) = (spec.command.clone(), spec.cwd.clone());
-                    tokio::task::spawn_blocking(move || resolve_binary(&command, &cwd))
-                        .await
-                        .ok()
-                        .flatten()
-                        .ok_or_else(|| missing(&spec))?
-                }
-            };
+            let (command, cwd) = (spec.command.clone(), spec.cwd.clone());
+            let binary = tokio::task::spawn_blocking(move || resolve_binary(&command, &cwd))
+                .await
+                .ok()
+                .flatten()
+                .ok_or_else(|| missing(&spec))?;
             let port = match spec.transport {
                 // An embedded adapter started without `${port}` listens on its usual address.
                 Transport::Tcp => match &embedded {
@@ -468,14 +439,8 @@ impl AdapterLauncher for ProcessLauncher {
                 .kill_on_drop(true);
             let mut child =
                 cmd.spawn().map_err(|e| IdeError::unavailable(format!("failed to start {}: {e}", binary.display())))?;
-            let (program_sink, program_output) = if spec.adapter == SHARES_STDIO {
-                let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
-                (Some(tx), Some(rx))
-            } else {
-                (None, None)
-            };
             if let Some(err) = child.stderr.take() {
-                pump_lines(err, spec.adapter.clone(), stderr.clone(), program_sink.clone().map(|tx| (tx, "stderr")));
+                pump_lines(err, spec.adapter.clone(), stderr.clone());
             }
             match port {
                 None => {
@@ -487,12 +452,11 @@ impl AdapterLauncher for ProcessLauncher {
                         child: Some(child),
                         port: None,
                         stderr,
-                        program_output,
                     })
                 }
                 Some(port) => {
                     if let Some(out) = child.stdout.take() {
-                        pump_lines(out, spec.adapter.clone(), stderr.clone(), program_sink.map(|tx| (tx, "stdout")));
+                        pump_lines(out, spec.adapter.clone(), stderr.clone());
                     }
                     let timeout = if embedded.is_some() { EMBEDDED_START_TIMEOUT } else { CONNECT_TIMEOUT };
                     let stream = match connect_with_retries(LOOPBACK, port, Some(&mut child), timeout).await {
@@ -514,7 +478,6 @@ impl AdapterLauncher for ProcessLauncher {
                         child: Some(child),
                         port: Some(port),
                         stderr,
-                        program_output,
                     })
                 }
             }
@@ -526,15 +489,9 @@ fn pump_lines<R: AsyncRead + Unpin + Send + 'static>(
     stream: R,
     name: String,
     sink: Arc<parking_lot::Mutex<Vec<String>>>,
-    program: Option<(ProgramSink, &'static str)>,
 ) {
     tokio::spawn(ide_jsonrpc::output::read_lines(stream, move |line| {
         tracing::debug!(target: "ide_dap::adapter", "[{name}] {line}");
-        if let Some((tx, category)) = &program
-            && !line.starts_with(DELVE_BANNER)
-        {
-            let _ = tx.send((category, format!("{line}\n")));
-        }
         push_line(&sink, line);
     }));
 }
@@ -586,18 +543,6 @@ async fn connect_with_retries(
 mod tests {
     use super::*;
 
-    #[tokio::test]
-    async fn program_output_is_forwarded_without_the_adapter_banner() {
-        let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
-        let sink = Arc::default();
-        let text: &[u8] = b"DAP server listening at: 127.0.0.1:1\n[hello two words]\nno newline";
-        pump_lines(text, "delve".into(), Arc::clone(&sink), Some((tx, "stdout")));
-        assert_eq!(rx.recv().await, Some(("stdout", "[hello two words]\n".into())));
-        assert_eq!(rx.recv().await, Some(("stdout", "no newline\n".into())));
-        assert_eq!(rx.recv().await, None);
-        assert_eq!(sink.lock().len(), 3);
-    }
-
     /// Managed tools win over `PATH`, and debugpy falls back to the private copy.
     #[cfg(unix)]
     #[tokio::test]

crates/ide-dap/src/cargo.rs

@@ -70,10 +70,8 @@ pub async fn build(
     let on_output = std::sync::Arc::new(on_output);
     let err_out = on_output.clone();
     let err_task = tokio::spawn(async move {
-        let mut lines = BufReader::new(stderr).split(b'\n');
-        while let Ok(Some(line)) = lines.next_segment().await {
-            let line = ide_core::output_encoding::decode_tool_output(&line);
-            let line = line.trim_end_matches('\r');
+        let mut lines = BufReader::new(stderr).lines();
+        while let Ok(Some(line)) = lines.next_line().await {
             err_out(format!("{line}\n"));
         }
     });

crates/ide-dap/src/kotlin.rs

@@ -1,218 +0,0 @@
-//! Package-aligned sources for fwcd's path-based class resolver. Never write into a project.
-use ide_core::{IdeError, IdeResult};
-use serde_json::Value;
-use std::{
-    collections::HashMap,
-    fs,
-    path::{Path, PathBuf},
-};
-
-pub const ADAPTER: &str = "kotlin-debug-adapter";
-
-pub struct SourceMirror {
-    dir: tempfile::TempDir,
-    paths: HashMap<PathBuf, PathBuf>,
-    copies: Vec<(PathBuf, PathBuf)>,
-    source_dir: PathBuf,
-    roots: HashMap<PathBuf, usize>,
-}
-
-impl SourceMirror {
-    pub fn create(project: &Path) -> IdeResult<Self> {
-        let base = fs::canonicalize(std::env::temp_dir())?;
-        // Check before creating anything, including when TMPDIR points into a project.
-        if base.starts_with(fs::canonicalize(project)?) {
-            return Err(IdeError::invalid("Kotlin source mirror must be outside the project"));
-        }
-        let dir = tempfile::Builder::new().prefix("openidea-kotlin-").tempdir_in(base)?;
-        let source_dir = if project.join("src").is_dir() { project.join("src") } else { project.to_owned() };
-        let mut mirror = Self {
-            dir,
-            paths: HashMap::new(),
-            copies: Vec::new(),
-            source_dir: source_dir.clone(),
-            roots: HashMap::new(),
-        };
-        mirror.scan(&source_dir)?;
-        Ok(mirror)
-    }
-
-    pub fn root(&self) -> &Path {
-        self.dir.path()
-    }
-
-    fn scan(&mut self, dir: &Path) -> IdeResult<()> {
-        for entry in fs::read_dir(dir)? {
-            let entry = entry?;
-            let path = entry.path();
-            let kind = entry.file_type()?;
-            if kind.is_dir() {
-                if !matches!(
-                    entry.file_name().to_str(),
-                    Some(".git" | ".gradle" | "build" | "target" | "node_modules" | ".idea" | ".openidea")
-                ) {
-                    self.scan(&path)?;
-                }
-            } else if matches!(path.extension().and_then(|s| s.to_str()), Some("kt" | "java")) {
-                self.add(&path)?;
-            }
-        }
-        Ok(())
-    }
-
-    fn add(&mut self, real: &Path) -> IdeResult<()> {
-        if self.paths.contains_key(real) {
-            return Ok(());
-        }
-        let Ok(text) = fs::read_to_string(real) else {
-            tracing::debug!("Kotlin debug mirror: skipping unreadable {}", real.display());
-            return Ok(());
-        };
-        let language = if real.extension().is_some_and(|e| e == "java") { "java" } else { "kotlin" };
-        let relative = real.strip_prefix(&self.source_dir).unwrap_or(real);
-        let mut components = relative.components();
-        let source_set = components.next().map(|c| PathBuf::from(c.as_os_str())).unwrap_or_default();
-        let next_root = self.roots.len();
-        let index = *self.roots.entry(source_set).or_insert(next_root);
-        let mut mirror = self.root().join(format!("root{index}")).join("src/main").join(language);
-        for part in package(&text).split('.').filter(|s| !s.is_empty()) {
-            if part == ".." || part.contains(['/', '\\']) {
-                tracing::debug!("Kotlin debug mirror: skipping {} (invalid package)", real.display());
-                return Ok(());
-            }
-            mirror.push(part);
-        }
-        mirror.push(real.file_name().ok_or_else(|| IdeError::invalid("Source has no filename"))?);
-        // Same package and file name in one source set (e.g. main and test of a module):
-        // the first wins; breakpoints in the other stay unverified instead of failing the session.
-        if self.paths.values().any(|p| p == &mirror) {
-            tracing::debug!("Kotlin debug mirror: skipping ambiguous {}", real.display());
-            return Ok(());
-        }
-        fs::create_dir_all(mirror.parent().unwrap())?;
-        if link(real, &mirror).is_err() {
-            fs::copy(real, &mirror)?;
-            self.copies.push((real.to_owned(), mirror.clone()));
-        }
-        self.paths.insert(real.to_owned(), mirror);
-        Ok(())
-    }
-
-    pub fn adapter_path(&self, real: &Path) -> Option<PathBuf> {
-        self.paths.get(real).cloned()
-    }
-    pub fn client_path(&self, mirror: &Path) -> Option<PathBuf> {
-        self.paths.iter().find_map(|(real, p)| (p == mirror).then(|| real.clone()))
-    }
-    pub fn refresh(&mut self) -> IdeResult<()> {
-        for (real, mirror) in &self.copies {
-            if real.is_file() {
-                fs::copy(real, mirror)?;
-            }
-        }
-        self.scan(&self.source_dir.clone())
-    }
-    pub fn translate(&self, value: &mut Value) {
-        match value {
-            Value::Object(obj) => {
-                if let Some(path) = obj.get("path").and_then(Value::as_str).and_then(|p| self.client_path(Path::new(p)))
-                {
-                    obj.insert("path".into(), Value::String(path.to_string_lossy().into_owned()));
-                }
-                for child in obj.values_mut() {
-                    self.translate(child);
-                }
-            }
-            Value::Array(items) => {
-                for child in items {
-                    self.translate(child);
-                }
-            }
-            _ => {}
-        }
-    }
-}
-
-#[cfg(unix)]
-fn link(real: &Path, mirror: &Path) -> std::io::Result<()> {
-    std::os::unix::fs::symlink(real, mirror)
-}
-#[cfg(windows)]
-fn link(real: &Path, mirror: &Path) -> std::io::Result<()> {
-    std::os::windows::fs::symlink_file(real, mirror)
-}
-
-// Remove comments before reading the package directive (including nested Kotlin block comments).
-fn package(text: &str) -> String {
-    let mut clean = String::new();
-    let mut chars = text.chars().peekable();
-    let mut depth = 0;
-    while let Some(c) = chars.next() {
-        if c == '/' && chars.peek() == Some(&'*') {
-            chars.next();
-            depth += 1;
-            clean.push(' ');
-        } else if depth > 0 && c == '*' && chars.peek() == Some(&'/') {
-            chars.next();
-            depth -= 1;
-        } else if depth == 0 && c == '/' && chars.peek() == Some(&'/') {
-            for c in chars.by_ref() {
-                if c == '\n' {
-                    clean.push('\n');
-                    break;
-                }
-            }
-        } else if depth == 0 {
-            clean.push(c);
-        }
-    }
-    clean
-        .lines()
-        .find_map(|line| {
-            let rest = line.trim().strip_prefix("package")?;
-            if !rest.starts_with(char::is_whitespace) {
-                return None;
-            }
-            Some(rest.split(';').next().unwrap_or_default().trim().replace('`', ""))
-        })
-        .unwrap_or_default()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    #[test]
-    fn external_mirror_round_trip_and_cleanup() {
-        let project = tempfile::tempdir().unwrap();
-        let real = project.path().join("Main.kt");
-        fs::write(&real, "/* package wrong */\npackage org.example\nfun main() {}\n").unwrap();
-        let mirror = SourceMirror::create(project.path()).unwrap();
-        let path = mirror.adapter_path(&real).unwrap();
-        assert!(!path.starts_with(project.path()));
-        assert!(path.ends_with("src/main/kotlin/org/example/Main.kt"));
-        assert_eq!(fs::read_to_string(&path).unwrap(), fs::read_to_string(&real).unwrap());
-        let mut payload =
-            serde_json::json!({"stackFrames": [{"source": {"path": path}, "line": 6}], "source": {"path": path}});
-        mirror.translate(&mut payload);
-        assert_eq!(payload["stackFrames"][0]["source"]["path"], real.to_string_lossy().as_ref());
-        assert_eq!(payload["source"]["path"], real.to_string_lossy().as_ref());
-        let root = mirror.root().to_owned();
-        drop(mirror);
-        assert!(!root.exists());
-        assert!(real.exists());
-    }
-    #[test]
-    fn copies_refresh_after_save() {
-        let project = tempfile::tempdir().unwrap();
-        let real = project.path().join("Main.java");
-        fs::write(&real, "package example;\nclass Main {}\n").unwrap();
-        let mut mirror = SourceMirror::create(project.path()).unwrap();
-        let path = mirror.adapter_path(&real).unwrap();
-        fs::remove_file(&path).unwrap();
-        fs::copy(&real, &path).unwrap();
-        mirror.copies.push((real.clone(), path.clone()));
-        fs::write(&real, "package example;\nclass Main { int i; }\n").unwrap();
-        mirror.refresh().unwrap();
-        assert_eq!(fs::read(&path).unwrap(), fs::read(&real).unwrap());
-    }
-}

crates/ide-dap/src/kotlin_jdwp.rs

@@ -1,166 +0,0 @@
-//! Keep a suspended JVM stopped until Kotlin's adapter has installed its listeners.
-//! The official 0.4.4 adapter resumes VMStart while constructing its debuggee, before
-//! installing breakpoint hooks. DAP attach completes only after those hooks exist.
-use ide_core::IdeResult;
-use std::{io, time::Duration};
-use tokio::{
-    io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt},
-    net::{TcpListener, TcpStream},
-    sync::oneshot,
-    task::JoinHandle,
-};
-
-pub(crate) struct StartupRelay {
-    release: Option<oneshot::Sender<()>>,
-    task: JoinHandle<()>,
-}
-
-impl StartupRelay {
-    pub async fn start(host: String, port: u16) -> IdeResult<(Self, u16)> {
-        let listener = TcpListener::bind(("127.0.0.1", 0)).await?;
-        let local = listener.local_addr()?.port();
-        let (release, ready) = oneshot::channel();
-        let task = tokio::spawn(async move {
-            let connect = async {
-                let (adapter, _) = listener.accept().await?;
-                let jvm = TcpStream::connect((host.as_str(), port)).await?;
-                adapter.set_nodelay(true)?;
-                jvm.set_nodelay(true)?;
-                Ok::<_, io::Error>((adapter, jvm))
-            };
-            if let Ok(Ok((adapter, jvm))) = tokio::time::timeout(Duration::from_secs(60), connect).await {
-                let (mut ar, mut aw) = adapter.into_split();
-                let (mut jr, mut jw) = jvm.into_split();
-                let upstream = forward(&mut ar, &mut jw, ready);
-                let downstream = tokio::io::copy(&mut jr, &mut aw);
-                // Close both sockets as soon as either side disconnects.
-                tokio::select! {
-                    r = upstream => if let Err(e) = r { tracing::debug!("Kotlin JDWP relay: {e}"); },
-                    _ = downstream => {},
-                }
-            }
-        });
-        Ok((Self { release: Some(release), task }, local))
-    }
-
-    pub fn release(&mut self) {
-        if let Some(ready) = self.release.take() {
-            let _ = ready.send(());
-        }
-    }
-}
-
-impl Drop for StartupRelay {
-    fn drop(&mut self) {
-        self.task.abort();
-    }
-}
-
-async fn packet(reader: &mut (impl AsyncRead + Unpin)) -> io::Result<Vec<u8>> {
-    let mut header = [0; 11];
-    reader.read_exact(&mut header).await?;
-    let len = u32::from_be_bytes(header[..4].try_into().unwrap()) as usize;
-    if !(11..=16 * 1024 * 1024).contains(&len) {
-        return Err(io::Error::new(io::ErrorKind::InvalidData, "Invalid JDWP packet length"));
-    }
-    let mut packet = vec![0; len];
-    packet[..11].copy_from_slice(&header);
-    reader.read_exact(&mut packet[11..]).await?;
-    Ok(packet)
-}
-
-async fn forward(
-    reader: &mut (impl AsyncRead + Unpin),
-    writer: &mut (impl AsyncWrite + Unpin),
-    mut ready: oneshot::Receiver<()>,
-) -> io::Result<()> {
-    let mut handshake = [0; 14];
-    reader.read_exact(&mut handshake).await?;
-    if &handshake != b"JDWP-Handshake" {
-        return Err(io::Error::new(io::ErrorKind::InvalidData, "Invalid JDWP handshake"));
-    }
-    writer.write_all(&handshake).await?;
-    let mut released = false;
-    let mut held: Vec<Vec<u8>> = Vec::new();
-    loop {
-        // Retain the in-flight read when attach completes, including partial packets.
-        let read = packet(reader);
-        tokio::pin!(read);
-        let packet = tokio::select! {
-            result = &mut read => result?,
-            result = &mut ready, if !released => {
-                result.map_err(|_| io::Error::new(io::ErrorKind::ConnectionAborted, "Kotlin attach cancelled"))?;
-                released = true;
-                for packet in held.drain(..) {
-                    writer.write_all(&packet).await?;
-                }
-                read.await?
-            }
-        };
-        // JDWP VirtualMachine.Resume (1/9), ThreadReference.Resume (11/3).
-        // Other commands must proceed: attach itself queries threads and installs requests.
-        if !released && packet[8] == 0 && matches!((packet[9], packet[10]), (1, 9) | (11, 3)) {
-            if held.len() >= 1024 {
-                return Err(io::Error::new(io::ErrorKind::InvalidData, "Too many pending JDWP resumes"));
-            }
-            held.push(packet);
-        } else {
-            writer.write_all(&packet).await?;
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn command(id: u8, set: u8, cmd: u8) -> Vec<u8> {
-        vec![0, 0, 0, 11, 0, 0, 0, id, 0, set, cmd]
-    }
-
-    #[tokio::test]
-    async fn holds_resumes_but_allows_setup_and_preserves_partial_reads() {
-        let (mut adapter, mut reader) = tokio::io::duplex(4096);
-        let (mut writer, mut jvm) = tokio::io::duplex(4096);
-        let (release, ready) = oneshot::channel();
-        let task = tokio::spawn(async move { forward(&mut reader, &mut writer, ready).await });
-        adapter.write_all(b"JDWP-Handshake").await.unwrap();
-        let mut handshake = [0; 14];
-        jvm.read_exact(&mut handshake).await.unwrap();
-        assert_eq!(&handshake, b"JDWP-Handshake");
-        let resume = command(1, 1, 9);
-        let thread_resume = command(2, 11, 3);
-        let setup = command(3, 1, 4);
-        adapter.write_all(&resume).await.unwrap();
-        adapter.write_all(&thread_resume).await.unwrap();
-        adapter.write_all(&setup).await.unwrap();
-        assert_eq!(packet(&mut jvm).await.unwrap(), setup);
-        let next = command(4, 1, 9);
-        adapter.write_all(&next[..6]).await.unwrap();
-        release.send(()).unwrap();
-        assert_eq!(packet(&mut jvm).await.unwrap(), resume);
-        assert_eq!(packet(&mut jvm).await.unwrap(), thread_resume);
-        adapter.write_all(&next[6..]).await.unwrap();
-        assert_eq!(packet(&mut jvm).await.unwrap(), next);
-        drop(adapter);
-        assert!(task.await.unwrap().is_err());
-    }
-
-    #[tokio::test]
-    async fn dropping_session_closes_relay() {
-        let (relay, port) = StartupRelay::start("127.0.0.1".into(), 1).await.unwrap();
-        let mut adapter = TcpStream::connect(("127.0.0.1", port)).await.unwrap();
-        drop(relay);
-        let result = tokio::time::timeout(Duration::from_secs(1), adapter.read_u8()).await.unwrap();
-        assert!(result.is_err());
-    }
-
-    #[tokio::test]
-    async fn rejects_invalid_packet_lengths() {
-        for len in [0_u32, 10, 16 * 1024 * 1024 + 1] {
-            let mut bytes = command(1, 1, 9);
-            bytes[..4].copy_from_slice(&len.to_be_bytes());
-            assert_eq!(packet(&mut bytes.as_slice()).await.unwrap_err().kind(), io::ErrorKind::InvalidData);
-        }
-    }
-}

crates/ide-dap/src/lib.rs

@@ -13,8 +13,6 @@ pub mod attach;
 mod cargo;
 pub mod connection;
 pub mod jdwp;
-pub mod kotlin;
-mod kotlin_jdwp;
 mod session;
 
 use adapter::{AdapterLauncher, AdapterSpec, ProcessLauncher};
@@ -565,14 +563,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());
-        if config.adapter == kotlin::ADAPTER
-            && let Some(home) = arguments
-                .as_object_mut()
-                .and_then(|o| o.remove("__adapterJavaHome"))
-                .and_then(|v| v.as_str().map(str::to_owned))
-        {
-            spec.env.push(("JAVA_HOME".into(), home));
-        }
         if let Some(command) = custom_command(&spec.command) {
             spec.command = command;
         }
@@ -697,14 +687,6 @@ impl DebugManager {
         };
         let session =
             Arc::new(Session::new(id, owner, name, adapter_name, parent, request, conn, spec, io.port, io.child));
-        if let Some(mut output) = io.program_output {
-            let session = session.clone();
-            tokio::spawn(async move {
-                while let Some((category, output)) = output.recv().await {
-                    session.emit(ide_core::event::DebugEvent::Output { category: category.into(), output });
-                }
-            });
-        }
         self.sessions.lock().insert(id, session.clone());
         self.order.lock().push(id);
         // Announced before the event loop runs, so it precedes every adapter event.
@@ -740,19 +722,7 @@ impl DebugManager {
         }
     }
 
-    async fn configure(&self, s: &Arc<Session>, mut arguments: Value) -> IdeResult<()> {
-        if s.adapter == kotlin::ADAPTER {
-            let project = arguments
-                .get("projectRoot")
-                .and_then(Value::as_str)
-                .map(PathBuf::from)
-                .unwrap_or_else(|| s.spec.cwd.clone());
-            let mirror = tokio::task::spawn_blocking(move || kotlin::SourceMirror::create(&project))
-                .await
-                .map_err(|e| IdeError::internal(e.to_string()))??;
-            arguments["projectRoot"] = json!(mirror.root());
-            *s.kotlin_mirror.lock() = Some(mirror);
-        }
+    async fn configure(&self, s: &Arc<Session>, arguments: Value) -> IdeResult<()> {
         let caps = s
             .conn
             .request_timeout(
@@ -779,32 +749,8 @@ impl DebugManager {
             .await?;
         *s.caps.lock() = if caps.is_object() { caps } else { json!({}) };
 
-        // The Kotlin adapter ignores the resolved classpath and project runtime on launch.
-        let request = if s.adapter == kotlin::ADAPTER && s.request == "launch" {
-            session::start_kotlin_debuggee(s, &mut arguments).await?;
-            "attach"
-        } else {
-            &s.request
-        };
-        if s.adapter == kotlin::ADAPTER {
-            let host = arguments
-                .get("hostName")
-                .and_then(Value::as_str)
-                .ok_or_else(|| IdeError::invalid("Missing Kotlin JDWP host"))?
-                .to_owned();
-            let port = arguments
-                .get("port")
-                .and_then(Value::as_u64)
-                .and_then(|p| u16::try_from(p).ok())
-                .filter(|p| *p != 0)
-                .ok_or_else(|| IdeError::invalid("Invalid Kotlin JDWP port"))?;
-            let (relay, port) = kotlin_jdwp::StartupRelay::start(host, port).await?;
-            *s.kotlin_relay.lock() = Some(relay);
-            arguments["hostName"] = json!("127.0.0.1");
-            arguments["port"] = json!(port);
-        }
         // Many adapters answer `launch` only after `configurationDone`, so don't wait for it yet.
-        let launch = s.conn.send_request(request, arguments)?;
+        let launch = s.conn.send_request(&s.request, arguments)?;
         let mut launch = Box::pin(async move { launch.await.unwrap_or(Err(DapError::Closed)) });
         let mut initialized = s.initialized.subscribe();
         let mut launch_result = None;
@@ -834,7 +780,6 @@ impl DebugManager {
                         s.emit(ide_core::event::DebugEvent::BreakpointsChanged { path: path.into() });
                     }
                 }
-                Err(e) if s.adapter == kotlin::ADAPTER => return Err(e.into()),
                 Err(e) => tracing::debug!("setBreakpoints for {} failed: {e}", path.display()),
             }
         }
@@ -857,11 +802,7 @@ impl DebugManager {
             let _ = self.send_exception_breakpoints(s).await;
         }
         if s.supports("supportsConfigurationDoneRequest") {
-            if s.adapter == kotlin::ADAPTER {
-                drop(s.conn.send_request("configurationDone", json!({}))?);
-            } else {
-                s.conn.request_timeout("configurationDone", Value::Null, REQUEST_TIMEOUT).await?;
-            }
+            s.conn.request_timeout("configurationDone", Value::Null, REQUEST_TIMEOUT).await?;
         }
         s.configured.store(true, Ordering::Release);
         if launch_result.is_none() {
@@ -872,9 +813,6 @@ impl DebugManager {
                 Err(_) => return Err(DapError::Timeout(s.request.clone()).into()),
             }
         }
-        if let Some(relay) = s.kotlin_relay.lock().as_mut() {
-            relay.release();
-        }
         Ok(())
     }
 
@@ -931,7 +869,6 @@ impl DebugManager {
                 Ok(states) => {
                     result.get_or_insert(states);
                 }
-                Err(e) if s.adapter == kotlin::ADAPTER => return Err(e.into()),
                 Err(e) => tracing::debug!("setBreakpoints on session {} failed: {e}", s.id.0),
             }
         }
@@ -949,23 +886,6 @@ impl DebugManager {
         Ok(states)
     }
 
-    /// Refresh fallback copies after an editor save.
-    pub async fn refresh_source_mirrors(&self, owner: &str) -> IdeResult<()> {
-        let sessions: Vec<_> = self.sessions.lock().values().filter(|s| s.owner.key == owner).cloned().collect();
-        tokio::task::spawn_blocking(move || {
-            for s in sessions {
-                if let Some(mirror) = s.kotlin_mirror.lock().as_mut()
-                    && let Err(e) = mirror.refresh()
-                {
-                    tracing::warn!("Could not refresh Kotlin debug sources: {e}");
-                }
-            }
-            Ok(())
-        })
-        .await
-        .map_err(|e| IdeError::internal(e.to_string()))?
-    }
-
     /// Last known verification states of a file's breakpoints (after `BreakpointsChanged`).
     pub fn breakpoint_states(&self, path: &Path) -> Vec<BreakpointState> {
         self.states.lock().get(path).cloned().unwrap_or_default()
@@ -1389,16 +1309,6 @@ impl DebugManager {
         })
     }
 
-    /// Stops every session `key` started: the window that opened the project is closing.
-    pub async fn stop_key(&self, key: &str) {
-        let ids: Vec<DebugSessionId> = self.sessions(Some(key)).into_iter().map(|s| s.id).collect();
-        for id in ids {
-            if let Err(e) = self.stop(id).await {
-                tracing::debug!("debug session {id:?} did not stop: {e}");
-            }
-        }
-    }
-
     /// Stops a session and its child sessions.
     pub async fn stop(&self, s: DebugSessionId) -> IdeResult<()> {
         let session = self.session(s)?;

crates/ide-dap/src/session.rs

@@ -54,8 +54,6 @@ pub(crate) struct Session {
     /// Resolved path → the path as the IDE knows it, for adapters given resolved paths.
     resolved_paths: Mutex<HashMap<PathBuf, PathBuf>>,
     progress: Mutex<HashMap<String, TaskId>>,
-    pub kotlin_relay: Mutex<Option<crate::kotlin_jdwp::StartupRelay>>,
-    pub kotlin_mirror: Mutex<Option<crate::kotlin::SourceMirror>>,
 }
 
 /// Adapters that only match files by their resolved path: Godot maps a script to
@@ -97,8 +95,6 @@ impl Session {
             breakpoint_ids: Mutex::new(HashMap::new()),
             resolved_paths: Mutex::new(HashMap::new()),
             progress: Mutex::new(HashMap::new()),
-            kotlin_relay: Mutex::new(None),
-            kotlin_mirror: Mutex::new(None),
         }
     }
 
@@ -108,14 +104,6 @@ impl Session {
 
     /// `path` as sent to the adapter (resolved for [`RESOLVES_PATHS`] adapters).
     pub fn adapter_path(&self, path: &Path) -> PathBuf {
-        if let Some(path) = self.kotlin_mirror.lock().as_ref().and_then(|m| m.adapter_path(path)) {
-            return path;
-        }
-        if self.adapter == "java-debug" {
-            let native = java_source_path(&path.to_string_lossy());
-            self.resolved_paths.lock().insert(native.clone(), path.to_path_buf());
-            return native;
-        }
         if !RESOLVES_PATHS.contains(&self.adapter.as_str()) {
             return path.to_path_buf();
         }
@@ -130,14 +118,7 @@ impl Session {
 
     /// A path from the adapter as the IDE knows it (undoes [`Session::adapter_path`]).
     pub fn client_path(&self, path: &str) -> Option<PathBuf> {
-        if let Some(real) = self.kotlin_mirror.lock().as_ref().and_then(|m| m.client_path(Path::new(path))) {
-            return Some(real);
-        }
-        let key = if self.adapter == "java-debug" { java_source_path(path) } else { PathBuf::from(path) };
-        self.resolved_paths.lock().get(&key).cloned().or_else(|| {
-            (self.adapter == "java-debug" && is_windows_source_path(path))
-                .then(|| PathBuf::from(path.replace('\\', "/")))
-        })
+        self.resolved_paths.lock().get(Path::new(path)).cloned()
     }
 
     pub fn supports(&self, cap: &str) -> bool {
@@ -255,7 +236,6 @@ impl Session {
 
     /// Kills the adapter and every debuggee we started.
     pub fn kill_processes(&self) {
-        self.kotlin_relay.lock().take();
         if let Some(mut c) = self.adapter_process.lock().take() {
             let _ = c.start_kill();
         }
@@ -265,19 +245,6 @@ impl Session {
     }
 }
 
-// java-debug treats a forward-slash drive path as a URI (scheme "C").
-// Keep DAP path mode, but use native Windows separators for Java source lookup.
-fn is_windows_source_path(path: &str) -> bool {
-    let bytes = path.as_bytes();
-    (bytes.len() >= 3 && bytes[0].is_ascii_alphabetic() && bytes[1] == b':' && matches!(bytes[2], b'/' | b'\\'))
-        || path.starts_with("//")
-        || path.starts_with(r"\\")
-}
-
-fn java_source_path(path: &str) -> PathBuf {
-    if is_windows_source_path(path) { PathBuf::from(path.replace('/', r"\")) } else { PathBuf::from(path) }
-}
-
 fn with_conditions(v: &mut Value, condition: Option<&str>, hit_condition: Option<&str>) {
     if let Some(c) = condition.filter(|c| !c.trim().is_empty()) {
         v["condition"] = c.into();
@@ -330,10 +297,7 @@ pub(crate) async fn event_loop(
     }
 }
 
-async fn on_event(mgr: &Arc<DebugManager>, s: &Arc<Session>, event: &str, mut body: Value) {
-    if let Some(mirror) = s.kotlin_mirror.lock().as_ref() {
-        mirror.translate(&mut body);
-    }
+async fn on_event(mgr: &Arc<DebugManager>, s: &Arc<Session>, event: &str, body: Value) {
     let int = |k: &str| body.get(k).and_then(Value::as_i64);
     let str_ = |k: &str| body.get(k).and_then(Value::as_str).map(str::to_owned);
     match event {
@@ -405,7 +369,7 @@ async fn on_event(mgr: &Arc<DebugManager>, s: &Arc<Session>, event: &str, mut bo
                 let mut progress = s.progress.lock();
                 let id =
                     if done { progress.remove(&pid) } else { Some(*progress.entry(pid).or_insert_with(TaskId::next)) };
-                (id, str_("title").map(|t| ide_core::task::display_title(&t)).unwrap_or_else(|| s.name.clone()))
+                (id, str_("title").unwrap_or_else(|| s.name.clone()))
             };
             let Some(id) = id else { return };
             s.owner.sink.emit(IdeEvent::Task {
@@ -522,74 +486,3 @@ fn forward_output<R: AsyncRead + Unpin + Send + 'static>(s: &Session, mut stream
         }
     });
 }
-
-/// Launch with the IDE's resolved runtime and classpath; the adapter only attaches.
-pub(crate) async fn start_kotlin_debuggee(s: &Arc<Session>, args: &mut Value) -> ide_core::IdeResult<()> {
-    use tokio::io::{AsyncBufReadExt, BufReader};
-    let port = crate::adapter::free_port()?;
-    let java = args.get("javaExec").and_then(Value::as_str).unwrap_or("java");
-    let strings = |key: &str| -> Vec<String> {
-        args.get(key)
-            .and_then(Value::as_array)
-            .map(|a| a.iter().filter_map(Value::as_str).map(str::to_owned).collect())
-            .unwrap_or_default()
-    };
-    let classpath =
-        std::env::join_paths(strings("classPaths")).map_err(|e| ide_core::IdeError::invalid(e.to_string()))?;
-    let mut cmd = tokio::process::Command::new(java);
-    ide_core::process::prepare(cmd.as_std_mut());
-    cmd.args(strings("vmArguments"))
-        .arg(format!("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=127.0.0.1:{port}"))
-        .arg("-cp")
-        .arg(classpath);
-    let modules = strings("modulePaths");
-    if !modules.is_empty() {
-        cmd.arg("--module-path")
-            .arg(std::env::join_paths(modules).map_err(|e| ide_core::IdeError::invalid(e.to_string()))?);
-    }
-    cmd.arg(
-        args.get("mainClass")
-            .and_then(Value::as_str)
-            .ok_or_else(|| ide_core::IdeError::invalid("Missing Kotlin main class"))?,
-    )
-    .args(strings("programArgs"))
-    .current_dir(&s.spec.cwd)
-    .envs(ide_core::process::shell_env())
-    .stdin(Stdio::null())
-    .stdout(Stdio::piped())
-    .stderr(Stdio::piped())
-    .kill_on_drop(true);
-    if let Some(env) = args.get("env").and_then(Value::as_object) {
-        for (k, v) in env {
-            if let Some(v) = v.as_str() {
-                cmd.env(k, v);
-            }
-        }
-    }
-    let mut child = cmd.spawn()?;
-    if let Some(err) = child.stderr.take() {
-        forward_output(s, err, "stderr");
-    }
-    let mut stdout =
-        BufReader::new(child.stdout.take().ok_or_else(|| ide_core::IdeError::internal("Missing JVM stdout"))?);
-    tokio::time::timeout(Duration::from_secs(15), async {
-        loop {
-            let mut line = String::new();
-            if stdout.read_line(&mut line).await? == 0 {
-                return Err(ide_core::IdeError::unavailable("JVM exited before starting its debug listener"));
-            }
-            if line.contains("Listening for transport dt_socket") {
-                return Ok(());
-            }
-            s.emit(DebugEvent::Output { category: "stdout".into(), output: line });
-        }
-    })
-    .await
-    .map_err(|_| ide_core::IdeError::unavailable("JVM did not start its debug listener"))??;
-    forward_output(s, stdout, "stdout");
-    s.debuggees.lock().push(child);
-    args["hostName"] = json!("127.0.0.1");
-    args["port"] = json!(port);
-    args["timeout"] = json!(10000);
-    Ok(())
-}

crates/ide-dap/src/tests.rs

@@ -15,8 +15,6 @@ struct Script {
     run_in_terminal: Option<Vec<String>>,
     /// Send a `startDebugging` reverse request (child session) when a non-child `launch` arrives.
     start_debugging: bool,
-    ignore_configuration_done: bool,
-    source_path: Option<String>,
 }
 
 struct FakeLauncher {
@@ -32,14 +30,7 @@ impl AdapterLauncher for FakeLauncher {
         tokio::spawn(fake_adapter(server, log, script));
         let (r, w) = tokio::io::split(client);
         Box::pin(async move {
-            Ok(AdapterIo {
-                reader: Box::new(r),
-                writer: Box::new(w),
-                child: None,
-                port: None,
-                stderr: Arc::default(),
-                program_output: None,
-            })
+            Ok(AdapterIo { reader: Box::new(r), writer: Box::new(w), child: None, port: None, stderr: Arc::default() })
         })
     }
 }
@@ -139,9 +130,7 @@ 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.ignore_configuration_done {
-                    ok!(msg, Value::Null);
-                }
+                ok!(msg, Value::Null);
                 if let Some(l) = pending_launch.take() {
                     send!(json!({"type": "response", "request_seq": l, "command": "launch", "success": true}));
                 }
@@ -150,14 +139,14 @@ async fn fake_adapter<S: AsyncRead + AsyncWrite + Unpin + Send + 'static>(stream
                     json!({"type": "event", "event": "stopped", "body": {"reason": "breakpoint", "threadId": 1, "allThreadsStopped": true}})
                 );
                 send!(
-                    json!({"type": "event", "event": "breakpoint", "body": {"reason": "changed", "breakpoint": {"id": 1, "verified": false, "message": "moved", "line": 9, "source": {"path": script.source_path}}}})
+                    json!({"type": "event", "event": "breakpoint", "body": {"reason": "changed", "breakpoint": {"id": 1, "verified": false, "message": "moved", "line": 9}}})
                 );
             }
             "threads" => ok!(msg, json!({"threads": [{"id": 1, "name": "MainThread"}]})),
             "stackTrace" => ok!(
                 msg,
                 json!({"stackFrames": [
-                    {"id": 10, "name": "main", "line": 5, "column": 3, "source": {"path": script.source_path.as_deref().unwrap_or("/p/a.py")}},
+                    {"id": 10, "name": "main", "line": 5, "column": 3, "source": {"path": "/p/a.py"}},
                     {"id": 11, "name": "lib", "line": 1, "column": 1, "source": {"path": "/usr/lib/x.py", "presentationHint": "deemphasize"}},
                 ]})
             ),
@@ -904,8 +893,6 @@ fn godot_registry(port: u16, command: &str, args: &[&str]) -> Arc<LanguageRegist
         block_comment: None,
         indent: None,
         ui_mode: None,
-        framework_ui_modes: Vec::new(),
-        formatter: None,
         tree_sitter: None,
         language_servers: vec![],
         debugger: Some(ide_language::DebuggerConfig {
@@ -915,7 +902,6 @@ fn godot_registry(port: u16, command: &str, args: &[&str]) -> Arc<LanguageRegist
             transport: "tcp".into(),
             connect: Some(format!("127.0.0.1:{port}")),
             install_hint: Some("Open the project in the Godot editor".into()),
-            pinned: None,
         }),
     };
     Arc::new(LanguageRegistry::from_configs(vec![lang]))
@@ -1029,177 +1015,3 @@ fn root_and_address_placeholders() {
     assert_eq!(adapter::parse_address("[::1]:6006"), Some(("::1".into(), 6006)));
     assert_eq!(adapter::parse_address("6006"), None);
 }
-
-#[tokio::test]
-async fn kotlin_configures_without_configuration_done_response() {
-    let h = harness(Script { ignore_configuration_done: true, ..Default::default() });
-    let project = tempfile::tempdir().unwrap();
-    let path = project.path().join("Main.kt");
-    std::fs::write(&path, "package org.example\nfun main() {}\n").unwrap();
-    h.manager.set_breakpoints(path.clone(), vec![bp(1)]).await.unwrap();
-    let mut config = config();
-    config.adapter = kotlin::ADAPTER.into();
-    config.request = "attach".into();
-    config.cwd = Some(project.path().to_owned().into());
-    config.extra_json = Some(json!({"projectRoot": project.path(), "hostName": "127.0.0.1", "port": 5005}).to_string());
-    let id = tokio::time::timeout(Duration::from_secs(2), h.start(config)).await.unwrap().unwrap();
-    let root = PathBuf::from(h.request("attach")["arguments"]["projectRoot"].as_str().unwrap());
-    assert!(!root.starts_with(project.path()));
-    let request = h.request("setBreakpoints");
-    assert_eq!(request["arguments"]["source"]["name"], "Main.kt");
-    let mapped = PathBuf::from(request["arguments"]["source"]["path"].as_str().unwrap());
-    assert!(mapped.starts_with(&root));
-    assert!(mapped.is_file());
-    assert_eq!(h.manager.session(id).unwrap().client_path(mapped.to_str().unwrap()), Some(path));
-    h.manager.stop(id).await.unwrap();
-}
-
-/// Requires a compiled no-delay reporter fixture (Main.kt, package org.example,
-/// loop at line 5, println(i) at line 6), and the unmodified official adapter.
-/// KOTLIN_PROBE_CONFIG is a LaunchConfig JSON file; KOTLIN_PROBE_ADAPTER is its executable.
-#[tokio::test]
-#[ignore = "requires official Kotlin adapter and compiled reporter fixture"]
-async fn kotlin_official_release_ten_no_delay_runs() {
-    let config: LaunchConfig = serde_json::from_slice(
-        &std::fs::read(std::env::var("KOTLIN_PROBE_CONFIG").expect("KOTLIN_PROBE_CONFIG")).unwrap(),
-    )
-    .unwrap();
-    let adapter = std::env::var("KOTLIN_PROBE_ADAPTER").expect("KOTLIN_PROBE_ADAPTER");
-    let source = PathBuf::from(config.cwd.clone().unwrap()).join("src/main/kotlin/Main.kt");
-    for run in 1..=10 {
-        let (owner, events) = recording_owner("kotlin-probe");
-        let manager = DebugManager::new(Arc::new(LanguageRegistry::from_configs(Vec::new())));
-        let h = Harness { manager, owner, events, log: Arc::default() };
-        h.manager.set_breakpoints(source.clone(), vec![bp(5)]).await.unwrap();
-        let id = h.manager.start_with(config.clone(), h.owner.clone(), |_| Some(adapter.clone())).await.unwrap();
-        let stopped = h.wait_event(|e| matches!(e, DebugEvent::Stopped { reason, .. } if reason == "breakpoint")).await;
-        let DebugEvent::Stopped { thread_id, .. } = stopped else { unreachable!() };
-        let frames = h.manager.stack_trace(id, thread_id).await.unwrap();
-        assert_eq!(frames[0].line, 5);
-        assert_eq!(frames[0].path.as_deref(), Some(source.as_path()));
-        let scopes = h.manager.scopes(id, frames[0].id).await.unwrap();
-        let mut variables = Vec::new();
-        for scope in scopes {
-            variables.extend(h.manager.variables(id, scope.variables_reference).await.unwrap());
-        }
-        assert!(variables.iter().any(|v| v.name == "i" && v.value == "0"));
-        h.manager.step(id, thread_id, StepKind::Over).await.unwrap();
-        h.wait_event(|e| matches!(e, DebugEvent::Stopped { reason, .. } if reason == "step")).await;
-        let frames = h.manager.stack_trace(id, thread_id).await.unwrap();
-        assert_eq!(frames[0].line, 4);
-        h.manager.stop(id).await.unwrap();
-        println!("Run {run}/10: breakpoint Main.kt:6, i=0, step Main.kt:5; stopped");
-    }
-}
-
-#[tokio::test]
-async fn java_windows_source_paths_for_launch_and_attach() {
-    for request in ["launch", "attach"] {
-        for (client, native, returned) in [
-            ("C:/work/Main.java", r"C:\work\Main.java", r"C:\work\Main.java"),
-            ("C:/work/Main.java", r"C:\work\Main.java", "C:/work/Main.java"),
-            (r"c:\work\Main.java", r"c:\work\Main.java", "c:/work/Main.java"),
-            (r"D:/my project\Main.java", r"D:\my project\Main.java", r"D:\my project\Main.java"),
-            ("//server/share/Main.java", r"\\server\share\Main.java", "//server/share/Main.java"),
-            (r"\\server\share/Main.java", r"\\server\share\Main.java", "//server/share/Main.java"),
-            ("/work/Main.java", "/work/Main.java", "/work/Main.java"),
-        ] {
-            let h = harness(Script { source_path: Some(returned.into()), ..Script::default() });
-            let path = PathBuf::from(client);
-            h.manager.set_breakpoints(path.clone(), vec![bp(4)]).await.unwrap();
-            let mut cfg = config();
-            cfg.adapter = "java-debug".into();
-            cfg.request = request.into();
-            let id = h.start(cfg).await.unwrap();
-            assert_eq!(h.request("initialize")["arguments"]["pathFormat"], "path");
-            assert_eq!(h.request("setBreakpoints")["arguments"]["source"]["path"], native);
-            let commands = h.commands();
-            assert!(
-                commands.iter().position(|c| c == "setBreakpoints").unwrap()
-                    < commands.iter().position(|c| c == "configurationDone").unwrap()
-            );
-            let frames = h.manager.stack_trace(id, 1).await.unwrap();
-            assert_eq!(frames[0].path.as_deref(), Some(path.as_path()));
-            h.wait_event(|e| {
-                matches!(e, DebugEvent::BreakpointsChanged { path: p } if p.as_ref() == path.as_path())
-                    && h.manager.breakpoint_states(&path)[0].message.as_deref() == Some("moved")
-            })
-            .await;
-            assert_eq!(h.manager.breakpoint_states(&path)[0].message.as_deref(), Some("moved"));
-            h.manager.stop(id).await.unwrap();
-        }
-    }
-}
-
-#[tokio::test]
-async fn java_stack_frames_without_breakpoints_normalize_windows_paths() {
-    for (returned, expected) in [
-        (r"C:\work\Other.java", "C:/work/Other.java"),
-        (r"\\server\share\Other.java", "//server/share/Other.java"),
-        ("C:/work/Other.java", "C:/work/Other.java"),
-        ("/work/Other.java", "/work/Other.java"),
-    ] {
-        let h = harness(Script { source_path: Some(returned.into()), ..Script::default() });
-        let mut cfg = config();
-        cfg.adapter = "java-debug".into();
-        let id = h.start(cfg).await.unwrap();
-        let frames = h.manager.stack_trace(id, 1).await.unwrap();
-        assert_eq!(frames[0].path.as_deref(), Some(PathBuf::from(expected).as_path()));
-        h.manager.stop(id).await.unwrap();
-    }
-}
-
-/// A built-in language definition (GDScript) shipped by a plugin
-/// instead: its debugger starts the program approved for the plugin's
-/// `process:godot` grant, and refuses once that file changed.
-#[cfg(unix)]
-#[tokio::test]
-async fn a_plugin_language_runs_its_debug_adapter_from_the_approved_program() {
-    use ide_language::ProgramPin;
-    use ide_language::plugin_point::{PluginLanguages, parse_definition};
-    use std::os::unix::fs::PermissionsExt;
-
-    let dir = std::env::temp_dir().join(format!("openidea-plugin-dap-{}", std::process::id()));
-    std::fs::create_dir_all(&dir).unwrap();
-    // Stands in for `godot --headless --editor …`.
-    let program = dir.join("godot");
-    std::fs::write(&program, "#!/bin/sh\nexec sleep 30\n").unwrap();
-    std::fs::set_permissions(&program, std::fs::Permissions::from_mode(0o755)).unwrap();
-
-    let port = std::net::TcpListener::bind(("127.0.0.1", 0)).unwrap().local_addr().unwrap().port();
-    let mut gdscript = parse_definition(include_str!("../../../languages/gdscript.toml")).unwrap();
-    let debugger = gdscript.debugger.as_mut().unwrap();
-    debugger.args.clear();
-    debugger.connect = Some(format!("127.0.0.1:{port}"));
-
-    // No built-in GDScript: it comes from the plugin.
-    let registry = Arc::new(LanguageRegistry::from_configs(Vec::new()));
-    let store = PluginLanguages::new();
-    registry.attach_plugins(store.clone());
-    let pin = ProgramPin::approve(&program).unwrap();
-    store.set_process_policy(Arc::new(move |plugin, cap| {
-        (plugin == "acme.godot" && cap.to_string() == "process:godot").then(|| pin.clone())
-    }));
-    let _language = store.add("acme.godot".into(), gdscript);
-
-    let log: Log = Arc::default();
-    let server_log = log.clone();
-    tokio::spawn(async move {
-        tokio::time::sleep(std::time::Duration::from_millis(300)).await;
-        let listener = tokio::net::TcpListener::bind(("127.0.0.1", port)).await.unwrap();
-        let (stream, _) = listener.accept().await.unwrap();
-        fake_adapter(stream, server_log, Script::default()).await;
-    });
-    let (owner, _events) = recording_owner("main");
-    let manager = DebugManager::new(registry.clone());
-    let id = manager.start(godot_launch(&dir), owner).await.unwrap();
-    assert!(log.lock().iter().any(|m| m["command"] == "launch"));
-    manager.stop(id).await.unwrap();
-
-    // Replaced after approval: refused before anything starts.
-    std::fs::write(&program, "#!/bin/sh\nexec sleep 31\n").unwrap();
-    let (owner, _events) = recording_owner("main");
-    let err = manager.start(godot_launch(&dir), owner).await.unwrap_err();
-    assert_eq!(err.kind, ide_core::error::ErrorKind::PermissionDenied, "{}", err.message);
-    let _ = std::fs::remove_dir_all(&dir);
-}

crates/ide-db/Cargo.toml

@@ -16,9 +16,6 @@ tracing.workspace = true
 parking_lot.workspace = true
 futures.workspace = true
 sqlx.workspace = true
-tiberius.workspace = true
-bb8.workspace = true
-tokio-util = { workspace = true, features = ["compat"] }
 dirs.workspace = true
 ide-ssh.workspace = true
 

crates/ide-db/src/conn.rs

@@ -5,9 +5,6 @@
 //! whatever its type.
 
 use crate::source::{DataSource, DbDriver, DbSslMode};
-use bb8::ManageConnection;
-use bb8::Pool as Bb8Pool;
-use futures::StreamExt;
 use ide_core::{CancellationToken, IdeError, IdeResult, error::ErrorKind};
 use serde::{Deserialize, Serialize};
 use specta::Type;
@@ -47,65 +44,10 @@ pub struct QueryResult {
     pub execution_ms: f64,
 }
 
-// Keep an empty slot when a connection is discarded after cancellation or rollback failure.
-pub struct MssqlConnectionManager(tiberius::Config);
-
-type MssqlClient = tiberius::Client<tokio_util::compat::Compat<tokio::net::TcpStream>>;
-
-pub struct MssqlConnection(Option<MssqlClient>);
-
-impl std::ops::Deref for MssqlConnection {
-    type Target = MssqlClient;
-    fn deref(&self) -> &Self::Target {
-        self.0.as_ref().expect("live SQL Server connection")
-    }
-}
-
-impl std::ops::DerefMut for MssqlConnection {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        self.0.as_mut().expect("live SQL Server connection")
-    }
-}
-
-impl ManageConnection for MssqlConnectionManager {
-    type Connection = MssqlConnection;
-    type Error = tiberius::error::Error;
-
-    async fn connect(&self) -> Result<Self::Connection, Self::Error> {
-        use tokio_util::compat::TokioAsyncWriteCompatExt;
-
-        let tcp = tokio::net::TcpStream::connect(self.0.get_addr()).await?;
-        tcp.set_nodelay(true)?;
-        let client = match MssqlClient::connect(self.0.clone(), tcp.compat_write()).await {
-            // Preserve the single redirect supported by the previous pool adapter.
-            Err(tiberius::error::Error::Routing { host, port }) => {
-                let mut config = self.0.clone();
-                config.host(host);
-                config.port(port);
-                let tcp = tokio::net::TcpStream::connect(config.get_addr()).await?;
-                tcp.set_nodelay(true)?;
-                MssqlClient::connect(config, tcp.compat_write()).await?
-            }
-            result => result?,
-        };
-        Ok(MssqlConnection(Some(client)))
-    }
-
-    async fn is_valid(&self, conn: &mut Self::Connection) -> Result<(), Self::Error> {
-        conn.simple_query("SELECT 1").await?.into_results().await?;
-        Ok(())
-    }
-
-    fn has_broken(&self, conn: &mut Self::Connection) -> bool {
-        conn.0.is_none()
-    }
-}
-
 pub enum Pool {
     Sqlite(SqlitePool),
     Postgres(PgPool),
     Mysql(MySqlPool),
-    SqlServer(Bb8Pool<MssqlConnectionManager>),
 }
 
 /// Runs `$body` with `$p` bound to the concrete pool of each driver.
@@ -115,7 +57,6 @@ macro_rules! with_pool {
             Pool::Sqlite($p) => $body,
             Pool::Postgres($p) => $body,
             Pool::Mysql($p) => $body,
-            Pool::SqlServer(_) => unreachable!(),
         }
     };
 }
@@ -138,129 +79,6 @@ pub(crate) fn db_err(e: sqlx::Error) -> IdeError {
     }
 }
 
-pub(crate) fn mssql_err(e: tiberius::error::Error) -> IdeError {
-    match &e {
-        tiberius::error::Error::Server(d) => {
-            let code = d.code();
-            // Wrong login: SQL Server 18456.
-            let auth = matches!(code, 18452 | 18456 | 18470);
-            IdeError::new(
-                if auth { ErrorKind::PermissionDenied } else { ErrorKind::InvalidInput },
-                format!("[{code}] {}", d.message()),
-            )
-        }
-        tiberius::error::Error::Io { .. } | tiberius::error::Error::Tls(_) => {
-            IdeError::new(ErrorKind::Io, e.to_string())
-        }
-        _ => IdeError::new(ErrorKind::Protocol, e.to_string()),
-    }
-}
-
-fn mssql_pool_err(e: bb8::RunError<tiberius::error::Error>) -> IdeError {
-    match e {
-        bb8::RunError::User(e) => mssql_err(e),
-        bb8::RunError::TimedOut => IdeError::new(ErrorKind::Io, "timed out connecting to the database"),
-    }
-}
-
-const DAYS_1900_01_01: i64 = 693_595;
-
-/// Formats a proleptic Gregorian date given days since `0001-01-01`.
-fn format_date(days: i64) -> String {
-    let z = days + 306;
-    let era = z.div_euclid(146_097);
-    let doe = z.rem_euclid(146_097);
-    let yoe = (doe - doe / 1460 + doe / 36524 - doe / 146_096) / 365;
-    let y = yoe + era * 400;
-    let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
-    let mp = (5 * doy + 2) / 153;
-    let d = doy - (153 * mp + 2) / 5 + 1;
-    let m = if mp < 10 { mp + 3 } else { mp - 9 };
-    let year = if m <= 2 { y + 1 } else { y };
-    format!("{year:04}-{m:02}-{d:02}")
-}
-
-fn format_hms(secs: u64, frac: u64, scale: u8) -> String {
-    let (h, m, s) = (secs / 3600, (secs / 60) % 60, secs % 60);
-    if scale == 0 || frac == 0 {
-        format!("{h:02}:{m:02}:{s:02}")
-    } else {
-        let frac = format!("{frac:0width$}", width = usize::from(scale));
-        format!("{h:02}:{m:02}:{s:02}.{}", frac.trim_end_matches('0'))
-    }
-}
-
-fn format_time(t: tiberius::time::Time) -> String {
-    let scale = t.scale().min(7);
-    let div = 10u64.pow(u32::from(scale));
-    format_hms(t.increments() / div, t.increments() % div, scale)
-}
-
-fn format_numeric(n: tiberius::numeric::Numeric) -> String {
-    let scale = u32::from(n.scale());
-    if scale == 0 {
-        return n.value().to_string();
-    }
-    let sign = if n.value() < 0 { "-" } else { "" };
-    let abs = n.value().unsigned_abs();
-    let div = 10u128.pow(scale);
-    format!("{sign}{}.{:0width$}", abs / div, abs % div, width = scale as usize)
-}
-
-fn tiberius_cell(cell: &tiberius::ColumnData<'_>, ty: tiberius::ColumnType) -> Option<String> {
-    use tiberius::ColumnData as C;
-    match cell {
-        C::U8(v) => v.map(|v| v.to_string()),
-        C::I16(v) => v.map(|v| v.to_string()),
-        C::I32(v) => v.map(|v| v.to_string()),
-        C::I64(v) => v.map(|v| v.to_string()),
-        C::F32(v) => v.map(|v| v.to_string()),
-        C::F64(v) if matches!(ty, tiberius::ColumnType::Money | tiberius::ColumnType::Money4) => {
-            // Beyond ~9e11, money precision is limited by the driver's f64 decoding.
-            v.map(|v| format!("{:.4}", v))
-        }
-        C::F64(v) => v.map(|v| v.to_string()),
-        C::Bit(v) => v.map(|v| v.to_string()),
-        C::String(v) => v.as_deref().map(str::to_owned),
-        C::Guid(v) => v.map(|v| v.to_string()),
-        C::Binary(v) => v.as_deref().map(hex),
-        C::Numeric(v) => v.map(format_numeric),
-        C::Xml(v) => v.as_deref().map(|x| x.as_ref().to_owned()),
-        C::Date(v) => v.map(|d| format_date(i64::from(d.days()))),
-        C::Time(v) => v.map(format_time),
-        C::DateTime(v) => v.map(|dt| {
-            let ms = (u64::from(dt.seconds_fragments()) * 1000 + 150) / 300;
-            format!("{} {}", format_date(DAYS_1900_01_01 + i64::from(dt.days())), format_hms(ms / 1000, ms % 1000, 3))
-        }),
-        C::SmallDateTime(v) => v.map(|dt| {
-            let secs = u64::from(dt.seconds_fragments()) * 60;
-            format!("{} {}", format_date(DAYS_1900_01_01 + i64::from(dt.days())), format_hms(secs, 0, 0))
-        }),
-        C::DateTime2(v) => {
-            v.map(|dt| format!("{} {}", format_date(i64::from(dt.date().days())), format_time(dt.time())))
-        }
-        C::DateTimeOffset(v) => v.map(|dto| {
-            let dt = dto.datetime2();
-            let t = dt.time();
-            let scale = t.scale().min(7);
-            let div = 10u64.pow(u32::from(scale));
-            let utc_secs = i64::from(dt.date().days()) * 86_400 + (t.increments() / div) as i64;
-            let local_secs = utc_secs + i64::from(dto.offset()) * 60;
-            let days = local_secs.div_euclid(86_400);
-            let secs = local_secs.rem_euclid(86_400) as u64;
-            let sign = if dto.offset() < 0 { '-' } else { '+' };
-            let off = dto.offset().unsigned_abs();
-            format!(
-                "{} {}{sign}{:02}:{:02}",
-                format_date(days),
-                format_hms(secs, t.increments() % div, scale),
-                off / 60,
-                off % 60
-            )
-        }),
-    }
-}
-
 fn hex(bytes: &[u8]) -> String {
     let mut s = String::with_capacity(2 + bytes.len() * 2);
     s.push_str("0x");
@@ -379,37 +197,6 @@ macro_rules! fetch {
 /// Columns, rows, rows affected, more rows beyond the limit, time of the first answer.
 type Fetched = (Vec<ResultColumn>, Vec<Vec<Option<String>>>, Option<u64>, bool, Option<Instant>);
 
-async fn mssql_command(conn: &mut MssqlClient, sql: &str) -> IdeResult<()> {
-    // Transaction control must be a batch: sp_executesql rejects a changed transaction count.
-    conn.simple_query(sql).await.map_err(mssql_err)?.into_results().await.map_err(mssql_err)?;
-    Ok(())
-}
-
-async fn mssql_fetch(conn: &mut MssqlClient, sql: &str, max: usize) -> IdeResult<Fetched> {
-    let mut stream = conn.simple_query(sql).await.map_err(mssql_err)?;
-    let first = Some(Instant::now());
-    let columns = stream
-        .columns()
-        .await
-        .map_err(mssql_err)?
-        .unwrap_or_default()
-        .iter()
-        .map(|col| ResultColumn { name: col.name().to_owned(), type_name: format!("{:?}", col.column_type()) })
-        .collect();
-    let mut rows = Vec::new();
-    let mut has_more = false;
-    while let Some(item) = stream.next().await {
-        if let tiberius::QueryItem::Row(row) = item.map_err(mssql_err)? {
-            if rows.len() >= max {
-                has_more = true;
-                break;
-            }
-            rows.push(row.cells().map(|(col, cell)| tiberius_cell(cell, col.column_type())).collect());
-        }
-    }
-    Ok((columns, rows, None, has_more, first))
-}
-
 /// The server-side id of a connection (to cancel its statement from another one).
 macro_rules! backend_id {
     ($conn:expr, $sql:expr) => {{
@@ -526,7 +313,6 @@ impl Pool {
             Pool::Sqlite(_) => DbDriver::Sqlite,
             Pool::Postgres(_) => DbDriver::Postgres,
             Pool::Mysql(_) => DbDriver::Mysql,
-            Pool::SqlServer(_) => DbDriver::SqlServer,
         }
     }
 
@@ -667,60 +453,20 @@ impl Pool {
                     .map_err(db_err)?;
                 Ok(Pool::Mysql(pool))
             }
-            DbDriver::SqlServer => {
-                use tiberius::Config;
-                let mut config = Config::new();
-                config.host(&source.host);
-                config.port(source.port.unwrap_or(1433));
-                if !source.user.is_empty() {
-                    config.authentication(tiberius::AuthMethod::sql_server(
-                        source.user.clone(),
-                        password.unwrap_or_default().to_owned(),
-                    ));
-                }
-                if !source.database.is_empty() {
-                    config.database(&source.database);
-                }
-                if matches!(source.ssl, DbSslMode::Disable | DbSslMode::Prefer) {
-                    config.trust_cert();
-                }
-                let manager = MssqlConnectionManager(config);
-                let pool = bb8::Pool::builder()
-                    .max_size(MAX)
-                    .connection_timeout(timeout)
-                    .build(manager)
-                    .await
-                    .map_err(mssql_err)?;
-                let mut conn = pool.get_owned().await.map_err(mssql_pool_err)?;
-                conn.query("SELECT 1", &[]).await.map_err(mssql_err)?.into_results().await.map_err(mssql_err)?;
-                Ok(Pool::SqlServer(pool))
-            }
         }
     }
 
     pub async fn close(&self) {
-        match self {
-            Pool::SqlServer(_) => {}
-            _ => with_pool!(self, p => p.close().await),
-        }
+        with_pool!(self, p => p.close().await)
     }
 
     pub fn is_closed(&self) -> bool {
-        match self {
-            Pool::SqlServer(_) => false,
-            _ => with_pool!(self, p => p.is_closed()),
-        }
+        with_pool!(self, p => p.is_closed())
     }
 
     /// Runs `sql` (no row limit beyond `max`), for introspection: cells are text (see [`Cells::Text`]).
     pub async fn rows(&self, sql: &str, max: usize) -> IdeResult<Vec<Vec<Option<String>>>> {
-        let fetched: IdeResult<Fetched> = match self {
-            Pool::SqlServer(p) => {
-                let mut conn = p.get_owned().await.map_err(mssql_pool_err)?;
-                mssql_fetch(&mut conn, sql, max).await
-            }
-            _ => with_pool!(self, p => fetch!(p, sql, max, Cells::Text)),
-        };
+        let fetched: IdeResult<Fetched> = with_pool!(self, p => fetch!(p, sql, max, Cells::Text));
         Ok(fetched?.1)
     }
 
@@ -739,47 +485,21 @@ impl Pool {
     /// Runs `statements` in one transaction; each must change `expect_one`
     /// row when flagged (table editor submits).
     pub async fn transaction(&self, statements: &[(String, bool)]) -> IdeResult<u64> {
-        match self {
-            Pool::SqlServer(p) => {
-                let mut conn = p.get_owned().await.map_err(mssql_pool_err)?;
-                let result = async {
-                    mssql_command(&mut conn, "BEGIN TRAN").await?;
-                    let mut total = 0;
-                    for (sql, expect_one) in statements {
-                        let n = conn.execute(sql, &[]).await.map_err(mssql_err)?.total();
-                        if *expect_one && n != 1 {
-                            return Err(IdeError::invalid(format!(
-                                "{sql}: expected to change 1 row, changed {n}; nothing was saved"
-                            )));
-                        }
-                        total += n;
-                    }
-                    mssql_command(&mut conn, "COMMIT TRAN").await?;
-                    Ok(total)
+        with_pool!(self, p => {
+            let mut tx = p.begin().await.map_err(db_err)?;
+            let mut total = 0;
+            for (sql, expect_one) in statements {
+                let done = sqlx::raw_sql(sqlx::AssertSqlSafe(sql.clone())).execute(&mut *tx).await.map_err(db_err)?;
+                let n = done.rows_affected();
+                // MySQL reports 0 for an UPDATE that leaves the row unchanged.
+                if *expect_one && (n > 1 || (n == 0 && !matches!(self, Pool::Mysql(_)))) {
+                    return Err(IdeError::invalid(format!("{sql}: expected to change 1 row, changed {n}; nothing was saved")));
                 }
-                .await;
-                if result.is_err() && mssql_command(&mut conn, "IF @@TRANCOUNT > 0 ROLLBACK TRAN").await.is_err() {
-                    // A failed rollback must never return an open transaction to the pool.
-                    conn.0.take();
-                }
-                result
+                total += n;
             }
-            _ => with_pool!(self, p => {
-                let mut tx = p.begin().await.map_err(db_err)?;
-                let mut total = 0;
-                for (sql, expect_one) in statements {
-                    let done = sqlx::raw_sql(sqlx::AssertSqlSafe(sql.clone())).execute(&mut *tx).await.map_err(db_err)?;
-                    let n = done.rows_affected();
-                    // MySQL reports 0 for an UPDATE that leaves the row unchanged.
-                    if *expect_one && (n > 1 || (n == 0 && !matches!(self, Pool::Mysql(_)))) {
-                        return Err(IdeError::invalid(format!("{sql}: expected to change 1 row, changed {n}; nothing was saved")));
-                    }
-                    total += n;
-                }
-                tx.commit().await.map_err(db_err)?;
-                Ok(total)
-            }),
-        }
+            tx.commit().await.map_err(db_err)?;
+            Ok(total)
+        })
     }
 }
 
@@ -789,7 +509,6 @@ pub enum Held {
     Sqlite(PoolConnection<Sqlite>),
     Postgres(PoolConnection<Postgres>),
     Mysql(PoolConnection<MySql>),
-    SqlServer(Box<bb8::PooledConnection<'static, MssqlConnectionManager>>),
 }
 
 impl Held {
@@ -798,25 +517,18 @@ impl Held {
             Pool::Sqlite(p) => Held::Sqlite(p.acquire().await.map_err(db_err)?),
             Pool::Postgres(p) => Held::Postgres(p.acquire().await.map_err(db_err)?),
             Pool::Mysql(p) => Held::Mysql(p.acquire().await.map_err(db_err)?),
-            Pool::SqlServer(p) => Held::SqlServer(Box::new(p.get_owned().await.map_err(mssql_pool_err)?)),
         })
     }
 
     /// Runs a statement without results (`BEGIN`, `COMMIT`, `ROLLBACK`).
     pub async fn command(&mut self, sql: &str) -> IdeResult<()> {
+        let sql = sqlx::AssertSqlSafe(sql.to_owned());
         match self {
-            Held::SqlServer(c) => mssql_command(c, sql).await,
-            other => {
-                let sql = sqlx::AssertSqlSafe(sql.to_owned());
-                match other {
-                    Held::Sqlite(c) => sqlx::raw_sql(sql).execute(&mut **c).await.map(drop),
-                    Held::Postgres(c) => sqlx::raw_sql(sql).execute(&mut **c).await.map(drop),
-                    Held::Mysql(c) => sqlx::raw_sql(sql).execute(&mut **c).await.map(drop),
-                    Held::SqlServer(_) => unreachable!(),
-                }
-                .map_err(db_err)
-            }
+            Held::Sqlite(c) => sqlx::raw_sql(sql).execute(&mut **c).await.map(drop),
+            Held::Postgres(c) => sqlx::raw_sql(sql).execute(&mut **c).await.map(drop),
+            Held::Mysql(c) => sqlx::raw_sql(sql).execute(&mut **c).await.map(drop),
         }
+        .map_err(db_err)
     }
 
     /// Closes the connection instead of returning it to the pool (its statement was
@@ -830,9 +542,6 @@ impl Held {
             Held::Mysql(c) => {
                 let _ = c.detach().close().await;
             }
-            Held::SqlServer(mut c) => {
-                c.0.take();
-            }
         }
     }
 
@@ -880,13 +589,6 @@ impl Held {
                 run!(c, Some("SELECT pg_backend_pid()"), |b: String| format!("SELECT pg_cancel_backend({b})"))
             }
             Held::Mysql(c) => run!(c, Some("SELECT CONNECTION_ID()"), |b: String| format!("KILL QUERY {b}")),
-            Held::SqlServer(c) => {
-                // Tiberius has no attention/cancel API; stop reading and discard the connection.
-                tokio::select! {
-                    r = mssql_fetch(c, sql, max_rows) => r?,
-                    () = cancel.cancelled() => return Err(IdeError::cancelled()),
-                }
-            }
         };
         let (columns, rows, affected, has_more, first) = fetched;
         let elapsed_ms = started.elapsed().as_secs_f64() * 1000.0;
@@ -906,7 +608,6 @@ impl Held {
 pub fn begin_statement(driver: DbDriver) -> &'static str {
     match driver {
         DbDriver::Mysql => "START TRANSACTION",
-        DbDriver::SqlServer => "BEGIN TRAN",
         DbDriver::Sqlite | DbDriver::Postgres => "BEGIN",
     }
 }
@@ -923,95 +624,6 @@ mod tests {
     use super::*;
     use crate::source::{DbOptions, DbProperty};
 
-    #[test]
-    fn discarded_sqlserver_connections_are_broken() {
-        let manager = MssqlConnectionManager(tiberius::Config::new());
-        assert!(manager.has_broken(&mut MssqlConnection(None)));
-    }
-
-    #[tokio::test]
-    async fn sqlserver_connect_reports_io_errors() {
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let mut config = tiberius::Config::new();
-        config.host("127.0.0.1");
-        config.port(listener.local_addr().unwrap().port());
-        drop(listener);
-        let result = MssqlConnectionManager(config).connect().await;
-        assert!(matches!(result, Err(tiberius::error::Error::Io { .. })));
-    }
-
-    #[test]
-    fn sqlserver_cells_preserve_values_and_nulls() {
-        use std::borrow::Cow;
-        use tiberius::time::{Date, DateTime, DateTime2, DateTimeOffset, SmallDateTime, Time};
-        use tiberius::{ColumnData as C, ColumnType as T, Uuid, numeric::Numeric};
-        let dt = DateTime2::new(Date::new(693_595), Time::new(1234567, 7));
-        let cases = [
-            (C::U8(Some(255)), "255"),
-            (C::I16(Some(-123)), "-123"),
-            (C::I32(Some(-456)), "-456"),
-            (C::I64(Some(i64::MAX)), "9223372036854775807"),
-            (C::F32(Some(1.25)), "1.25"),
-            (C::F64(Some(1.25)), "1.25"),
-            (C::Bit(Some(true)), "true"),
-            (C::String(Some(Cow::Borrowed("hello"))), "hello"),
-            (C::Binary(Some(Cow::Borrowed(&[0, 0xAB, 0xFF]))), "0x00ABFF"),
-            (
-                C::Guid(Some(Uuid::parse_str("ABCDEF01-2345-6789-ABCD-EF0123456789").unwrap())),
-                "abcdef01-2345-6789-abcd-ef0123456789",
-            ),
-            (C::Numeric(Some(Numeric::new_with_scale(-123, 5))), "-0.00123"),
-            (C::Numeric(Some(Numeric::new_with_scale(12300, 4))), "1.2300"),
-            (
-                C::Numeric(Some(Numeric::new_with_scale(10i128.pow(38) - 1, 0))),
-                "99999999999999999999999999999999999999",
-            ),
-            (C::Xml(Some(Cow::Owned(tiberius::xml::XmlData::new("<a/>")))), "<a/>"),
-            (C::Date(Some(Date::new(0))), "0001-01-01"),
-            (C::Date(Some(Date::new(3_652_058))), "9999-12-31"),
-            (C::Time(Some(Time::new(452961234567, 7))), "12:34:56.1234567"),
-            (C::DateTime(Some(DateTime::new(-1, 1))), "1899-12-31 00:00:00.003"),
-            (C::DateTime(Some(DateTime::new(0, 2))), "1900-01-01 00:00:00.007"),
-            (C::SmallDateTime(Some(SmallDateTime::new(0, 754))), "1900-01-01 12:34:00"),
-            (C::DateTime2(Some(dt)), "1900-01-01 00:00:00.1234567"),
-            (C::DateTimeOffset(Some(DateTimeOffset::new(dt, -60))), "1899-12-31 23:00:00.1234567-01:00"),
-            (C::DateTimeOffset(Some(DateTimeOffset::new(dt, 330))), "1900-01-01 05:30:00.1234567+05:30"),
-        ];
-        for (cell, expected) in cases {
-            assert_eq!(tiberius_cell(&cell, T::Null).as_deref(), Some(expected), "{cell:?}");
-        }
-        for cell in [
-            C::U8(None),
-            C::I16(None),
-            C::I32(None),
-            C::I64(None),
-            C::F32(None),
-            C::F64(None),
-            C::Bit(None),
-            C::String(None),
-            C::Guid(None),
-            C::Binary(None),
-            C::Numeric(None),
-            C::Xml(None),
-            C::Date(None),
-            C::Time(None),
-            C::DateTime(None),
-            C::SmallDateTime(None),
-            C::DateTime2(None),
-            C::DateTimeOffset(None),
-        ] {
-            assert_eq!(tiberius_cell(&cell, T::Null), None);
-        }
-        for ty in [T::Money, T::Money4] {
-            for (v, expected) in
-                [(0.0, "0.0000"), (1.2, "1.2000"), (-123.4567, "-123.4567"), (214748.3647, "214748.3647")]
-            {
-                assert_eq!(tiberius_cell(&C::F64(Some(v)), ty).as_deref(), Some(expected));
-            }
-            assert_eq!(tiberius_cell(&C::F64(None), ty), None);
-        }
-    }
-
     fn prop(name: &str, value: &str) -> DbProperty {
         DbProperty { name: name.into(), value: value.into() }
     }

crates/ide-db/src/lib.rs

@@ -549,7 +549,6 @@ impl DbManager {
             DbDriver::Sqlite => "SELECT 'SQLite ' || sqlite_version()",
             DbDriver::Postgres => "SELECT version()",
             DbDriver::Mysql => "SELECT CONCAT(@@version_comment, ' ', VERSION())",
-            DbDriver::SqlServer => "SELECT @@VERSION",
         };
         let v = pool.rows(version, 1).await.ok().and_then(|r| r.into_iter().next()?.into_iter().next()?);
         pool.close().await;
@@ -822,13 +821,6 @@ impl DbManager {
                 let ddl = cells(pool.rows(&q, 1).await?, 1).into_iter().next();
                 ddl.map(|d| format!("{d};\n")).ok_or_else(missing)
             }
-            DbDriver::SqlServer => {
-                let obj = format!("{}.{}", schema, name).replace('\'', "''");
-                let ddl = cells(pool.rows(&format!("SELECT OBJECT_DEFINITION(OBJECT_ID('{}'))", obj), 1).await?, 0)
-                    .into_iter()
-                    .next();
-                ddl.map(|d| format!("{d};\n")).ok_or_else(missing)
-            }
             DbDriver::Postgres => {
                 let rel = pool.rows(&sql::postgres_relation(schema, name), 1).await?.into_iter().next();
                 let (oid, kind) = match rel.as_deref() {

crates/ide-db/src/plan.rs

@@ -36,7 +36,6 @@ pub fn explain_statement(driver: DbDriver, statement: &str) -> String {
         DbDriver::Sqlite => format!("EXPLAIN QUERY PLAN {s}"),
         DbDriver::Postgres => format!("EXPLAIN (FORMAT JSON) {s}"),
         DbDriver::Mysql => format!("EXPLAIN {s}"),
-        DbDriver::SqlServer => format!("SET SHOWPLAN_TEXT ON; {s}"),
     }
 }
 
@@ -60,7 +59,6 @@ pub fn parse(driver: DbDriver, result: &QueryResult) -> IdeResult<Vec<PlanNode>>
             let names: Vec<&str> = result.columns.iter().map(|c| c.name.as_str()).collect();
             Ok(mysql(&names, &result.rows))
         }
-        DbDriver::SqlServer => Ok(Vec::new()),
     }
 }
 
@@ -199,7 +197,6 @@ mod tests {
         assert_eq!(explain_statement(DbDriver::Sqlite, "select 1;"), "EXPLAIN QUERY PLAN select 1");
         assert_eq!(explain_statement(DbDriver::Postgres, " select 1 "), "EXPLAIN (FORMAT JSON) select 1");
         assert_eq!(explain_statement(DbDriver::Mysql, "select 1"), "EXPLAIN select 1");
-        assert_eq!(explain_statement(DbDriver::SqlServer, "select 1"), "SET SHOWPLAN_TEXT ON; select 1");
     }
 
     #[test]

crates/ide-db/src/source.rs

@@ -16,8 +16,6 @@ pub enum DbDriver {
     Postgres,
     /// MySQL and MariaDB.
     Mysql,
-    /// Microsoft SQL Server.
-    SqlServer,
 }
 
 impl DbDriver {
@@ -26,7 +24,6 @@ impl DbDriver {
             DbDriver::Sqlite => None,
             DbDriver::Postgres => Some(5432),
             DbDriver::Mysql => Some(3306),
-            DbDriver::SqlServer => Some(1433),
         }
     }
 }
@@ -251,7 +248,6 @@ pub fn scheme_driver(scheme: &str) -> Option<DbDriver> {
         "postgres" | "postgresql" | "pgsql" | "redshift" | "cockroachdb" | "cockroach" | "yugabytedb"
         | "timescaledb" | "greenplum" => Some(DbDriver::Postgres),
         "mysql" | "mariadb" | "tidb" | "singlestore" | "memsql" | "oceanbase" => Some(DbDriver::Mysql),
-        "sqlserver" | "mssql" | "mssqlserver" => Some(DbDriver::SqlServer),
         "sqlite" | "sqlite3" => Some(DbDriver::Sqlite),
         _ => None,
     }
@@ -476,14 +472,6 @@ mod tests {
         assert_eq!(load(tmp.path()).unwrap(), vec![s]);
     }
 
-    #[test]
-    fn sqlserver_defaults() {
-        assert_eq!(DbDriver::SqlServer.default_port(), Some(1433));
-        assert_eq!(scheme_driver("sqlserver"), Some(DbDriver::SqlServer));
-        assert_eq!(scheme_driver("mssql"), Some(DbDriver::SqlServer));
-        assert_eq!(scheme_driver("mssqlserver"), Some(DbDriver::SqlServer));
-    }
-
     #[test]
     fn parses_urls() {
         let u = parse_url("jdbc:postgresql://ann:s%[email protected]:5433/shop?sslmode=require&search_path=app").unwrap();

crates/ide-db/src/sql.rs

@@ -8,7 +8,6 @@ use specta::Type;
 pub fn quote_ident(driver: DbDriver, name: &str) -> String {
     match driver {
         DbDriver::Mysql => format!("`{}`", name.replace('`', "``")),
-        DbDriver::SqlServer => format!("[{}]", name.replace(']', "]]")),
         _ => format!("\"{}\"", name.replace('"', "\"\"")),
     }
 }
@@ -53,7 +52,6 @@ pub fn schemas(driver: DbDriver, system: bool) -> &'static str {
              WHERE schema_name NOT LIKE 'pg\\_toast%' AND schema_name NOT LIKE 'pg\\_temp%' ORDER BY 1"
         }
         DbDriver::Mysql if system => "SELECT schema_name FROM information_schema.schemata ORDER BY 1",
-        DbDriver::SqlServer if system => "SELECT schema_name FROM information_schema.schemata ORDER BY 1",
         DbDriver::Postgres => {
             "SELECT schema_name FROM information_schema.schemata \
              WHERE schema_name NOT IN ('pg_catalog', 'information_schema') \
@@ -63,10 +61,6 @@ pub fn schemas(driver: DbDriver, system: bool) -> &'static str {
             "SELECT schema_name FROM information_schema.schemata \
              WHERE schema_name NOT IN ('information_schema', 'mysql', 'performance_schema', 'sys') ORDER BY 1"
         }
-        DbDriver::SqlServer => {
-            "SELECT schema_name FROM information_schema.schemata \
-             WHERE schema_name NOT IN ('sys', 'information_schema', 'guest') ORDER BY 1"
-        }
     }
 }
 
@@ -89,11 +83,6 @@ pub fn tables(driver: DbDriver, schema: &str) -> String {
              FROM information_schema.tables WHERE table_schema = {} ORDER BY 1",
             quote_literal(driver, schema)
         ),
-        DbDriver::SqlServer => format!(
-            "SELECT table_name, CASE WHEN table_type LIKE '%VIEW%' THEN 'view' ELSE 'table' END \
-             FROM information_schema.tables WHERE table_schema = {} ORDER BY 1",
-            quote_literal(driver, schema)
-        ),
     }
 }
 
@@ -121,16 +110,6 @@ pub fn columns(driver: DbDriver, schema: &str, table: &str) -> String {
              FROM information_schema.columns WHERE table_schema = {s} AND table_name = {t} \
              ORDER BY ordinal_position"
         ),
-        DbDriver::SqlServer => format!(
-            "SELECT column_name, data_type, is_nullable, column_default, \
-             CASE WHEN EXISTS (SELECT 1 FROM information_schema.table_constraints tc \
-               JOIN information_schema.key_column_usage k ON k.constraint_name = tc.constraint_name \
-               AND k.table_schema = tc.table_schema AND k.table_name = tc.table_name \
-               WHERE tc.constraint_type = 'PRIMARY KEY' AND tc.table_schema = {s} \
-               AND tc.table_name = {t} AND k.column_name = c.column_name) THEN 1 ELSE 0 END \
-             FROM information_schema.columns c WHERE c.table_schema = {s} AND c.table_name = {t} \
-             ORDER BY c.ordinal_position"
-        ),
     }
 }
 
@@ -155,13 +134,6 @@ pub fn indexes(driver: DbDriver, schema: &str, table: &str) -> String {
              FROM information_schema.statistics WHERE table_schema = {s} AND table_name = {t} \
              ORDER BY index_name, seq_in_index"
         ),
-        DbDriver::SqlServer => format!(
-            "SELECT i.name, CASE WHEN i.is_unique = 1 THEN 1 ELSE 0 END, c.name \
-             FROM sys.indexes i JOIN sys.index_columns ic ON ic.object_id = i.object_id AND ic.index_id = i.index_id \
-             JOIN sys.columns c ON c.object_id = ic.object_id AND c.column_id = ic.column_id \
-             WHERE OBJECT_SCHEMA_NAME(i.object_id) = {s} AND OBJECT_NAME(i.object_id) = {t} AND i.name IS NOT NULL \
-             ORDER BY i.name, ic.key_ordinal"
-        ),
     }
 }
 
@@ -199,20 +171,6 @@ pub fn completion_columns(driver: DbDriver) -> &'static str {
              WHERE c.table_schema NOT IN ('information_schema', 'mysql', 'performance_schema', 'sys') \
              ORDER BY c.table_schema, c.table_name, c.ordinal_position LIMIT 50000"
         }
-        DbDriver::SqlServer => {
-            "SELECT c.table_schema, c.table_name, CASE WHEN t.table_type LIKE '%VIEW%' THEN 'view' ELSE 'table' END, \
-             c.column_name, c.data_type, c.is_nullable, \
-             CASE WHEN EXISTS (SELECT 1 FROM information_schema.table_constraints tc \
-               JOIN information_schema.key_column_usage k ON k.constraint_name = tc.constraint_name \
-               AND k.table_schema = tc.table_schema AND k.table_name = tc.table_name \
-               WHERE tc.constraint_type = 'PRIMARY KEY' AND tc.table_schema = c.table_schema \
-               AND tc.table_name = c.table_name AND k.column_name = c.column_name) THEN 1 ELSE 0 END, \
-             CASE WHEN c.column_default IS NOT NULL THEN 1 ELSE 0 END \
-             FROM information_schema.columns c JOIN information_schema.tables t \
-             ON t.table_schema = c.table_schema AND t.table_name = c.table_name \
-             WHERE c.table_schema NOT IN ('sys', 'information_schema') \
-             ORDER BY c.table_schema, c.table_name, c.ordinal_position"
-        }
     }
 }
 
@@ -244,13 +202,6 @@ pub fn foreign_keys(driver: DbDriver) -> &'static str {
              AND table_schema NOT IN ('information_schema', 'mysql', 'performance_schema', 'sys') \
              ORDER BY table_schema, table_name, constraint_name, ordinal_position LIMIT 20000"
         }
-        DbDriver::SqlServer => {
-            "SELECT table_schema, table_name, constraint_name, column_name, \
-             referenced_table_schema, referenced_table_name, referenced_column_name \
-             FROM information_schema.key_column_usage WHERE referenced_table_name IS NOT NULL \
-             AND table_schema NOT IN ('sys', 'information_schema') \
-             ORDER BY table_schema, table_name, constraint_name, ordinal_position"
-        }
     }
 }
 
@@ -267,9 +218,6 @@ pub fn table_foreign_keys(driver: DbDriver, schema: &str, table: &str) -> String
         DbDriver::Mysql => format!(
             "SELECT table_schema, table_name, constraint_name, column_name,              referenced_table_schema, referenced_table_name, referenced_column_name              FROM information_schema.key_column_usage WHERE referenced_table_name IS NOT NULL              AND table_schema = {s} AND table_name = {t} ORDER BY constraint_name, ordinal_position"
         ),
-        DbDriver::SqlServer => format!(
-            "SELECT table_schema, table_name, constraint_name, column_name,              referenced_table_schema, referenced_table_name, referenced_column_name              FROM information_schema.key_column_usage WHERE referenced_table_name IS NOT NULL              AND table_schema = {s} AND table_name = {t} ORDER BY constraint_name, ordinal_position"
-        ),
     }
 }
 
@@ -279,7 +227,6 @@ pub fn current_schema(driver: DbDriver) -> Option<&'static str> {
         DbDriver::Sqlite => None,
         DbDriver::Postgres => Some("SELECT current_schema()"),
         DbDriver::Mysql => Some("SELECT DATABASE()"),
-        DbDriver::SqlServer => Some("SELECT DB_NAME()"),
     }
 }
 
@@ -303,14 +250,8 @@ pub fn table_page(
 ) -> String {
     let mut sql = format!("SELECT * FROM {}", qualified(driver, schema, table));
     if let Some(f) = filter.map(str::trim).filter(|f| !f.is_empty()) {
-        let mut f = f.strip_prefix("WHERE ").or_else(|| f.strip_prefix("where ")).unwrap_or(f);
-        if let Some(i) = f.find(';') {
-            f = &f[..i];
-        }
-        f = f.trim();
-        if !f.is_empty() {
-            sql.push_str(&format!(" WHERE {f}"));
-        }
+        let f = f.strip_prefix("WHERE ").or_else(|| f.strip_prefix("where ")).unwrap_or(f);
+        sql.push_str(&format!(" WHERE {f}"));
     }
     if !sort.is_empty() {
         let keys: Vec<String> = sort
@@ -319,14 +260,7 @@ pub fn table_page(
             .collect();
         sql.push_str(&format!(" ORDER BY {}", keys.join(", ")));
     }
-    if driver == DbDriver::SqlServer {
-        if sort.is_empty() {
-            sql.push_str(" ORDER BY (SELECT 1)");
-        }
-        sql.push_str(&format!(" OFFSET {offset} ROWS FETCH NEXT {} ROWS ONLY", limit + 1));
-    } else {
-        sql.push_str(&format!(" LIMIT {} OFFSET {offset}", limit + 1));
-    }
+    sql.push_str(&format!(" LIMIT {} OFFSET {offset}", limit + 1));
     sql
 }
 
@@ -466,10 +400,6 @@ pub fn triggers(driver: DbDriver, schema: &str, table: &str) -> String {
             "SELECT trigger_name, lower(action_timing), lower(event_manipulation) FROM information_schema.triggers \
              WHERE event_object_schema = {s} AND event_object_table = {t} ORDER BY 1"
         ),
-        DbDriver::SqlServer => format!(
-            "SELECT t.name, lower(te.type_desc), '' FROM sys.triggers t \
-             WHERE OBJECT_SCHEMA_NAME(t.parent_id) = {s} AND OBJECT_NAME(t.parent_id) = {t} ORDER BY 1"
-        ),
     }
 }
 
@@ -508,10 +438,6 @@ pub fn routines(driver: DbDriver, schema: &str) -> Option<String> {
               AND p.specific_name = r.specific_name AND p.ordinal_position > 0), r.dtd_identifier \
              FROM information_schema.routines r WHERE r.routine_schema = {s} ORDER BY 1"
         )),
-        DbDriver::SqlServer => Some(format!(
-            "SELECT r.routine_name, lower(r.routine_type), '', r.data_type \
-             FROM information_schema.routines r WHERE r.routine_schema = {s} ORDER BY 1"
-        )),
     }
 }
 
@@ -633,10 +559,6 @@ mod tests {
             "SELECT * FROM \"public\".\"users\" WHERE age > 3 ORDER BY \"id\" DESC LIMIT 51 OFFSET 100"
         );
         assert_eq!(table_page(DbDriver::Mysql, "", "t", Some("  "), &[], 0, 10), "SELECT * FROM `t` LIMIT 11 OFFSET 0");
-        assert_eq!(
-            table_page(DbDriver::SqlServer, "dbo", "users", Some("id = 1;"), &[], 0, 500),
-            "SELECT * FROM [dbo].[users] WHERE id = 1 ORDER BY (SELECT 1) OFFSET 0 ROWS FETCH NEXT 501 ROWS ONLY"
-        );
     }
 
     #[test]
@@ -664,30 +586,6 @@ mod tests {
         assert!(edit_statement(DbDriver::Postgres, "s", "t", &DbRowEdit::Delete { key: vec![] }).is_err());
     }
 
-    #[test]
-    fn sqlserver_quoting_and_schema() {
-        assert_eq!(quote_ident(DbDriver::SqlServer, "a]b"), "[a]]b]");
-        assert_eq!(qualified(DbDriver::SqlServer, "dbo", "t"), "[dbo].[t]");
-        assert_eq!(qualified(DbDriver::SqlServer, "", "t"), "[t]");
-        assert_eq!(current_schema(DbDriver::SqlServer), Some("SELECT DB_NAME()"));
-        assert_eq!(crate::conn::begin_statement(DbDriver::SqlServer), "BEGIN TRAN");
-        assert_eq!(
-            schemas(DbDriver::SqlServer, true),
-            "SELECT schema_name FROM information_schema.schemata ORDER BY 1"
-        );
-        assert!(schemas(DbDriver::SqlServer, false).contains("NOT IN ('sys', 'information_schema', 'guest')"));
-    }
-
-    #[test]
-    fn sqlserver_introspection_queries() {
-        assert!(tables(DbDriver::SqlServer, "dbo").contains("information_schema.tables"));
-        assert!(columns(DbDriver::SqlServer, "dbo", "t").contains("information_schema.columns"));
-        assert!(indexes(DbDriver::SqlServer, "dbo", "t").contains("sys.indexes"));
-        assert!(foreign_keys(DbDriver::SqlServer).contains("referenced_table_name IS NOT NULL"));
-        assert!(table_foreign_keys(DbDriver::SqlServer, "dbo", "t").contains("table_schema = 'dbo'"));
-        assert!(completion_columns(DbDriver::SqlServer).contains("information_schema.columns"));
-    }
-
     #[test]
     fn sqlite_trigger_events() {
         let ev = sqlite_trigger_event;

crates/ide-db/tests/sqlserver.rs

@@ -1,97 +0,0 @@
-//! Live SQL Server checks, skipped unless OPENIDEA_TEST_SQLSERVER=host:port:user:password
-//! names a throwaway server.
-
-use ide_core::CancellationToken;
-use ide_db::{DataSource, DbDriver, DbSslMode, Held, Pool};
-use std::time::Duration;
-
-#[tokio::test]
-async fn sqlserver_values_paging_transactions_and_cancellation() {
-    let Ok(server) = std::env::var("OPENIDEA_TEST_SQLSERVER") else { return };
-    let mut parts = server.splitn(4, ':');
-    let source = DataSource {
-        driver: DbDriver::SqlServer,
-        host: parts.next().unwrap().into(),
-        port: Some(parts.next().unwrap().parse().unwrap()),
-        user: parts.next().unwrap().into(),
-        database: "tempdb".into(),
-        ssl: DbSslMode::Disable,
-        ..Default::default()
-    };
-    let pool = Pool::connect(&source, parts.next(), None).await.unwrap();
-    let cancel = CancellationToken::new();
-    let mut held = Held::acquire(&pool).await.unwrap();
-    let table = format!("tempdb.dbo.oi_pr276_values_{}", std::process::id());
-    held.command(&format!("CREATE TABLE {table} (id int PRIMARY KEY, d decimal(38, 7), dt datetime2(7), guid uniqueidentifier, m money, tiny tinyint, x xml)")).await.unwrap();
-    held.command(&format!("INSERT INTO {table} VALUES (1, 12345678901234567890.1234567, '2024-02-29T12:34:56.1234567', 'abcdef01-2345-6789-abcd-ef0123456789', 12.3400, 255, '<a/>'), (2, NULL, NULL, NULL, NULL, NULL, NULL)")).await.unwrap();
-    let r = held.execute(&pool, &format!("SELECT * FROM {table} ORDER BY id"), 1, &cancel).await.unwrap();
-    assert!(r.has_more);
-    assert_eq!(
-        r.rows[0],
-        [
-            "1",
-            "12345678901234567890.1234567",
-            "2024-02-29 12:34:56.1234567",
-            "abcdef01-2345-6789-abcd-ef0123456789",
-            "12.3400",
-            "255",
-            "<a/>"
-        ]
-        .map(|s| Some(s.to_owned()))
-    );
-    let r = held.execute(&pool, &format!("SELECT * FROM {table} WHERE id = 2"), 5, &cancel).await.unwrap();
-    assert!(!r.has_more);
-    assert!(r.rows[0][1..].iter().all(Option::is_none));
-    let r = held.execute(&pool, &format!("SELECT * FROM {table} WHERE id = 3"), 5, &cancel).await.unwrap();
-    assert_eq!(r.columns.len(), 7);
-    assert!(r.rows.is_empty());
-    let r = held.execute(&pool,
-        "SELECT CAST('2024-02-29T00:15:00.1234567+05:30' AS datetimeoffset(7)), CAST('2024-02-29' AS date), CAST('12:34:56.1234567' AS time(7)), CAST('2024-02-29T12:34:56.007' AS datetime), CAST('2024-02-29T12:34:00' AS smalldatetime), CAST(-12.3400 AS smallmoney)",
-        1, &cancel).await.unwrap();
-    assert_eq!(
-        r.rows[0],
-        [
-            "2024-02-29 00:15:00.1234567+05:30",
-            "2024-02-29",
-            "12:34:56.1234567",
-            "2024-02-29 12:34:56.007",
-            "2024-02-29 12:34:00",
-            "-12.3400"
-        ]
-        .map(|s| Some(s.to_owned()))
-    );
-    held.command(&format!("DROP TABLE {table}")).await.unwrap();
-    drop(held);
-
-    // A unique permanent table lets transaction calls acquire any pooled connection.
-    let table = format!("tempdb.dbo.oi_pr276_{}", std::process::id());
-    pool.execute(&format!("CREATE TABLE {table} (id int PRIMARY KEY, v int)"), 1, &cancel).await.unwrap();
-    pool.transaction(&[(format!("INSERT INTO {table} VALUES (1, 10)"), true)]).await.unwrap();
-    for failing in [format!("INSERT INTO {table} VALUES (1, 20)"), format!("UPDATE {table} SET v = 30 WHERE id = 999")]
-    {
-        assert!(
-            pool.transaction(&[(format!("UPDATE {table} SET v = 99 WHERE id = 1"), true), (failing, true)])
-                .await
-                .is_err()
-        );
-        assert_eq!(pool.rows(&format!("SELECT v FROM {table}"), 1).await.unwrap()[0][0].as_deref(), Some("10"));
-        assert_eq!(pool.rows("SELECT @@TRANCOUNT", 1).await.unwrap()[0][0].as_deref(), Some("0"));
-    }
-    assert_eq!(pool.transaction(&[(format!("UPDATE {table} SET v = 11 WHERE id = 1"), true)]).await.unwrap(), 1);
-    pool.execute(&format!("DROP TABLE {table}"), 1, &cancel).await.unwrap();
-
-    let cancel = CancellationToken::new();
-    let stop = cancel.clone();
-    let task = tokio::spawn(async move {
-        tokio::time::sleep(Duration::from_millis(100)).await;
-        stop.cancel();
-    });
-    assert!(
-        tokio::time::timeout(Duration::from_secs(2), pool.execute("WAITFOR DELAY '00:00:10'; SELECT 1", 1, &cancel))
-            .await
-            .unwrap()
-            .is_err()
-    );
-    task.await.unwrap();
-    assert_eq!(pool.rows("SELECT 1", 1).await.unwrap()[0][0].as_deref(), Some("1"));
-}

crates/ide-docker/Cargo.toml

@@ -13,5 +13,8 @@ specta.workspace = true
 tracing.workspace = true
 which = "8"
 
+[target.'cfg(unix)'.dependencies]
+libc = "0.2"
+
 [dev-dependencies]
 tempfile.workspace = true

crates/ide-docker/src/process.rs

@@ -1,16 +1,11 @@
 //! Child processes of the docker CLI: bounded runs and cancellable line streams.
 
-use ide_core::process::terminate_tree;
 use ide_core::{CancellationToken, IdeError, IdeResult};
 use std::io::Read;
 use std::process::{Child, Command, Stdio};
 use std::sync::mpsc;
 use std::time::{Duration, Instant};
 
-/// How long a cancelled or timed-out child's process group (CLI plugins such as compose)
-/// gets to exit on `SIGTERM`, and clean up, before `SIGKILL`.
-const KILL_GRACE: Duration = Duration::from_millis(20);
-
 pub(crate) struct Output {
     pub stdout: String,
     pub stderr: String,
@@ -25,18 +20,41 @@ pub(crate) enum Stream {
 
 fn prepare(cmd: &mut Command) {
     cmd.stdin(Stdio::null()).stdout(Stdio::piped()).stderr(Stdio::piped());
-    ide_core::process::prepare(ide_core::process::own_group(cmd));
+    #[cfg(unix)]
+    {
+        use std::os::unix::process::CommandExt;
+        cmd.process_group(0);
+    }
+    ide_core::process::prepare(cmd);
 }
 
 fn spawn(cmd: &mut Command) -> IdeResult<Child> {
     cmd.spawn().map_err(|e| IdeError::unavailable(format!("could not run docker: {e}")))
 }
 
+/// Kills the child and, on Unix, its whole process group (CLI plugins such as compose).
+pub(crate) fn kill(child: &mut Child) {
+    #[cfg(unix)]
+    {
+        let pid = child.id() as libc::pid_t;
+        // SAFETY: plain syscall; the child leads its own process group (`prepare`).
+        unsafe {
+            libc::kill(-pid, libc::SIGTERM);
+        }
+        std::thread::sleep(Duration::from_millis(20));
+        unsafe {
+            libc::kill(-pid, libc::SIGKILL);
+        }
+    }
+    let _ = child.kill();
+    let _ = child.wait();
+}
+
 fn read_all(mut pipe: impl Read + Send + 'static) -> std::thread::JoinHandle<String> {
     std::thread::spawn(move || {
         let mut buf = Vec::new();
         let _ = pipe.read_to_end(&mut buf);
-        ide_core::output_encoding::decode_tool_output(&buf)
+        String::from_utf8_lossy(&buf).into_owned()
     })
 }
 
@@ -70,11 +88,11 @@ pub(crate) fn run_with_input(
             break status;
         }
         if cancel.is_some_and(CancellationToken::is_cancelled) {
-            terminate_tree(&mut child, KILL_GRACE);
+            kill(&mut child);
             return Err(IdeError::cancelled());
         }
         if Instant::now() >= deadline {
-            terminate_tree(&mut child, KILL_GRACE);
+            kill(&mut child);
             return Err(IdeError::unavailable("docker did not respond in time"));
         }
         std::thread::sleep(Duration::from_millis(10));
@@ -97,7 +115,7 @@ fn spawn_reader(mut pipe: impl Read + Send + 'static, tx: mpsc::Sender<Event>, s
         let mut pending: Vec<u8> = Vec::new();
         let flush = |pending: &mut Vec<u8>| {
             if !pending.is_empty() {
-                let line = ide_core::output_encoding::decode_tool_output(pending).trim_end().to_string();
+                let line = String::from_utf8_lossy(pending).trim_end().to_string();
                 pending.clear();
                 let _ = tx.send(Event::Line(stream, line));
             }
@@ -148,7 +166,7 @@ pub(crate) fn stream(
     let mut stderr_tail: Vec<String> = Vec::new();
     while open > 0 {
         if cancel.is_cancelled() {
-            terminate_tree(&mut child, KILL_GRACE);
+            kill(&mut child);
             return Err(IdeError::cancelled());
         }
         match rx.recv_timeout(Duration::from_millis(50)) {
@@ -171,7 +189,7 @@ pub(crate) fn stream(
             break status;
         }
         if cancel.is_cancelled() {
-            terminate_tree(&mut child, KILL_GRACE);
+            kill(&mut child);
             return Err(IdeError::cancelled());
         }
         std::thread::sleep(Duration::from_millis(10));

crates/ide-extension/Cargo.toml

@@ -1,24 +0,0 @@
-[package]
-name = "ide-extension"
-description = "Plugin manifest, extension points, contribution registry and capability model (no Wasm runtime)"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[dependencies]
-ide-core.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-specta.workspace = true
-specta-typescript.workspace = true
-toml.workspace = true
-tracing.workspace = true
-parking_lot.workspace = true
-semver = "1"
-blake3.workspace = true
-zip.workspace = true
-base64.workspace = true
-ed25519-dalek = "3"
-
-[dev-dependencies]
-tempfile.workspace = true

crates/ide-extension/src/capability.rs

@@ -1,277 +0,0 @@
-//! What a plugin may do beyond pure computation, and how risky each grant is.
-//!
-//! Capabilities are written as strings in the manifest (`project.read`,
-//! `net:crates.io`, `process:cargo`) and stored the same way in the grant
-//! ledger. The 0.1 permission names (`project-read`, …) parse as their 0.2
-//! equivalents.
-
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use specta::Type;
-use std::fmt;
-use std::str::FromStr;
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum Capability {
-    /// Read files inside the project root; the project root itself.
-    ProjectRead,
-    /// The focused editor's file, selection and text.
-    EditorRead,
-    /// Edit the focused editor (versioned edits).
-    EditorWrite,
-    VcsRead,
-    VcsWrite,
-    /// The plugin's own key-value store and data directory.
-    Storage,
-    /// The plugin's own secrets (kept in the client's OS keychain).
-    Secrets,
-    /// Workbench events (file opened, saved, focus…), not keystrokes.
-    Events,
-    /// Keystrokes and editor input events.
-    InputEvents,
-    /// The system clipboard, from the plugin's web views.
-    Clipboard,
-    /// HTTP(S) to one host (`*.example.com` matches subdomains).
-    Net(String),
-    /// Run one external program. Full code execution: never fine-grained.
-    Process(String),
-    /// Read files outside the project under one path.
-    FsRead(String),
-}
-
-/// How a grant is presented (plan 4.2).
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub enum Risk {
-    /// Listed on the install page, one confirmation.
-    Low,
-    /// Listed separately with its purpose.
-    Medium,
-    /// Separate dialog: "equivalent to running arbitrary code on this machine".
-    High,
-}
-
-impl Capability {
-    pub fn risk(&self) -> Risk {
-        match self {
-            Self::ProjectRead | Self::EditorRead | Self::Storage | Self::Events | Self::VcsRead => Risk::Low,
-            Self::EditorWrite | Self::VcsWrite | Self::Net(_) | Self::Secrets | Self::InputEvents | Self::Clipboard => {
-                Risk::Medium
-            }
-            Self::Process(_) | Self::FsRead(_) => Risk::High,
-        }
-    }
-
-    /// Low-risk capabilities that the one-time migration of the 0.1 "declared
-    /// means granted" behaviour may grant automatically (plan 4.6).
-    pub fn auto_migrates(&self) -> bool {
-        self.risk() == Risk::Low
-    }
-
-    /// Short user-facing description for install and grant pages.
-    pub fn describe(&self) -> String {
-        match self {
-            Self::ProjectRead => "Read files in the open project".into(),
-            Self::EditorRead => "Read the focused editor's file and selection".into(),
-            Self::EditorWrite => "Change text in the editor".into(),
-            Self::VcsRead => "Read version control state".into(),
-            Self::VcsWrite => "Change version control state (commit, fetch, checkout)".into(),
-            Self::Storage => "Store its own data".into(),
-            Self::Secrets => "Store secrets in the system keychain".into(),
-            Self::Events => "Observe workbench events (files opened, saved, focus)".into(),
-            Self::InputEvents => "Observe keystrokes and editor input".into(),
-            Self::Clipboard => "Read and write the clipboard from its web views".into(),
-            Self::Net(host) => format!("Connect to {host} (from the machine the project is on)"),
-            Self::Process(bin) => format!("Run {bin} — equivalent to running arbitrary code on this machine"),
-            Self::FsRead(path) => format!("Read files under {path}, outside the project"),
-        }
-    }
-
-    /// Whether `self`, granted, also covers `wanted` (`net:*.x.com` covers `net:a.x.com`).
-    pub fn covers(&self, wanted: &Capability) -> bool {
-        match (self, wanted) {
-            (Self::Net(pattern), Self::Net(host)) => host_matches(pattern, host),
-            (Self::FsRead(base), Self::FsRead(path)) => {
-                std::path::Path::new(path).starts_with(std::path::Path::new(base))
-            }
-            _ => self == wanted,
-        }
-    }
-}
-
-/// `example.com` matches exactly; `*.example.com` matches any subdomain (not the apex).
-pub fn host_matches(pattern: &str, host: &str) -> bool {
-    let host = host.trim_end_matches('.').to_ascii_lowercase();
-    let pattern = pattern.to_ascii_lowercase();
-    match pattern.strip_prefix("*.") {
-        Some(suffix) => host.len() > suffix.len() + 1 && host.ends_with(&format!(".{suffix}")),
-        None => host == pattern,
-    }
-}
-
-impl fmt::Display for Capability {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::ProjectRead => f.write_str("project.read"),
-            Self::EditorRead => f.write_str("editor.read"),
-            Self::EditorWrite => f.write_str("editor.write"),
-            Self::VcsRead => f.write_str("vcs.read"),
-            Self::VcsWrite => f.write_str("vcs.write"),
-            Self::Storage => f.write_str("storage"),
-            Self::Secrets => f.write_str("secrets"),
-            Self::Events => f.write_str("events"),
-            Self::InputEvents => f.write_str("events.input"),
-            Self::Clipboard => f.write_str("clipboard"),
-            Self::Net(h) => write!(f, "net:{h}"),
-            Self::Process(b) => write!(f, "process:{b}"),
-            Self::FsRead(p) => write!(f, "fs.read:{p}"),
-        }
-    }
-}
-
-impl FromStr for Capability {
-    type Err = String;
-
-    fn from_str(s: &str) -> Result<Self, String> {
-        let s = s.trim();
-        if let Some((kind, arg)) = s.split_once(':') {
-            let arg = arg.trim();
-            if arg.is_empty() {
-                return Err(format!("capability {s:?} needs a value after ':'"));
-            }
-            return match kind {
-                "net" => {
-                    let host = arg.strip_prefix("*.").unwrap_or(arg);
-                    let valid = !host.is_empty()
-                        && host.len() <= 253
-                        && host.split('.').all(|label| {
-                            !label.is_empty()
-                                && label.len() <= 63
-                                && label.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-')
-                        });
-                    if valid { Ok(Self::Net(arg.to_ascii_lowercase())) } else { Err(format!("invalid host in {s:?}")) }
-                }
-                "process" => {
-                    if arg.contains(['/', '\\']) && !std::path::Path::new(arg).is_absolute() {
-                        return Err(format!("{s:?}: use a program name or an absolute path"));
-                    }
-                    Ok(Self::Process(arg.to_owned()))
-                }
-                "fs.read" => {
-                    if !std::path::Path::new(arg).is_absolute() && !arg.starts_with('~') {
-                        return Err(format!("{s:?}: use an absolute path (or ~/…)"));
-                    }
-                    Ok(Self::FsRead(arg.to_owned()))
-                }
-                _ => Err(format!("unknown capability {s:?}")),
-            };
-        }
-        Ok(match s {
-            "project.read" | "project-read" => Self::ProjectRead,
-            "editor.read" | "editor-read" => Self::EditorRead,
-            "editor.write" | "editor-write" => Self::EditorWrite,
-            "vcs.read" => Self::VcsRead,
-            "vcs.write" => Self::VcsWrite,
-            "storage" => Self::Storage,
-            "secrets" => Self::Secrets,
-            "events" => Self::Events,
-            "events.input" => Self::InputEvents,
-            "clipboard" => Self::Clipboard,
-            _ => return Err(format!("unknown capability {s:?}")),
-        })
-    }
-}
-
-impl Serialize for Capability {
-    fn serialize<S: Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
-        s.collect_str(self)
-    }
-}
-
-impl<'de> Deserialize<'de> for Capability {
-    fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
-        String::deserialize(d)?.parse().map_err(serde::de::Error::custom)
-    }
-}
-
-/// A capability as the UI shows it.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct CapabilityInfo {
-    /// `project.read`, `net:crates.io`, …
-    pub id: String,
-    pub risk: Risk,
-    pub description: String,
-    /// Declared under `optional`: the plugin runs without it.
-    pub optional: bool,
-    /// Currently granted.
-    pub granted: bool,
-}
-
-impl CapabilityInfo {
-    pub fn new(cap: &Capability, optional: bool, granted: bool) -> Self {
-        Self { id: cap.to_string(), risk: cap.risk(), description: cap.describe(), optional, granted }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn parses_and_prints() {
-        for s in [
-            "project.read",
-            "editor.write",
-            "vcs.write",
-            "storage",
-            "secrets",
-            "events",
-            "events.input",
-            "net:crates.io",
-            "net:*.github.com",
-            "process:cargo",
-        ] {
-            assert_eq!(s.parse::<Capability>().unwrap().to_string(), s);
-        }
-        // Absolute paths are the platform's.
-        let (git, etc) = if cfg!(windows) {
-            (r"process:C:\Program Files\Git\bin\git.exe", r"fs.read:C:\Windows")
-        } else {
-            ("process:/usr/bin/git", "fs.read:/etc")
-        };
-        for s in [git, etc] {
-            assert_eq!(s.parse::<Capability>().unwrap().to_string(), s);
-        }
-        assert_eq!("project-read".parse::<Capability>().unwrap(), Capability::ProjectRead);
-        assert!("net:".parse::<Capability>().is_err());
-        assert!("net:a b".parse::<Capability>().is_err());
-        assert!("process:./evil".parse::<Capability>().is_err());
-        assert!("fs.read:rel".parse::<Capability>().is_err());
-        assert!("network".parse::<Capability>().is_err());
-    }
-
-    #[test]
-    fn risk_levels() {
-        assert_eq!(Capability::ProjectRead.risk(), Risk::Low);
-        assert_eq!(Capability::Net("x".into()).risk(), Risk::Medium);
-        assert_eq!(Capability::InputEvents.risk(), Risk::Medium);
-        assert_eq!("clipboard".parse::<Capability>().unwrap(), Capability::Clipboard);
-        assert_eq!(Capability::Clipboard.risk(), Risk::Medium);
-        assert_eq!(Capability::Process("cargo".into()).risk(), Risk::High);
-        assert!(Capability::Storage.auto_migrates() && !Capability::EditorWrite.auto_migrates());
-    }
-
-    #[test]
-    fn host_patterns() {
-        assert!(host_matches("crates.io", "crates.io"));
-        assert!(host_matches("crates.io", "CRATES.IO."));
-        assert!(!host_matches("crates.io", "static.crates.io"));
-        assert!(host_matches("*.github.com", "api.github.com"));
-        assert!(!host_matches("*.github.com", "github.com"));
-        assert!(!host_matches("*.github.com", "evilgithub.com"));
-        let any_gh: Capability = "net:*.github.com".parse().unwrap();
-        assert!(any_gh.covers(&"net:api.github.com".parse().unwrap()));
-        assert!(Capability::FsRead("/etc".into()).covers(&Capability::FsRead("/etc/hosts".into())));
-        assert!(!Capability::FsRead("/etc".into()).covers(&Capability::FsRead("/etcx".into())));
-    }
-}

crates/ide-extension/src/index.rs

@@ -1,104 +0,0 @@
-//! The contribution index: validated UI
-//! declarations of installed packages, kept on disk so start-up does not
-//! validate them again (sanitising thousands of icon SVGs, say).
-//!
-//! Only packages with a [`Package::digest`] are indexed: installed copies,
-//! which the host never modifies after install. An entry is keyed by that
-//! digest, the extension point, the declaration and a salt naming the
-//! validation logic (the IDE version), so a new package version, a changed
-//! declaration or an IDE upgrade simply misses. A miss or an unreadable entry
-//! only costs the validation.
-
-use crate::point::Package;
-use crate::ui::UiDecl;
-use std::collections::BTreeSet;
-use std::path::PathBuf;
-
-/// Bumped when [`UiDecl`]'s serialized shape changes.
-const FORMAT: u32 = 1;
-
-pub struct ContributionIndex {
-    dir: PathBuf,
-    salt: String,
-}
-
-impl ContributionIndex {
-    /// `salt` names the validators' version (the IDE version).
-    pub fn new(dir: PathBuf, salt: &str) -> Self {
-        Self { dir, salt: format!("{FORMAT}:{salt}") }
-    }
-
-    /// Entries start with a prefix of the package digest, for pruning.
-    fn file(&self, digest: &str, point: &str, decl: &toml::Value) -> PathBuf {
-        let mut h = blake3::Hasher::new();
-        for part in [self.salt.as_str(), digest, point, &decl.to_string()] {
-            h.update(part.as_bytes());
-            h.update(&[0]);
-        }
-        let key = h.finalize().to_hex();
-        self.dir.join(format!("{}-{}.json", prefix(digest), &key[..32]))
-    }
-
-    pub fn get(&self, pkg: &Package, point: &str, decl: &toml::Value) -> Option<UiDecl> {
-        let digest = pkg.digest.as_deref()?;
-        let bytes = std::fs::read(self.file(digest, point, decl)).ok()?;
-        serde_json::from_slice(&bytes).ok()
-    }
-
-    pub fn put(&self, pkg: &Package, point: &str, decl: &toml::Value, ui: &UiDecl) {
-        let Some(digest) = pkg.digest.as_deref() else { return };
-        let Ok(bytes) = serde_json::to_vec(ui) else { return };
-        let file = self.file(digest, point, decl);
-        let _ = std::fs::create_dir_all(&self.dir);
-        let tmp = file.with_extension(format!("tmp{}", std::process::id()));
-        if std::fs::write(&tmp, bytes).and_then(|()| std::fs::rename(&tmp, &file)).is_err() {
-            let _ = std::fs::remove_file(&tmp);
-        }
-    }
-
-    /// Removes entries of packages other than `live` (digests).
-    pub fn prune<'a>(&self, live: impl IntoIterator<Item = &'a str>) {
-        let keep: BTreeSet<String> = live.into_iter().map(|d| prefix(d).to_owned()).collect();
-        let Ok(entries) = std::fs::read_dir(&self.dir) else { return };
-        for e in entries.flatten() {
-            let name = e.file_name().to_string_lossy().into_owned();
-            if !name.split_once('-').is_some_and(|(p, _)| keep.contains(p)) {
-                let _ = std::fs::remove_file(e.path());
-            }
-        }
-    }
-}
-
-fn prefix(digest: &str) -> &str {
-    let d = digest.strip_prefix("blake3:").unwrap_or(digest);
-    let end = d.char_indices().nth(16).map_or(d.len(), |(i, _)| i);
-    &d[..end]
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::manifest::Manifest;
-
-    #[test]
-    fn hits_only_the_same_package_point_declaration_and_salt() {
-        let tmp = tempfile::tempdir().unwrap();
-        let index = ContributionIndex::new(tmp.path().join("idx"), "1.0");
-        let manifest =
-            Manifest::parse("id = \"p\"\nname = \"P\"\nversion = \"1.0.0\"\nengines.openidea = \"^1.0\"\n").unwrap();
-        let pkg = Package::new(manifest, tmp.path().to_path_buf()).with_digest("blake3:00aa11bb22cc33dd44ee");
-        let decl: toml::Value = toml::from_str("id = \"x\"").unwrap();
-        let ui = UiDecl::new("x", "X", serde_json::json!({ "id": "x" }));
-        assert!(index.get(&pkg, "pt", &decl).is_none());
-        index.put(&pkg, "pt", &decl, &ui);
-        assert_eq!(index.get(&pkg, "pt", &decl).unwrap().label, "X");
-        assert!(index.get(&pkg, "other", &decl).is_none());
-        assert!(index.get(&pkg, "pt", &toml::from_str("id = \"y\"").unwrap()).is_none());
-        assert!(ContributionIndex::new(tmp.path().join("idx"), "1.1").get(&pkg, "pt", &decl).is_none());
-        let unhashed = Package { digest: None, ..pkg.clone() };
-        assert!(index.get(&unhashed, "pt", &decl).is_none(), "not an installed copy");
-
-        index.prune(["blake3:ffff"]);
-        assert!(index.get(&pkg, "pt", &decl).is_none());
-    }
-}

crates/ide-extension/src/ledger.rs

@@ -1,483 +0,0 @@
-//! The grant ledger (plan 4.6): which capabilities the user granted to which
-//! plugin, saved as `grants.json` next to the installed plugins.
-//!
-//! - Installed plugins are keyed by id and remember the version and package
-//!   hash they were confirmed for. An update that needs no new capability is
-//!   accepted silently; one that does must be confirmed again.
-//! - Linked development plugins and project plugins (`.openidea/plugins/*`)
-//!   are keyed by their directory, not by hash, so rebuilding does not ask
-//!   again; new capabilities still do.
-//! - `process:<program>` grants record the program's absolute path and file
-//!   hash at grant time. Calls use that path, never a `PATH` lookup, and fail
-//!   when the file changed (re-confirmation needed).
-
-use crate::capability::{Capability, Risk};
-use serde::{Deserialize, Serialize};
-use std::collections::{BTreeMap, BTreeSet};
-use std::ffi::OsStr;
-use std::path::{Path, PathBuf};
-
-pub const LEDGER_FILE: &str = "grants.json";
-const FORMAT: u32 = 1;
-
-/// Whose grant an entry is.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-#[serde(tag = "kind", content = "value", rename_all = "camelCase")]
-pub enum Subject {
-    /// Installed under the plugins directory, by plugin id.
-    Installed(String),
-    /// A linked development plugin or a project plugin, by package directory.
-    Path(PathBuf),
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct BinaryGrant {
-    pub path: PathBuf,
-    /// blake3 of the file when granted.
-    pub hash: String,
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Grant {
-    pub plugin_id: String,
-    /// The version and package hash the user confirmed (installed plugins).
-    #[serde(default)]
-    pub version: String,
-    #[serde(default)]
-    pub package_hash: String,
-    /// The user confirmed the plugin (the install page or the project-plugin prompt).
-    #[serde(default)]
-    pub confirmed: bool,
-    /// Granted capabilities (`project.read`, `net:x`, …).
-    #[serde(default)]
-    pub granted: BTreeSet<String>,
-    /// Optional capabilities the user declined (not asked again until re-confirmed).
-    #[serde(default)]
-    pub declined: BTreeSet<String>,
-    /// `process:<program>` → the program confirmed for it.
-    #[serde(default)]
-    pub binaries: BTreeMap<String, BinaryGrant>,
-    /// Migrated from 0.1: capabilities not granted yet are asked for on first
-    /// use instead of blocking the plugin from loading.
-    #[serde(default)]
-    pub ask_on_use: bool,
-}
-
-impl Grant {
-    pub fn has(&self, cap: &Capability) -> bool {
-        self.granted.iter().filter_map(|s| s.parse::<Capability>().ok()).any(|g| g.covers(cap))
-    }
-}
-
-/// What a plugin (in its current form) needs, to compare with its grant.
-#[derive(Clone, Debug)]
-pub struct Request<'a> {
-    pub subject: Subject,
-    pub plugin_id: &'a str,
-    pub version: &'a str,
-    pub package_hash: &'a str,
-    pub required: Vec<Capability>,
-    pub optional: Vec<Capability>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum Decision {
-    /// Load with these capabilities. `pending` required ones are asked for when
-    /// the plugin is first used (plugins migrated from 0.1 only).
-    Allowed { granted: Vec<Capability>, pending: Vec<Capability> },
-    /// Ask the user first. `new` lists what was never granted (all of it on first use).
-    NeedsConfirmation { new: Vec<Capability>, first_time: bool },
-}
-
-#[derive(Debug, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct File {
-    #[serde(default)]
-    format: u32,
-    /// The one-time migration from 0.1 ("declared means granted") ran.
-    #[serde(default)]
-    migrated: bool,
-    #[serde(default)]
-    grants: Vec<(Subject, Grant)>,
-}
-
-/// The ledger, loaded into memory; [`Ledger::save`] writes it atomically.
-#[derive(Debug, Default)]
-pub struct Ledger {
-    path: Option<PathBuf>,
-    migrated: bool,
-    grants: BTreeMap<Subject, Grant>,
-}
-
-impl Ledger {
-    /// Loads `<dir>/grants.json`; a missing or unreadable file gives an empty
-    /// ledger with `needs_migration()` true.
-    pub fn load(dir: &Path) -> Self {
-        let path = dir.join(LEDGER_FILE);
-        let file: Option<File> = std::fs::read_to_string(&path).ok().and_then(|s| match serde_json::from_str(&s) {
-            Ok(f) => Some(f),
-            Err(e) => {
-                tracing::warn!("{}: {e}; starting with an empty grant ledger", path.display());
-                None
-            }
-        });
-        let existed = file.is_some();
-        let file = file.unwrap_or_default();
-        Self { path: Some(path), migrated: file.migrated || existed, grants: file.grants.into_iter().collect() }
-    }
-
-    pub fn in_memory() -> Self {
-        Self { path: None, migrated: true, grants: BTreeMap::new() }
-    }
-
-    pub fn save(&self) -> std::io::Result<()> {
-        let Some(path) = &self.path else { return Ok(()) };
-        let file = File {
-            format: FORMAT,
-            migrated: self.migrated,
-            grants: self.grants.iter().map(|(s, g)| (s.clone(), g.clone())).collect(),
-        };
-        let json = serde_json::to_string_pretty(&file).map_err(std::io::Error::other)?;
-        let tmp = path.with_extension("json.tmp");
-        std::fs::write(&tmp, json)?;
-        std::fs::rename(&tmp, path)
-    }
-
-    pub fn get(&self, subject: &Subject) -> Option<&Grant> {
-        self.grants.get(subject)
-    }
-
-    pub fn remove(&mut self, subject: &Subject) -> Option<Grant> {
-        self.grants.remove(subject)
-    }
-
-    /// Puts back an earlier state of `subject`'s grant (`None`: none), e.g.
-    /// after rolling back an update.
-    pub fn restore(&mut self, subject: &Subject, grant: Option<Grant>) {
-        match grant {
-            Some(g) => {
-                self.grants.insert(subject.clone(), g);
-            }
-            None => {
-                self.grants.remove(subject);
-            }
-        }
-    }
-
-    /// The one-time migration of 0.1's "declared means granted" has not run yet.
-    pub fn needs_migration(&self) -> bool {
-        !self.migrated
-    }
-
-    /// Migrates plugins installed before the ledger existed: low-risk
-    /// capabilities are granted, the rest are asked on first use.
-    pub fn migrate(&mut self, installed: &[Request<'_>]) {
-        for req in installed {
-            let granted: BTreeSet<String> =
-                req.required.iter().chain(&req.optional).filter(|c| c.auto_migrates()).map(|c| c.to_string()).collect();
-            self.grants.entry(req.subject.clone()).or_insert_with(|| Grant {
-                plugin_id: req.plugin_id.to_owned(),
-                version: req.version.to_owned(),
-                package_hash: req.package_hash.to_owned(),
-                confirmed: true,
-                granted,
-                ask_on_use: true,
-                ..Grant::default()
-            });
-        }
-        self.migrated = true;
-    }
-
-    /// Compares what the plugin needs with what was granted.
-    pub fn decide(&mut self, req: &Request<'_>) -> Decision {
-        let Some(grant) = self.grants.get_mut(&req.subject) else {
-            return Decision::NeedsConfirmation { new: req.required.clone(), first_time: true };
-        };
-        if !grant.confirmed {
-            return Decision::NeedsConfirmation { new: req.required.clone(), first_time: true };
-        }
-        let new: Vec<Capability> = req.required.iter().filter(|c| !grant.has(c)).cloned().collect();
-        if !new.is_empty() && !grant.ask_on_use {
-            return Decision::NeedsConfirmation { new, first_time: false };
-        }
-        // Same or fewer needs: accept an update silently (plan 4.6).
-        if grant.version != req.version || grant.package_hash != req.package_hash {
-            grant.version = req.version.to_owned();
-            grant.package_hash = req.package_hash.to_owned();
-        }
-        let granted = req.required.iter().chain(&req.optional).filter(|c| grant.has(c)).cloned().collect();
-        Decision::Allowed { granted, pending: new }
-    }
-
-    /// Records the user's confirmation: `required` plus the accepted optional capabilities.
-    pub fn confirm(
-        &mut self,
-        req: &Request<'_>,
-        accepted_optional: &[Capability],
-        binaries: BTreeMap<String, BinaryGrant>,
-    ) {
-        let grant = self.grants.entry(req.subject.clone()).or_default();
-        grant.plugin_id = req.plugin_id.to_owned();
-        grant.version = req.version.to_owned();
-        grant.package_hash = req.package_hash.to_owned();
-        grant.confirmed = true;
-        grant.ask_on_use = false;
-        for cap in req.required.iter().chain(accepted_optional) {
-            grant.granted.insert(cap.to_string());
-        }
-        for cap in &req.optional {
-            let s = cap.to_string();
-            if accepted_optional.contains(cap) {
-                grant.declined.remove(&s);
-            } else if !grant.granted.contains(&s) {
-                grant.declined.insert(s);
-            }
-        }
-        grant.binaries.extend(binaries);
-    }
-
-    /// Grants or revokes one capability (Settings › Plugins › permissions).
-    pub fn set(&mut self, subject: &Subject, cap: &Capability, granted: bool) -> bool {
-        let Some(grant) = self.grants.get_mut(subject) else { return false };
-        let s = cap.to_string();
-        if granted {
-            grant.declined.remove(&s);
-            grant.granted.insert(s)
-        } else {
-            if let Capability::Process(_) = cap {
-                grant.binaries.remove(&s);
-            }
-            grant.granted.remove(&s)
-        }
-    }
-
-    /// 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) {
-            grant.binaries.insert(cap.to_string(), binary);
-        }
-    }
-
-    /// Checks a `process:` grant at call time: the program confirmed for it,
-    /// unchanged since. Errors name what to do.
-    pub fn check_binary(&self, subject: &Subject, cap: &Capability) -> Result<PathBuf, String> {
-        let Capability::Process(name) = cap else { return Err(format!("{cap} is not a process capability")) };
-        let grant = self.grants.get(subject).ok_or_else(|| format!("{cap} was not granted"))?;
-        let key = cap.to_string();
-        if !grant.granted.contains(&key) {
-            return Err(format!("{cap} was not granted"));
-        }
-        let bin = grant.binaries.get(&key).ok_or_else(|| format!("{cap}: no program was confirmed for {name}"))?;
-        match file_hash(&bin.path) {
-            Ok(hash) if hash == bin.hash => Ok(bin.path.clone()),
-            Ok(_) => Err(format!(
-                "{} changed since it was approved for {cap}; confirm the plugin's permissions again",
-                bin.path.display()
-            )),
-            Err(e) => Err(format!("{}: {e}; confirm the plugin's permissions again", bin.path.display())),
-        }
-    }
-
-    /// The program approved for a granted `process:` capability, without
-    /// checking the file: whoever starts it verifies the hash then
-    /// ([`check_binary`](Self::check_binary) or the pin's own check).
-    pub fn pinned_binary(&self, subject: &Subject, cap: &Capability) -> Option<BinaryGrant> {
-        let grant = self.grants.get(subject)?;
-        let key = cap.to_string();
-        if !grant.granted.contains(&key) {
-            return None;
-        }
-        grant.binaries.get(&key).cloned()
-    }
-
-    pub fn subjects(&self) -> impl Iterator<Item = (&Subject, &Grant)> {
-        self.grants.iter()
-    }
-}
-
-/// What a confirmation page shows: every capability with its risk, high risk first.
-pub fn by_risk(caps: &[Capability]) -> Vec<(Risk, Vec<Capability>)> {
-    let mut groups: BTreeMap<std::cmp::Reverse<Risk>, Vec<Capability>> = BTreeMap::new();
-    for c in caps {
-        groups.entry(std::cmp::Reverse(c.risk())).or_default().push(c.clone());
-    }
-    groups.into_iter().map(|(r, v)| (r.0, v)).collect()
-}
-
-/// Resolves a `process:` program to an absolute path once, at grant time:
-/// absolute names are taken as is, others are looked up in `path_var`.
-pub fn resolve_program(name: &str, path_var: Option<&OsStr>) -> Result<PathBuf, String> {
-    let candidate = Path::new(name);
-    if candidate.is_absolute() {
-        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()
-    } else {
-        vec![String::new()]
-    };
-    for dir in std::env::split_paths(path_var.unwrap_or_default()) {
-        if !dir.is_absolute() {
-            continue; // `.` or relative entries could point into the project
-        }
-        for ext in &exts {
-            let p = dir.join(format!("{name}{ext}"));
-            if is_executable(&p) {
-                return Ok(dunce_canonical(&p));
-            }
-        }
-    }
-    Err(format!("{name} was not found on PATH"))
-}
-
-fn dunce_canonical(p: &Path) -> PathBuf {
-    std::fs::canonicalize(p).unwrap_or_else(|_| p.to_path_buf())
-}
-
-fn is_executable(p: &Path) -> bool {
-    let Ok(meta) = std::fs::metadata(p) else { return false };
-    if !meta.is_file() {
-        return false;
-    }
-    #[cfg(unix)]
-    {
-        use std::os::unix::fs::PermissionsExt;
-        meta.permissions().mode() & 0o111 != 0
-    }
-    #[cfg(not(unix))]
-    true
-}
-
-/// blake3 of a file, hex.
-pub fn file_hash(path: &Path) -> std::io::Result<String> {
-    let mut hasher = blake3::Hasher::new();
-    hasher.update_reader(std::fs::File::open(path)?)?;
-    Ok(hasher.finalize().to_hex().to_string())
-}
-
-/// blake3 over a package's files (sorted relative paths and contents).
-pub fn package_hash(dir: &Path, files: &[PathBuf]) -> std::io::Result<String> {
-    let mut sorted: Vec<&PathBuf> = files.iter().collect();
-    sorted.sort();
-    sorted.dedup();
-    let mut hasher = blake3::Hasher::new();
-    for rel in sorted {
-        hasher.update(rel.to_string_lossy().as_bytes());
-        hasher.update(&[0]);
-        hasher.update_reader(std::fs::File::open(dir.join(rel))?)?;
-        hasher.update(&[0]);
-    }
-    Ok(hasher.finalize().to_hex().to_string())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn caps(list: &[&str]) -> Vec<Capability> {
-        list.iter().map(|s| s.parse().unwrap()).collect()
-    }
-
-    fn req<'a>(version: &'a str, hash: &'a str, required: &[&str], optional: &[&str]) -> Request<'a> {
-        Request {
-            subject: Subject::Installed("p".into()),
-            plugin_id: "p",
-            version,
-            package_hash: hash,
-            required: caps(required),
-            optional: caps(optional),
-        }
-    }
-
-    #[test]
-    fn confirmation_then_silent_update_then_reconfirm_on_new_capability() {
-        let mut l = Ledger::in_memory();
-        let r1 = req("1.0.0", "h1", &["project.read"], &["net:crates.io"]);
-        assert_eq!(l.decide(&r1), Decision::NeedsConfirmation { new: caps(&["project.read"]), first_time: true });
-        l.confirm(&r1, &[], BTreeMap::new());
-        assert_eq!(
-            l.decide(&r1),
-            Decision::Allowed { granted: caps(&["project.read"]), pending: vec![] },
-            "declined optional"
-        );
-        assert!(l.get(&r1.subject).unwrap().declined.contains("net:crates.io"));
-
-        // Same needs, new version: silent.
-        let r2 = req("1.1.0", "h2", &["project.read"], &["net:crates.io"]);
-        assert!(matches!(l.decide(&r2), Decision::Allowed { .. }));
-        assert_eq!(l.get(&r2.subject).unwrap().version, "1.1.0");
-
-        // A new required capability: ask again, only for it.
-        let r3 = req("1.2.0", "h3", &["project.read", "editor.write"], &[]);
-        assert_eq!(l.decide(&r3), Decision::NeedsConfirmation { new: caps(&["editor.write"]), first_time: false });
-        l.confirm(&r3, &[], BTreeMap::new());
-        assert!(matches!(l.decide(&r3), Decision::Allowed { .. }));
-
-        // Revoking a required capability blocks loading again.
-        assert!(l.set(&r3.subject, &Capability::EditorWrite, false));
-        assert!(matches!(l.decide(&r3), Decision::NeedsConfirmation { .. }));
-    }
-
-    #[test]
-    fn migration_grants_low_risk_only() {
-        let tmp = tempfile::tempdir().unwrap();
-        let mut l = Ledger::load(tmp.path());
-        assert!(l.needs_migration());
-        let r = req("0.1.0", "h", &["project.read", "editor.write"], &[]);
-        l.migrate(std::slice::from_ref(&r));
-        // Loads with the low-risk part; the rest is asked for on first use.
-        assert_eq!(
-            l.decide(&r),
-            Decision::Allowed { granted: caps(&["project.read"]), pending: caps(&["editor.write"]) }
-        );
-        l.confirm(&r, &[], BTreeMap::new());
-        assert_eq!(
-            l.decide(&r),
-            Decision::Allowed { granted: caps(&["project.read", "editor.write"]), pending: vec![] }
-        );
-        l.save().unwrap();
-        let again = Ledger::load(tmp.path());
-        assert!(!again.needs_migration());
-        assert!(again.get(&r.subject).unwrap().has(&Capability::ProjectRead));
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn binaries_are_pinned_by_path_and_hash() {
-        use std::os::unix::fs::PermissionsExt;
-        let tmp = tempfile::tempdir().unwrap();
-        let bin_dir = tmp.path().join("bin");
-        std::fs::create_dir(&bin_dir).unwrap();
-        let tool = bin_dir.join("tool");
-        std::fs::write(&tool, "#!/bin/sh\necho v1\n").unwrap();
-        std::fs::set_permissions(&tool, std::fs::Permissions::from_mode(0o755)).unwrap();
-        let path_var = std::env::join_paths([PathBuf::from("relative"), bin_dir.clone()]).unwrap();
-        let resolved = resolve_program("tool", Some(&path_var)).unwrap();
-        assert!(resolved.is_absolute());
-        assert!(resolve_program("missing", Some(&path_var)).is_err());
-
-        let mut l = Ledger::in_memory();
-        let r = req("1.0.0", "h", &["process:tool"], &[]);
-        let cap: Capability = "process:tool".parse().unwrap();
-        let bin = BinaryGrant { path: resolved.clone(), hash: file_hash(&resolved).unwrap() };
-        l.confirm(&r, &[], [(cap.to_string(), bin)].into());
-        assert_eq!(l.check_binary(&r.subject, &cap).unwrap(), resolved);
-        std::fs::write(&tool, "#!/bin/sh\necho evil\n").unwrap();
-        assert!(l.check_binary(&r.subject, &cap).unwrap_err().contains("changed"));
-    }
-
-    #[test]
-    fn hashes_and_grouping() {
-        let tmp = tempfile::tempdir().unwrap();
-        std::fs::write(tmp.path().join("a"), "1").unwrap();
-        std::fs::write(tmp.path().join("b"), "2").unwrap();
-        let h1 = package_hash(tmp.path(), &["a".into(), "b".into()]).unwrap();
-        assert_eq!(h1, package_hash(tmp.path(), &["b".into(), "a".into()]).unwrap());
-        std::fs::write(tmp.path().join("b"), "3").unwrap();
-        assert_ne!(h1, package_hash(tmp.path(), &["a".into(), "b".into()]).unwrap());
-        let groups = by_risk(&caps(&["storage", "process:git", "net:x.io"]));
-        assert_eq!(groups.iter().map(|g| g.0).collect::<Vec<_>>(), [Risk::High, Risk::Medium, Risk::Low]);
-    }
-}

crates/ide-extension/src/lib.rs

@@ -1,36 +0,0 @@
-//! The plugin system's kernel, independent of the Wasm runtime:
-//!
-//! - [`Manifest`]: `plugin.toml` (0.2 format; 0.1 still parses);
-//! - [`Capability`]: what a plugin may do, with its [`Risk`] level;
-//! - [`ExtensionPoint`]: one kind of contribution, implemented by the crate that
-//!   owns the feature; [`ExtensionRegistry`] validates a package's declarations
-//!   ([`ExtensionRegistry::prepare`], no side effects), makes them take effect
-//!   all or nothing ([`ExtensionRegistry::commit`]) and withdraws them per plugin;
-//! - [`UiStore`] / [`UiPoint`]: UI contributions, validated here and projected
-//!   by the client without the possibility to fail;
-//! - [`ledger`]: which capabilities the user granted to which plugin;
-//! - [`package`]: the package file, its signature and the marketplace index.
-//!
-//! Dependency direction: `ide-core` ← `ide-extension` ← feature crates (their
-//! extension points) and `ide-plugin` (Wasm) ← `ide-host` (assembly).
-
-mod capability;
-mod index;
-pub mod ledger;
-mod manifest;
-pub mod package;
-mod point;
-mod registry;
-mod ui;
-mod when;
-
-pub use capability::{Capability, CapabilityInfo, Risk, host_matches};
-pub use index::ContributionIndex;
-pub use manifest::{
-    ActivationEvent, Capabilities, ENGINE_VERSION, EVENT_KINDS, LEGACY_API, MANIFEST_FILE, Manifest, check_relative,
-    engine_compatible, validate_item_id, validate_plugin_id, validate_point_id,
-};
-pub use point::{Commit, Disposable, ExtensionPoint, MAX_PACKAGE_FILE, Package, Placement, Prepared, decode};
-pub use registry::{ContributionInfo, ExtensionRegistry, PreparedSet};
-pub use ui::{UiContribution, UiDecl, UiPoint, UiStore, to_json};
-pub use when::validate_when;

crates/ide-extension/src/manifest.rs

@@ -1,501 +0,0 @@
-//! `plugin.toml`, the package manifest (plan 4.4).
-//!
-//! ```toml
-//! id = "acme.rust-tools"          # optional publisher namespace before the first '.'
-//! name = "Rust Tools"
-//! version = "1.2.0"
-//! engines.openidea = "^1.0"
-//! wasm = "plugin.wasm"
-//! activation = ["on-language:rust", "on-command:check"]
-//!
-//! [capabilities]
-//! required = ["project.read", "editor.write"]
-//! optional = ["net:crates.io", "process:cargo"]
-//!
-//! [[contributes.commands]]
-//! id = "check"
-//! title = "Check"
-//! ```
-//!
-//! `contributes` is kept as raw TOML: each `contributes.<point>` is parsed and
-//! validated by the extension point registered under that id
-//! ([`crate::ExtensionRegistry`]), so new contribution types need no change here.
-//!
-//! Manifests in the 0.1 format (`openidea-api = "0.1"`, `permissions = [...]`)
-//! still parse: permissions become required capabilities and the plugin is
-//! activated at start-up, as before.
-
-use crate::capability::Capability;
-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.0.0";
-/// The 0.1 API, still accepted for contribution-only packages and 0.1 components.
-pub const LEGACY_API: &str = "0.1";
-
-#[derive(Clone, Debug, PartialEq)]
-pub struct Manifest {
-    pub id: String,
-    pub name: String,
-    pub version: String,
-    pub description: String,
-    pub authors: Vec<String>,
-    pub homepage: Option<String>,
-    pub license: Option<String>,
-    /// Release notes of this version (Settings › Plugins › What's New).
-    pub change_notes: Option<String>,
-    /// `engines.openidea` (a semver requirement), or the legacy `openidea-api`.
-    pub engine: String,
-    /// Written in the 0.1 format.
-    pub legacy: bool,
-    /// Component file relative to the package directory.
-    pub wasm: Option<PathBuf>,
-    pub activation: Vec<ActivationEvent>,
-    pub capabilities: Capabilities,
-    /// `contributes.<point>` → its declarations, validated by the extension points.
-    pub contributes: toml::Table,
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
-pub struct Capabilities {
-    pub required: Vec<Capability>,
-    pub optional: Vec<Capability>,
-}
-
-impl Capabilities {
-    pub fn all(&self) -> impl Iterator<Item = &Capability> {
-        self.required.iter().chain(&self.optional)
-    }
-
-    pub fn is_optional(&self, cap: &Capability) -> bool {
-        self.optional.contains(cap) && !self.required.contains(cap)
-    }
-}
-
-/// When a plugin's code is instantiated (plan 4.4). Contributions are live
-/// without it; code only runs once one of these fires.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum ActivationEvent {
-    /// One of the plugin's commands is run (`on-command:<id>`; `*` = any).
-    Command(String),
-    /// A file of this language is opened.
-    Language(String),
-    /// A file matching this glob (project-relative) is opened.
-    File(String),
-    /// One of the plugin's views is shown.
-    View(String),
-    /// Periodically: `on-schedule:<seconds>`. Does not keep the plugin alive.
-    Schedule(u32),
-    /// A workbench event of this kind (`on-event:file-saved`): the plugin is
-    /// subscribed from the start, and activated to receive it.
-    Event(String),
-    /// Shortly after the workbench is ready.
-    StartupFinished,
-}
-
-impl ActivationEvent {
-    pub fn parse(s: &str) -> Result<Self, String> {
-        let s = s.trim();
-        if s == "on-startup-finished" {
-            return Ok(Self::StartupFinished);
-        }
-        let (kind, arg) = s.split_once(':').ok_or_else(|| format!("unknown activation event {s:?}"))?;
-        let arg = arg.trim();
-        if arg.is_empty() {
-            return Err(format!("activation event {s:?} needs a value"));
-        }
-        Ok(match kind {
-            "on-command" => Self::Command(arg.into()),
-            "on-language" => Self::Language(arg.into()),
-            "on-file" => Self::File(arg.into()),
-            "on-view" => Self::View(arg.into()),
-            "on-schedule" => {
-                let secs: u32 =
-                    arg.trim_end_matches('s').parse().map_err(|_| format!("{s:?}: expected seconds, e.g. 300"))?;
-                if secs < 60 {
-                    return Err(format!("{s:?}: the shortest schedule is 60 seconds"));
-                }
-                Self::Schedule(secs)
-            }
-            "on-event" => {
-                if !EVENT_KINDS.contains(&arg) {
-                    return Err(format!("{s:?}: unknown event kind (one of {})", EVENT_KINDS.join(", ")));
-                }
-                Self::Event(arg.into())
-            }
-            _ => return Err(format!("unknown activation event {s:?}")),
-        })
-    }
-}
-
-/// Workbench event kinds (`on-event:<kind>`, WIT `events.event-kind`).
-/// `scheduled` comes from `on-schedule` instead.
-pub const EVENT_KINDS: &[&str] = &["file-opened", "file-saved", "editor-focused", "action-performed", "vcs-changed"];
-
-impl std::fmt::Display for ActivationEvent {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Command(c) => write!(f, "on-command:{c}"),
-            Self::Language(l) => write!(f, "on-language:{l}"),
-            Self::File(g) => write!(f, "on-file:{g}"),
-            Self::View(v) => write!(f, "on-view:{v}"),
-            Self::Schedule(s) => write!(f, "on-schedule:{s}"),
-            Self::Event(k) => write!(f, "on-event:{k}"),
-            Self::StartupFinished => f.write_str("on-startup-finished"),
-        }
-    }
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "kebab-case", deny_unknown_fields)]
-struct Raw {
-    id: String,
-    name: String,
-    version: String,
-    #[serde(default)]
-    description: String,
-    #[serde(default)]
-    authors: Vec<String>,
-    #[serde(default)]
-    homepage: Option<String>,
-    #[serde(default)]
-    license: Option<String>,
-    #[serde(default)]
-    change_notes: Option<String>,
-    #[serde(default)]
-    engines: Option<Engines>,
-    /// 0.1 format.
-    #[serde(default)]
-    openidea_api: Option<String>,
-    #[serde(default)]
-    wasm: Option<PathBuf>,
-    #[serde(default)]
-    activation: Option<Vec<String>>,
-    #[serde(default)]
-    capabilities: Option<RawCapabilities>,
-    /// 0.1 format.
-    #[serde(default)]
-    permissions: Option<Vec<String>>,
-    #[serde(default)]
-    contributes: toml::Table,
-}
-
-#[derive(Deserialize)]
-#[serde(deny_unknown_fields)]
-struct Engines {
-    openidea: String,
-}
-
-#[derive(Deserialize)]
-#[serde(deny_unknown_fields)]
-struct RawCapabilities {
-    #[serde(default)]
-    required: Vec<String>,
-    #[serde(default)]
-    optional: Vec<String>,
-}
-
-impl Manifest {
-    pub fn parse(src: &str) -> Result<Self, String> {
-        let raw: Raw = toml::from_str(src).map_err(|e| e.to_string())?;
-        let (engine, legacy) = match (raw.engines, raw.openidea_api) {
-            (Some(e), None) => (e.openidea, false),
-            (None, Some(api)) => (api, true),
-            (Some(_), Some(_)) => return Err("use `engines.openidea`, not `openidea-api`".into()),
-            (None, None) => return Err("missing `engines.openidea` (e.g. \"^1.0\")".into()),
-        };
-        if legacy && raw.capabilities.is_some() {
-            return Err("`capabilities` requires `engines.openidea`; 0.1 manifests use `permissions`".into());
-        }
-        if !legacy && raw.permissions.is_some() {
-            return Err("`permissions` is the 0.1 format; use `[capabilities] required = [...]`".into());
-        }
-        let parse_caps = |list: Vec<String>| -> Result<Vec<Capability>, String> {
-            let mut out: Vec<Capability> = Vec::new();
-            for s in list {
-                let cap: Capability = s.parse()?;
-                if !out.contains(&cap) {
-                    out.push(cap);
-                }
-            }
-            Ok(out)
-        };
-        let capabilities = match (raw.capabilities, raw.permissions) {
-            (Some(c), _) => Capabilities { required: parse_caps(c.required)?, optional: parse_caps(c.optional)? },
-            (None, Some(p)) => Capabilities { required: parse_caps(p)?, optional: Vec::new() },
-            (None, None) => Capabilities::default(),
-        };
-        let activation = match raw.activation {
-            Some(list) => list.iter().map(|s| ActivationEvent::parse(s)).collect::<Result<Vec<_>, _>>()?,
-            // 0.1 plugins were activated at start-up; keep that until they move to 1.0.
-            None if legacy && raw.wasm.is_some() => vec![ActivationEvent::StartupFinished],
-            None => Vec::new(),
-        };
-        let m = Manifest {
-            id: raw.id,
-            name: raw.name,
-            version: raw.version,
-            description: raw.description,
-            authors: raw.authors,
-            homepage: raw.homepage,
-            license: raw.license,
-            change_notes: raw.change_notes,
-            engine,
-            legacy,
-            wasm: raw.wasm,
-            activation,
-            capabilities,
-            contributes: raw.contributes,
-        };
-        m.validate()?;
-        Ok(m)
-    }
-
-    pub fn load(dir: &Path) -> Result<Self, String> {
-        let path = dir.join(MANIFEST_FILE);
-        let src = std::fs::read_to_string(&path).map_err(|e| format!("{}: {e}", path.display()))?;
-        Self::parse(&src).map_err(|e| format!("{}: {e}", path.display()))
-    }
-
-    fn validate(&self) -> Result<(), String> {
-        validate_plugin_id(&self.id)?;
-        if self.name.trim().is_empty() {
-            return Err("`name` must not be empty".into());
-        }
-        if semver::Version::parse(&self.version).is_err() {
-            return Err(format!("`version` must be a semantic version like 1.2.3, got {:?}", self.version));
-        }
-        if !engine_compatible(&self.engine, self.legacy) {
-            return Err(if self.legacy {
-                format!(
-                    "unsupported openidea-api {:?} (this IDE implements {LEGACY_API} and {ENGINE_VERSION})",
-                    self.engine
-                )
-            } else {
-                format!("engines.openidea {:?} does not match this IDE's plugin API {ENGINE_VERSION}", self.engine)
-            });
-        }
-        if let Some(wasm) = &self.wasm {
-            check_relative(wasm, "wasm")?;
-        }
-        if self.wasm.is_none() && !self.activation.is_empty() {
-            return Err("`activation` needs `wasm`: there is no code to activate".into());
-        }
-        let mut seen = BTreeSet::new();
-        for event in &self.activation {
-            if !seen.insert(event) {
-                return Err(format!("duplicate activation event {event}"));
-            }
-        }
-        for (point, decls) in &self.contributes {
-            validate_point_id(point)?;
-            if !matches!(decls, toml::Value::Array(_) | toml::Value::Table(_)) {
-                return Err(format!("`contributes.{point}` must be a table or an array of tables"));
-            }
-        }
-        Ok(())
-    }
-
-    /// The declarations of one extension point: `[[contributes.x]]` gives
-    /// several, `[contributes.x]` one.
-    pub fn declarations(&self, point: &str) -> Vec<toml::Value> {
-        match self.contributes.get(point) {
-            Some(toml::Value::Array(items)) => items.clone(),
-            Some(single @ toml::Value::Table(_)) => vec![single.clone()],
-            _ => Vec::new(),
-        }
-    }
-
-    /// Number of declarations per extension point (for listings before loading).
-    pub fn declaration_counts(&self) -> Vec<(String, u32)> {
-        self.contributes.keys().map(|p| (p.clone(), self.declarations(p).len() as u32)).collect()
-    }
-
-    /// Publisher namespace: the id's part before the first `.` (`acme` in `acme.tools`).
-    pub fn publisher(&self) -> Option<&str> {
-        self.id.split_once('.').map(|(p, _)| p)
-    }
-
-    /// Whether `cap` is declared (required or optional).
-    pub fn declares(&self, cap: &Capability) -> bool {
-        self.capabilities.all().any(|c| c.covers(cap))
-    }
-}
-
-/// Whether this host can load a plugin written for `engine`.
-pub fn engine_compatible(engine: &str, legacy: bool) -> bool {
-    if legacy {
-        return engine == LEGACY_API || engine.strip_prefix(LEGACY_API).is_some_and(|rest| rest.starts_with('.'));
-    }
-    let Ok(req) = semver::VersionReq::parse(engine) else { return false };
-    let host = semver::Version::parse(ENGINE_VERSION).expect("valid engine version");
-    req.matches(&host)
-}
-
-/// Segments of `[a-z0-9][a-z0-9_-]*` joined by `.` (an optional publisher
-/// namespace first), at most 64 chars.
-pub fn validate_plugin_id(id: &str) -> Result<(), String> {
-    let ok = id.len() <= 64 && !id.is_empty() && id.split('.').all(segment_ok);
-    if ok {
-        Ok(())
-    } else {
-        Err(format!(
-            "invalid plugin id {id:?}: use a-z, 0-9, '-', '_' in '.'-separated parts (e.g. acme.tools), max 64"
-        ))
-    }
-}
-
-/// `[a-z0-9][a-z0-9._-]*`, at most 64 chars (commands, themes, views…).
-pub fn validate_item_id(id: &str, what: &str) -> Result<(), String> {
-    let ok_first = id.chars().next().is_some_and(|c| c.is_ascii_lowercase() || c.is_ascii_digit());
-    let ok_rest = id.chars().all(|c| c.is_ascii_lowercase() || c.is_ascii_digit() || matches!(c, '-' | '_' | '.'));
-    if ok_first && ok_rest && id.len() <= 64 {
-        Ok(())
-    } else {
-        Err(format!("invalid {what} {id:?}: use a-z, 0-9, '.', '-', '_', starting with a letter or digit (max 64)"))
-    }
-}
-
-/// Extension point ids: `camelCase` or `kebab-case` words, dots allowed (`iconThemes`, `menus`).
-pub fn validate_point_id(id: &str) -> Result<(), String> {
-    let ok = !id.is_empty()
-        && id.len() <= 64
-        && id.starts_with(|c: char| c.is_ascii_lowercase())
-        && id.chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '.'));
-    if ok { Ok(()) } else { Err(format!("invalid contribution point {id:?}")) }
-}
-
-fn segment_ok(s: &str) -> bool {
-    s.chars().next().is_some_and(|c| c.is_ascii_lowercase() || c.is_ascii_digit())
-        && s.chars().all(|c| c.is_ascii_lowercase() || c.is_ascii_digit() || c == '-' || c == '_')
-}
-
-/// Package paths must stay inside the package directory.
-pub fn check_relative(path: &Path, what: &str) -> Result<(), String> {
-    let ok = !path.as_os_str().is_empty() && path.components().all(|c| matches!(c, Component::Normal(_)));
-    if ok { Ok(()) } else { Err(format!("{what} {:?} must be a relative path inside the plugin", path.display())) }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    const FULL: &str = r#"
-        id = "acme.rust-tools"
-        name = "Rust Tools"
-        version = "1.2.0"
-        engines.openidea = "^1.0"
-        wasm = "plugin.wasm"
-        activation = ["on-language:rust", "on-command:check", "on-schedule:300"]
-
-        [capabilities]
-        required = ["project.read", "editor.write"]
-        optional = ["net:crates.io", "process:cargo"]
-
-        [[contributes.commands]]
-        id = "check"
-        title = "%check.title%"
-
-        [[contributes.menus]]
-        menu = "editor.context"
-        command = "check"
-        when = "editorLang == rust"
-
-        [contributes.settings]
-        schema = "settings.schema.json"
-    "#;
-
-    #[test]
-    fn event_activation() {
-        assert_eq!(ActivationEvent::parse("on-event:file-saved"), Ok(ActivationEvent::Event("file-saved".into())));
-        assert_eq!(ActivationEvent::Event("vcs-changed".into()).to_string(), "on-event:vcs-changed");
-        let err = ActivationEvent::parse("on-event:keystroke").unwrap_err();
-        assert!(err.contains("unknown event kind") && err.contains("action-performed"), "{err}");
-        assert!(ActivationEvent::parse("on-event:scheduled").is_err(), "declared with on-schedule");
-    }
-
-    #[test]
-    fn parses_the_02_format() {
-        let m = Manifest::parse(FULL).unwrap();
-        assert_eq!(m.publisher(), Some("acme"));
-        assert!(!m.legacy);
-        assert_eq!(m.activation.len(), 3);
-        assert_eq!(m.activation[2], ActivationEvent::Schedule(300));
-        assert_eq!(m.capabilities.required, vec![Capability::ProjectRead, Capability::EditorWrite]);
-        assert!(m.capabilities.is_optional(&Capability::Process("cargo".into())));
-        assert_eq!(m.declarations("commands").len(), 1);
-        assert_eq!(m.declarations("settings").len(), 1, "a single table is one declaration");
-        assert!(m.declarations("nope").is_empty());
-        let counts: Vec<_> = m.declaration_counts();
-        assert!(counts.contains(&("menus".into(), 1)));
-    }
-
-    #[test]
-    fn parses_the_01_format() {
-        let m = Manifest::parse(
-            "id = \"hello\"\nname = \"Hello\"\nversion = \"0.1.0\"\nopenidea-api = \"0.1\"\nwasm = \"dist/plugin.wasm\"\n\
-             permissions = [\"project-read\", \"editor-write\"]\n[[contributes.commands]]\nid = \"x\"\ntitle = \"X\"",
-        )
-        .unwrap();
-        assert!(m.legacy);
-        assert_eq!(m.capabilities.required, vec![Capability::ProjectRead, Capability::EditorWrite]);
-        assert_eq!(m.activation, vec![ActivationEvent::StartupFinished]);
-        assert_eq!(m.publisher(), None);
-    }
-
-    fn err(src: &str) -> String {
-        Manifest::parse(src).unwrap_err()
-    }
-
-    #[test]
-    fn rejects_invalid_manifests() {
-        let base = |extra: &str| format!("id = \"ok\"\nname = \"N\"\nversion = \"1.0.0\"\n{extra}");
-        assert!(err(&base("")).contains("engines.openidea"));
-        assert!(err(&base("engines.openidea = \"^0.3\"")).contains("does not match"));
-        assert!(err(&base("engines.openidea = \"^2\"")).contains("does not match"));
-        assert!(err(&base("engines.openidea = \"^0.2\"")).contains("does not match"));
-        assert!(err(&base("openidea-api = \"0.2\"")).contains("unsupported"));
-        assert!(err(&base("engines.openidea = \"^1.0\"\npermissions = [\"project-read\"]")).contains("0.1 format"));
-        assert!(
-            err(&base("engines.openidea = \"^1.0\"\n[capabilities]\nrequired = [\"network\"]")).contains("unknown")
-        );
-        assert!(err(&base("engines.openidea = \"^1.0\"\nwasm = \"../x.wasm\"")).contains("relative path"));
-        assert!(err(&base("engines.openidea = \"^1.0\"\nactivation = [\"on-command:x\"]")).contains("needs `wasm`"));
-        assert!(
-            err(&base("engines.openidea = \"^1.0\"\nwasm = \"p.wasm\"\nactivation = [\"on-boot\"]"))
-                .contains("unknown")
-        );
-        assert!(
-            err(&base("engines.openidea = \"^1.0\"\nwasm = \"p.wasm\"\nactivation = [\"on-schedule:5\"]"))
-                .contains("60 seconds")
-        );
-        assert!(err(&base("engines.openidea = \"^1.0\"\nbogus = 1")).contains("unknown field"));
-        assert!(err(&base("engines.openidea = \"^1.0\"\ncontributes.commands = 3")).contains("table"));
-        assert!(
-            err("id = \"Bad\"\nname = \"N\"\nversion = \"1.0.0\"\nengines.openidea = \"^1.0\"").contains("plugin id")
-        );
-        assert!(
-            err("id = \"a..b\"\nname = \"N\"\nversion = \"1.0.0\"\nengines.openidea = \"^1.0\"").contains("plugin id")
-        );
-        assert!(err("id = \"ok\"\nname = \"N\"\nversion = \"1.0\"\nengines.openidea = \"^1.0\"").contains("version"));
-    }
-
-    #[test]
-    fn ids() {
-        assert!(validate_plugin_id("openidea.material-icons").is_ok());
-        assert!(validate_plugin_id("hello_2").is_ok());
-        assert!(validate_plugin_id(".x").is_err());
-        assert!(validate_item_id("word-count.v2_x", "command id").is_ok());
-        assert!(validate_item_id("-x", "command id").is_err());
-        assert!(validate_point_id("iconThemes").is_ok());
-        assert!(validate_point_id("Icon").is_err());
-        assert!(engine_compatible("1.0", false));
-        assert!(engine_compatible(">=1.0, <2", false));
-        assert!(!engine_compatible("^0.2", false), "0.x components don't run on 1.0");
-        assert!(engine_compatible("0.1.3", true));
-        assert!(!engine_compatible("0.10", true));
-    }
-}

crates/ide-extension/src/package.rs

@@ -1,465 +0,0 @@
-//! Plugin distribution: the package file, its
-//! signature, and the static marketplace index.
-//!
-//! - **Package** (`<id>-<version>.oiplugin`): a zip of the manifest, the files
-//!   its declarations reference, the component and licence files, plus
-//!   [`SIGNATURE_FILE`] when signed.
-//! - **Signature**: Ed25519 over `openidea-plugin/1\n<id>\n<version>\n<digest>`,
-//!   `digest` being [`package_digest`] of the unpacked files. A signature
-//!   proves who published the bytes; whether to trust that publisher is the
-//!   index's call.
-//! - **Index** (`index.json`): the publishers and their keys (the trust root),
-//!   the published plugins, and revocations. A publisher owns the id prefix
-//!   `<publisher>.`; a revoked key invalidates everything it signed, a
-//!   revoked plugin version is disabled where it is installed.
-
-use crate::MANIFEST_FILE;
-use base64::Engine as _;
-use ed25519_dalek::{Signature, Signer, SigningKey, VerifyingKey};
-use serde::{Deserialize, Serialize};
-use std::io::{Read, Write};
-use std::path::{Component, Path, PathBuf};
-
-pub const SIGNATURE_FILE: &str = "SIGNATURE.json";
-pub const PACKAGE_EXTENSION: &str = "oiplugin";
-pub const INDEX_FORMAT: u32 = 1;
-/// Limits when unpacking an untrusted package.
-const MAX_ENTRIES: usize = 10_000;
-const MAX_TOTAL: u64 = 512 << 20;
-
-const B64: base64::engine::GeneralPurpose = base64::engine::general_purpose::STANDARD;
-
-/// Content digest of a package: the manifest plus `files` (relative paths).
-pub fn package_digest(dir: &Path, files: &[PathBuf]) -> std::io::Result<String> {
-    let mut all = files.to_vec();
-    all.push(PathBuf::from(MANIFEST_FILE));
-    crate::ledger::package_hash(dir, &all)
-}
-
-fn signed_message(id: &str, version: &str, digest: &str) -> Vec<u8> {
-    format!("openidea-plugin/1\n{id}\n{version}\n{digest}").into_bytes()
-}
-
-/// `SIGNATURE.json` of a signed package.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PackageSignature {
-    pub publisher: String,
-    /// Ed25519 public key, base64.
-    pub key: String,
-    /// Ed25519 signature, base64.
-    pub signature: String,
-}
-
-/// A publisher's key pair (the 32-byte seed, base64, in a file only the publisher has).
-pub struct PublisherKey(SigningKey);
-
-impl PublisherKey {
-    pub fn from_seed(seed: [u8; 32]) -> Self {
-        Self(SigningKey::from_bytes(&seed))
-    }
-
-    /// The seed as written by `openidea-plugin keygen`.
-    pub fn from_base64(text: &str) -> Result<Self, String> {
-        let bytes = B64.decode(text.trim()).map_err(|e| format!("key file: {e}"))?;
-        let seed: [u8; 32] = bytes.try_into().map_err(|_| "key file: expected a 32-byte key".to_owned())?;
-        Ok(Self::from_seed(seed))
-    }
-
-    pub fn seed_base64(&self) -> String {
-        B64.encode(self.0.to_bytes())
-    }
-
-    pub fn public_base64(&self) -> String {
-        B64.encode(self.0.verifying_key().to_bytes())
-    }
-
-    pub fn sign(&self, publisher: &str, id: &str, version: &str, digest: &str) -> PackageSignature {
-        let sig = self.0.sign(&signed_message(id, version, digest));
-        PackageSignature {
-            publisher: publisher.into(),
-            key: self.public_base64(),
-            signature: B64.encode(sig.to_bytes()),
-        }
-    }
-}
-
-impl PackageSignature {
-    /// Whether the signature is valid for `id`, `version` and `digest` (the
-    /// key's validity is checked against an [`Index`]).
-    pub fn check(&self, id: &str, version: &str, digest: &str) -> Result<(), String> {
-        let key: [u8; 32] = B64
-            .decode(&self.key)
-            .ok()
-            .and_then(|b| b.try_into().ok())
-            .ok_or_else(|| "signature: malformed public key".to_owned())?;
-        let key = VerifyingKey::from_bytes(&key).map_err(|_| "signature: invalid public key".to_owned())?;
-        let sig: [u8; 64] = B64
-            .decode(&self.signature)
-            .ok()
-            .and_then(|b| b.try_into().ok())
-            .ok_or_else(|| "signature: malformed".to_owned())?;
-        key.verify_strict(&signed_message(id, version, digest), &Signature::from_bytes(&sig))
-            .map_err(|_| "the signature does not match the package (it was changed after signing)".to_owned())
-    }
-}
-
-/// Writes the package `out` from `dir`: the manifest, `files`, and the signature if any.
-pub fn pack(dir: &Path, files: &[PathBuf], out: &Path, signature: Option<&PackageSignature>) -> Result<(), String> {
-    let io = |e: std::io::Error| e.to_string();
-    let file = std::fs::File::create(out).map_err(io)?;
-    let mut zip = zip::ZipWriter::new(file);
-    let options = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Deflated);
-    let mut names: Vec<PathBuf> = std::iter::once(PathBuf::from(MANIFEST_FILE)).chain(files.iter().cloned()).collect();
-    names.sort();
-    names.dedup();
-    for rel in names {
-        let name = rel.to_str().ok_or("non UTF-8 file name")?.replace('\\', "/");
-        zip.start_file(name, options).map_err(|e| e.to_string())?;
-        let bytes = std::fs::read(dir.join(&rel)).map_err(|e| format!("{}: {e}", rel.display()))?;
-        zip.write_all(&bytes).map_err(io)?;
-    }
-    if let Some(sig) = signature {
-        zip.start_file(SIGNATURE_FILE, options).map_err(|e| e.to_string())?;
-        zip.write_all(serde_json::to_string_pretty(sig).map_err(|e| e.to_string())?.as_bytes()).map_err(io)?;
-    }
-    zip.finish().map_err(|e| e.to_string())?;
-    Ok(())
-}
-
-/// What [`unpack`] wrote.
-#[derive(Debug)]
-pub struct Unpacked {
-    /// Every file but the manifest and the signature, relative.
-    pub files: Vec<PathBuf>,
-    pub signature: Option<PackageSignature>,
-}
-
-/// `name` as a relative path that stays inside the package.
-fn safe_path(name: &str) -> Option<PathBuf> {
-    let p = Path::new(name);
-    (!name.is_empty() && p.components().all(|c| matches!(c, Component::Normal(_)))).then(|| p.to_path_buf())
-}
-
-/// Archiver metadata at the top of an archive, not part of a package
-/// (`__MACOSX/…`, `.DS_Store`, AppleDouble `._…` files).
-fn archiver_metadata(name: &str) -> bool {
-    let top = name.split('/').next().unwrap_or_default();
-    top == "__MACOSX" || top == ".DS_Store" || (top.starts_with("._") && top.len() > 2)
-}
-
-/// Where the package is inside an archive: at its root (`.oiplugin`, or a zip
-/// of the package's contents) or in its only folder (a zip of the package
-/// folder). `None` when neither holds a manifest.
-fn package_prefix(names: &[String]) -> Option<String> {
-    if names.iter().any(|n| n == MANIFEST_FILE) {
-        return Some(String::new());
-    }
-    let mut tops = names.iter().filter(|n| !archiver_metadata(n)).map(|n| n.split('/').next().unwrap_or_default());
-    let top = tops.next()?;
-    if tops.any(|t| t != top) {
-        return None;
-    }
-    let prefix = format!("{top}/");
-    names.iter().any(|n| *n == format!("{prefix}{MANIFEST_FILE}")).then_some(prefix)
-}
-
-/// Extracts the package `archive` (an `.oiplugin`, or a `.zip` of a package
-/// folder or of its contents) into the empty directory `dest`, refusing
-/// paths leaving it, links, and oversized contents.
-pub fn unpack(archive: &Path, dest: &Path) -> Result<Unpacked, String> {
-    let file = std::fs::File::open(archive).map_err(|e| format!("{}: {e}", archive.display()))?;
-    let mut zip =
-        zip::ZipArchive::new(file).map_err(|e| format!("{}: not a plugin package ({e})", archive.display()))?;
-    if zip.len() > MAX_ENTRIES {
-        return Err(format!("more than {MAX_ENTRIES} files"));
-    }
-    let mut names = Vec::with_capacity(zip.len());
-    for i in 0..zip.len() {
-        let entry = zip.by_index(i).map_err(|e| e.to_string())?;
-        if !entry.is_dir() {
-            names.push(entry.name().map_err(|e| e.to_string())?.into_owned());
-        }
-    }
-    // An IntelliJ plugin or any other zip: say what is missing rather than fail later.
-    let prefix = package_prefix(&names).ok_or_else(|| {
-        format!("{} is not an OpenIDEA plugin: no {MANIFEST_FILE} at its root or in its only folder", archive.display())
-    })?;
-    std::fs::create_dir_all(dest).map_err(|e| e.to_string())?;
-    let (mut files, mut signature, mut total, mut manifest) = (Vec::new(), None, 0u64, false);
-    for i in 0..zip.len() {
-        let mut entry = zip.by_index(i).map_err(|e| e.to_string())?;
-        if entry.is_dir() {
-            continue;
-        }
-        let full = entry.name().map_err(|e| e.to_string())?.into_owned();
-        // Outside the package folder there is only archiver metadata (`package_prefix` checked).
-        let Some(name) = full.strip_prefix(&prefix).map(str::to_owned) else { continue };
-        if archiver_metadata(&name) {
-            continue;
-        }
-        if entry.is_symlink() {
-            return Err(format!("{full}: links are not allowed in packages"));
-        }
-        let rel = safe_path(&name).ok_or_else(|| format!("invalid path {full:?} in package"))?;
-        let mut bytes = Vec::new();
-        entry.by_ref().take(MAX_TOTAL - total + 1).read_to_end(&mut bytes).map_err(|e| e.to_string())?;
-        total += bytes.len() as u64;
-        if total > MAX_TOTAL {
-            return Err(format!("the package unpacks to more than {} MiB", MAX_TOTAL >> 20));
-        }
-        if rel == Path::new(SIGNATURE_FILE) {
-            signature = Some(serde_json::from_slice(&bytes).map_err(|e| format!("{SIGNATURE_FILE}: {e}"))?);
-            continue;
-        }
-        let to = dest.join(&rel);
-        if let Some(parent) = to.parent() {
-            std::fs::create_dir_all(parent).map_err(|e| e.to_string())?;
-        }
-        std::fs::write(&to, bytes).map_err(|e| e.to_string())?;
-        if rel == Path::new(MANIFEST_FILE) {
-            manifest = true;
-        } else {
-            files.push(rel);
-        }
-    }
-    if !manifest {
-        return Err(format!("the package has no {MANIFEST_FILE}"));
-    }
-    files.sort();
-    Ok(Unpacked { files, signature })
-}
-
-// ---- index -------------------------------------------------------------------
-
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub struct Index {
-    pub format: u32,
-    #[serde(default)]
-    pub publishers: Vec<Publisher>,
-    #[serde(default)]
-    pub plugins: Vec<IndexEntry>,
-    #[serde(default)]
-    pub revoked: Vec<Revocation>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub struct Publisher {
-    /// Owns plugin ids `<id>.…`.
-    pub id: String,
-    pub name: String,
-    pub keys: Vec<KeyEntry>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub struct KeyEntry {
-    /// Ed25519 public key, base64.
-    pub key: String,
-    /// Packages signed with it are no longer trusted.
-    #[serde(default)]
-    pub revoked: bool,
-}
-
-/// A published plugin version.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub struct IndexEntry {
-    pub id: String,
-    pub name: String,
-    pub version: String,
-    #[serde(default)]
-    pub description: String,
-    #[serde(default)]
-    pub authors: Vec<String>,
-    pub publisher: String,
-    /// The package, relative to the index (or an absolute URL).
-    pub download: String,
-    /// [`package_digest`] of its contents.
-    pub digest: String,
-    #[serde(default)]
-    pub capabilities: Vec<String>,
-}
-
-/// A plugin (all versions when `versions` is empty) that must not run.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub struct Revocation {
-    pub id: String,
-    #[serde(default)]
-    pub versions: Vec<String>,
-    pub reason: String,
-}
-
-impl Index {
-    pub fn parse(text: &str) -> Result<Self, String> {
-        let index: Index = serde_json::from_str(text).map_err(|e| format!("index: {e}"))?;
-        if index.format != INDEX_FORMAT {
-            return Err(format!("index format {} is not supported (this IDE reads {INDEX_FORMAT})", index.format));
-        }
-        Ok(index)
-    }
-
-    /// The revocation that applies to `id` at `version`.
-    pub fn revocation(&self, id: &str, version: &str) -> Option<&Revocation> {
-        self.revoked.iter().find(|r| r.id == id && (r.versions.is_empty() || r.versions.iter().any(|v| v == version)))
-    }
-
-    /// Whether `key` (base64) belongs to a publisher and was revoked.
-    pub fn key_revoked(&self, key: &str) -> bool {
-        self.publishers.iter().flat_map(|p| &p.keys).any(|k| k.key == key && k.revoked)
-    }
-
-    /// The trusted publisher of a signed package: the signature is valid, its
-    /// key is one of the publisher's and not revoked, and the publisher owns
-    /// the plugin's id prefix.
-    pub fn verify(&self, sig: &PackageSignature, id: &str, version: &str, digest: &str) -> Result<String, String> {
-        let publisher = self
-            .publishers
-            .iter()
-            .find(|p| p.id == sig.publisher)
-            .ok_or_else(|| format!("unknown publisher {:?}", sig.publisher))?;
-        let key = publisher
-            .keys
-            .iter()
-            .find(|k| k.key == sig.key)
-            .ok_or_else(|| format!("the key is not one of {}'s", publisher.name))?;
-        if key.revoked {
-            return Err(format!("{}'s signing key was revoked", publisher.name));
-        }
-        if !id.starts_with(&format!("{}.", publisher.id)) {
-            return Err(format!("{} may only publish plugins named {}.*", publisher.name, publisher.id));
-        }
-        sig.check(id, version, digest)?;
-        Ok(publisher.id.clone())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn package(dir: &Path) -> Vec<PathBuf> {
-        std::fs::create_dir_all(dir.join("dist")).unwrap();
-        std::fs::write(dir.join(MANIFEST_FILE), "id = \"acme.tools\"\nversion = \"1.0.0\"").unwrap();
-        std::fs::write(dir.join("dist/plugin.wasm"), b"\0asm").unwrap();
-        vec![PathBuf::from("dist/plugin.wasm")]
-    }
-
-    fn index(key: &PublisherKey) -> Index {
-        Index {
-            format: INDEX_FORMAT,
-            publishers: vec![Publisher {
-                id: "acme".into(),
-                name: "ACME".into(),
-                keys: vec![KeyEntry { key: key.public_base64(), revoked: false }],
-            }],
-            plugins: Vec::new(),
-            revoked: vec![Revocation {
-                id: "acme.bad".into(),
-                versions: vec!["1.0.0".into()],
-                reason: "malware".into(),
-            }],
-        }
-    }
-
-    #[test]
-    fn signed_packages_round_trip_and_tampering_is_caught() {
-        let tmp = tempfile::tempdir().unwrap();
-        let src = tmp.path().join("src");
-        let files = package(&src);
-        let digest = package_digest(&src, &files).unwrap();
-        let key = PublisherKey::from_seed([7; 32]);
-        let sig = key.sign("acme", "acme.tools", "1.0.0", &digest);
-        let out = tmp.path().join("acme.tools-1.0.0.oiplugin");
-        pack(&src, &files, &out, Some(&sig)).unwrap();
-
-        let dest = tmp.path().join("dest");
-        let unpacked = unpack(&out, &dest).unwrap();
-        assert_eq!(unpacked.files, files);
-        assert_eq!(package_digest(&dest, &unpacked.files).unwrap(), digest);
-        let index = index(&key);
-        assert_eq!(index.verify(unpacked.signature.as_ref().unwrap(), "acme.tools", "1.0.0", &digest).unwrap(), "acme");
-
-        // Changed bytes, another id, someone else's prefix, a revoked key.
-        assert!(index.verify(&sig, "acme.tools", "1.0.0", "0000").is_err());
-        assert!(index.verify(&sig, "acme.tools", "1.0.1", &digest).is_err());
-        let other = PublisherKey::from_seed([9; 32]).sign("acme", "acme.tools", "1.0.0", &digest);
-        assert!(index.verify(&other, "acme.tools", "1.0.0", &digest).unwrap_err().contains("not one of"));
-        let foreign = key.sign("acme", "evil.tools", "1.0.0", &digest);
-        assert!(index.verify(&foreign, "evil.tools", "1.0.0", &digest).unwrap_err().contains("acme.*"));
-        let mut revoked = index.clone();
-        revoked.publishers[0].keys[0].revoked = true;
-        assert!(revoked.verify(&sig, "acme.tools", "1.0.0", &digest).unwrap_err().contains("revoked"));
-        assert!(revoked.key_revoked(&sig.key));
-        assert_eq!(index.revocation("acme.bad", "1.0.0").unwrap().reason, "malware");
-        assert!(index.revocation("acme.bad", "1.0.1").is_none());
-        assert_eq!(PublisherKey::from_base64(&key.seed_base64()).unwrap().public_base64(), key.public_base64());
-    }
-
-    #[test]
-    fn unpacking_refuses_paths_leaving_the_package() {
-        let tmp = tempfile::tempdir().unwrap();
-        let out = tmp.path().join("evil.oiplugin");
-        let mut zip = zip::ZipWriter::new(std::fs::File::create(&out).unwrap());
-        let o = zip::write::SimpleFileOptions::default();
-        zip.start_file(MANIFEST_FILE, o).unwrap();
-        zip.write_all(b"id = \"x\"").unwrap();
-        zip.start_file("../outside.txt", o).unwrap();
-        zip.write_all(b"x").unwrap();
-        zip.finish().unwrap();
-        let err = unpack(&out, &tmp.path().join("dest")).unwrap_err();
-        assert!(err.contains("invalid path"), "{err}");
-        assert!(!tmp.path().join("outside.txt").exists());
-        assert!(Index::parse(r#"{"format": 2}"#).is_err());
-    }
-
-    fn zip_of(path: &Path, entries: &[(&str, &str)]) {
-        let mut zip = zip::ZipWriter::new(std::fs::File::create(path).unwrap());
-        for (name, body) in entries {
-            zip.start_file(*name, zip::write::SimpleFileOptions::default()).unwrap();
-            zip.write_all(body.as_bytes()).unwrap();
-        }
-        zip.finish().unwrap();
-    }
-
-    #[test]
-    fn a_zip_holds_the_package_at_its_root_or_in_its_only_folder() {
-        let tmp = tempfile::tempdir().unwrap();
-        let manifest = "id = \"acme.tools\"";
-        let at_root = tmp.path().join("root.zip");
-        zip_of(&at_root, &[(MANIFEST_FILE, manifest), ("dist/plugin.wasm", "w"), (".DS_Store", "x")]);
-        let got = unpack(&at_root, &tmp.path().join("a")).unwrap();
-        assert_eq!(got.files, [PathBuf::from("dist/plugin.wasm")]);
-
-        // What zipping the folder in Finder makes: the folder plus `__MACOSX`.
-        let folder = tmp.path().join("folder.zip");
-        zip_of(
-            &folder,
-            &[
-                ("acme-tools/plugin.toml", manifest),
-                ("acme-tools/dist/plugin.wasm", "w"),
-                ("__MACOSX/acme-tools/._plugin.toml", "x"),
-            ],
-        );
-        let dest = tmp.path().join("b");
-        let got = unpack(&folder, &dest).unwrap();
-        assert_eq!(got.files, [PathBuf::from("dist/plugin.wasm")]);
-        assert!(dest.join(MANIFEST_FILE).is_file());
-        assert!(!dest.join("__MACOSX").exists() && !dest.join("acme-tools").exists());
-
-        // Two folders, a manifest one level too deep, or none (an IntelliJ plugin): not a package.
-        for (name, entries) in [
-            ("two.zip", &[("a/plugin.toml", manifest), ("b/x.txt", "x")][..]),
-            ("deep.zip", &[("a/b/plugin.toml", manifest)][..]),
-            ("intellij.zip", &[("my-plugin/lib/my-plugin.jar", "jar")][..]),
-        ] {
-            let path = tmp.path().join(name);
-            zip_of(&path, entries);
-            let err = unpack(&path, &tmp.path().join(name).with_extension("out")).unwrap_err();
-            assert!(err.contains("is not an OpenIDEA plugin"), "{name}: {err}");
-        }
-    }
-}

crates/ide-extension/src/point.rs

@@ -1,175 +0,0 @@
-//! The extension point contract (plan 4.1).
-
-use crate::capability::Capability;
-use crate::manifest::{Manifest, check_relative};
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-/// Where a contribution takes effect (plan 3, placement rules).
-#[derive(Clone, Copy, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize, specta::Type)]
-#[serde(rename_all = "camelCase")]
-pub enum Placement {
-    /// Projected to the client (menus, keybindings, themes, icons).
-    Ui,
-    /// Takes effect on the machine the project is on (languages, LSP, run configurations).
-    Workspace,
-}
-
-/// The package a declaration comes from, as extension points see it.
-#[derive(Clone, Debug)]
-pub struct Package {
-    pub manifest: Arc<Manifest>,
-    /// Package directory.
-    pub dir: PathBuf,
-    /// Hash of the package's files when they never change (an installed
-    /// copy): validated declarations are then reused from the
-    /// [`ContributionIndex`](crate::ContributionIndex).
-    pub digest: Option<Arc<str>>,
-}
-
-/// Largest single package file an extension point reads.
-pub const MAX_PACKAGE_FILE: u64 = 8 << 20;
-
-impl Package {
-    pub fn new(manifest: Manifest, dir: PathBuf) -> Self {
-        Self { manifest: Arc::new(manifest), dir, digest: None }
-    }
-
-    pub fn with_digest(mut self, digest: &str) -> Self {
-        self.digest = Some(digest.into());
-        self
-    }
-
-    pub fn id(&self) -> &str {
-        &self.manifest.id
-    }
-
-    /// Resolves a package-relative path, refusing anything that leaves the
-    /// package (`..`, absolute paths, symlinks pointing outside).
-    pub fn resolve(&self, rel: &Path) -> Result<PathBuf, String> {
-        check_relative(rel, "path")?;
-        let joined = self.dir.join(rel);
-        let real = joined.canonicalize().map_err(|_| format!("{}: no such file in the plugin", rel.display()))?;
-        let root = self.dir.canonicalize().map_err(|e| format!("plugin directory: {e}"))?;
-        if !real.starts_with(&root) {
-            return Err(format!("{}: points outside the plugin", rel.display()));
-        }
-        Ok(real)
-    }
-
-    pub fn read_bytes(&self, rel: &Path) -> Result<Vec<u8>, String> {
-        let real = self.resolve(rel)?;
-        let meta = std::fs::metadata(&real).map_err(|e| format!("{}: {e}", rel.display()))?;
-        if !meta.is_file() {
-            return Err(format!("{}: not a file", rel.display()));
-        }
-        if meta.len() > MAX_PACKAGE_FILE {
-            return Err(format!("{}: larger than {} MiB", rel.display(), MAX_PACKAGE_FILE >> 20));
-        }
-        std::fs::read(&real).map_err(|e| format!("{}: {e}", rel.display()))
-    }
-
-    pub fn read_text(&self, rel: &Path) -> Result<String, String> {
-        String::from_utf8(self.read_bytes(rel)?).map_err(|_| format!("{}: not UTF-8 text", rel.display()))
-    }
-}
-
-/// Undoes one committed contribution. Dropping without [`dispose`](Self::dispose) also disposes.
-#[must_use = "dropping a Disposable undoes the contribution"]
-pub struct Disposable(Option<Box<dyn FnOnce() + Send>>);
-
-impl Disposable {
-    pub fn new(f: impl FnOnce() + Send + 'static) -> Self {
-        Self(Some(Box::new(f)))
-    }
-
-    /// A contribution with nothing to undo.
-    pub fn noop() -> Self {
-        Self(None)
-    }
-
-    pub fn dispose(mut self) {
-        if let Some(f) = self.0.take() {
-            f();
-        }
-    }
-}
-
-impl Drop for Disposable {
-    fn drop(&mut self) {
-        if let Some(f) = self.0.take() {
-            f();
-        }
-    }
-}
-
-impl std::fmt::Debug for Disposable {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str("Disposable")
-    }
-}
-
-pub type Commit = Box<dyn FnOnce() -> Result<Disposable, String> + Send>;
-
-/// A validated declaration, ready to take effect.
-pub struct Prepared {
-    /// Capabilities this declaration needs (a language with an LSP → `process:<binary>`).
-    pub capabilities: Vec<Capability>,
-    /// Package files the declaration references (copied on install).
-    pub files: Vec<PathBuf>,
-    /// Identity within the point: a later declaration with the same key replaces
-    /// the earlier one of the same plugin (re-registering a command).
-    pub key: Option<String>,
-    /// User-facing one-liner for the plugin details page ("Insert Date").
-    pub label: String,
-    /// Makes it take effect. Must not fail for reasons `prepare` could have checked.
-    pub commit: Commit,
-}
-
-impl Prepared {
-    pub fn new(label: impl Into<String>, commit: impl FnOnce() -> Result<Disposable, String> + Send + 'static) -> Self {
-        Self { capabilities: Vec::new(), files: Vec::new(), key: None, label: label.into(), commit: Box::new(commit) }
-    }
-
-    pub fn key(mut self, key: impl Into<String>) -> Self {
-        self.key = Some(key.into());
-        self
-    }
-
-    pub fn file(mut self, path: impl Into<PathBuf>) -> Self {
-        self.files.push(path.into());
-        self
-    }
-
-    pub fn capability(mut self, cap: Capability) -> Self {
-        if !self.capabilities.contains(&cap) {
-            self.capabilities.push(cap);
-        }
-        self
-    }
-}
-
-impl std::fmt::Debug for Prepared {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Prepared").field("key", &self.key).field("label", &self.label).finish_non_exhaustive()
-    }
-}
-
-/// A kind of contribution (`contributes.<id>` in the manifest). Implemented by
-/// the crate that owns the feature; registered once in an [`crate::ExtensionRegistry`].
-pub trait ExtensionPoint: Send + Sync {
-    /// `"languages"`, `"iconThemes"`, …
-    fn id(&self) -> &'static str;
-
-    fn placement(&self) -> Placement;
-
-    /// Parses and validates one declaration without side effects, and works
-    /// out the capabilities it needs. `Ui` points validate completely here: the
-    /// client's projection is not allowed to fail.
-    fn prepare(&self, pkg: &Package, decl: toml::Value) -> Result<Prepared, String>;
-}
-
-/// Deserializes a declaration with serde, prefixing errors with the point id.
-pub fn decode<T: serde::de::DeserializeOwned>(point: &str, decl: toml::Value) -> Result<T, String> {
-    decl.try_into().map_err(|e: toml::de::Error| format!("contributes.{point}: {}", e.message()))
-}

crates/ide-extension/src/registry.rs

@@ -1,305 +0,0 @@
-//! Extension points plus the contributions committed to them, accounted per plugin.
-
-use crate::capability::Capability;
-use crate::point::{Disposable, ExtensionPoint, Package, Placement, Prepared};
-use parking_lot::{Mutex, RwLock};
-use serde::{Deserialize, Serialize};
-use specta::Type;
-use std::collections::BTreeMap;
-use std::path::PathBuf;
-use std::sync::Arc;
-
-/// A contribution as the plugin details page lists it.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct ContributionInfo {
-    pub point: String,
-    pub label: String,
-}
-
-struct Entry {
-    point: &'static str,
-    key: Option<String>,
-    label: String,
-    disposable: Disposable,
-}
-
-/// Every declaration of a package, validated; nothing has taken effect yet.
-pub struct PreparedSet {
-    pub plugin: String,
-    /// Union of what the declarations need (beyond the manifest's own list).
-    pub capabilities: Vec<Capability>,
-    /// Package files the declarations reference.
-    pub files: Vec<PathBuf>,
-    /// Declarations for extension points this host does not know (skipped).
-    pub warnings: Vec<String>,
-    items: Vec<(&'static str, Prepared)>,
-}
-
-impl PreparedSet {
-    pub fn is_empty(&self) -> bool {
-        self.items.is_empty()
-    }
-
-    pub fn len(&self) -> usize {
-        self.items.len()
-    }
-}
-
-impl std::fmt::Debug for PreparedSet {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("PreparedSet")
-            .field("plugin", &self.plugin)
-            .field("items", &self.items.len())
-            .field("warnings", &self.warnings)
-            .finish()
-    }
-}
-
-#[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>>>,
-}
-
-impl ExtensionRegistry {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Adds an extension point. Ids are unique.
-    pub fn register(&self, point: Arc<dyn ExtensionPoint>) -> Result<(), String> {
-        let id = point.id();
-        crate::manifest::validate_point_id(id)?;
-        let mut points = self.points.write();
-        if points.contains_key(id) {
-            return Err(format!("extension point {id:?} is already registered"));
-        }
-        points.insert(id, point);
-        Ok(())
-    }
-
-    pub fn point_ids(&self) -> Vec<&'static str> {
-        self.points.read().keys().copied().collect()
-    }
-
-    pub fn placement(&self, point: &str) -> Option<Placement> {
-        self.points.read().get(point).map(|p| p.placement())
-    }
-
-    fn point(&self, id: &str) -> Option<Arc<dyn ExtensionPoint>> {
-        self.points.read().get(id).cloned()
-    }
-
-    /// 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).
-    pub fn prepare(&self, pkg: &Package) -> Result<PreparedSet, String> {
-        let mut set = PreparedSet {
-            plugin: pkg.id().to_owned(),
-            capabilities: Vec::new(),
-            files: Vec::new(),
-            warnings: Vec::new(),
-            items: Vec::new(),
-        };
-        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");
-                tracing::warn!(plugin = %pkg.id(), "{msg}");
-                set.warnings.push(msg);
-                continue;
-            };
-            for (i, decl) in pkg.manifest.declarations(point_id).into_iter().enumerate() {
-                let prepared = point
-                    .prepare(pkg, decl)
-                    .map_err(|e| format!("contributes.{point_id}[{i}]: {}", strip_prefix(&e, point_id)))?;
-                for cap in &prepared.capabilities {
-                    if !set.capabilities.contains(cap) {
-                        set.capabilities.push(cap.clone());
-                    }
-                }
-                for f in &prepared.files {
-                    if !set.files.contains(f) {
-                        set.files.push(f.clone());
-                    }
-                }
-                set.items.push((point.id(), prepared));
-            }
-        }
-        Ok(set)
-    }
-
-    /// Makes a prepared set take effect, all or nothing: if one commit fails,
-    /// the ones before it are disposed in reverse order.
-    pub fn commit(&self, set: PreparedSet) -> Result<(), String> {
-        let mut committed: Vec<Entry> = Vec::with_capacity(set.items.len());
-        for (point, prepared) in set.items {
-            let Prepared { key, label, commit, .. } = prepared;
-            match commit() {
-                Ok(disposable) => committed.push(Entry { point, key, label, disposable }),
-                Err(e) => {
-                    tracing::error!(plugin = %set.plugin, "contributes.{point}: commit failed: {e}");
-                    while let Some(entry) = committed.pop() {
-                        entry.disposable.dispose();
-                    }
-                    return Err(format!("contributes.{point}: {e}"));
-                }
-            }
-        }
-        let replaced = {
-            let mut entries = self.entries.lock();
-            let list = entries.entry(set.plugin).or_default();
-            let mut replaced = Vec::new();
-            for new in &committed {
-                if let Some(key) = &new.key
-                    && let Some(pos) = list.iter().position(|e| e.point == new.point && e.key.as_ref() == Some(key))
-                {
-                    replaced.push(list.remove(pos));
-                }
-            }
-            list.extend(committed);
-            replaced
-        };
-        for old in replaced.into_iter().rev() {
-            old.disposable.dispose();
-        }
-        Ok(())
-    }
-
-    /// Withdraws everything `plugin` contributed, newest first.
-    pub fn dispose_plugin(&self, plugin: &str) -> bool {
-        let list = self.entries.lock().remove(plugin).unwrap_or_default();
-        let any = !list.is_empty();
-        for entry in list.into_iter().rev() {
-            entry.disposable.dispose();
-        }
-        any
-    }
-
-    pub fn contributions(&self, plugin: &str) -> Vec<ContributionInfo> {
-        self.entries
-            .lock()
-            .get(plugin)
-            .map(|list| {
-                list.iter().map(|e| ContributionInfo { point: e.point.into(), label: e.label.clone() }).collect()
-            })
-            .unwrap_or_default()
-    }
-
-    /// How many contributions `plugin` has at `point`.
-    pub fn count(&self, plugin: &str, point: &str) -> usize {
-        self.entries.lock().get(plugin).map_or(0, |list| list.iter().filter(|e| e.point == point).count())
-    }
-
-    /// Plugins with at least one contribution.
-    pub fn plugins(&self) -> Vec<String> {
-        self.entries.lock().iter().filter(|(_, l)| !l.is_empty()).map(|(id, _)| id.clone()).collect()
-    }
-}
-
-fn strip_prefix<'a>(e: &'a str, point: &str) -> &'a str {
-    e.strip_prefix(&format!("contributes.{point}: ")).unwrap_or(e)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::manifest::Manifest;
-    use std::sync::atomic::{AtomicUsize, Ordering};
-
-    /// Records live items in a shared list; `fail = true` makes commit fail.
-    struct Recording {
-        id: &'static str,
-        live: Arc<Mutex<Vec<String>>>,
-        commits: Arc<AtomicUsize>,
-    }
-
-    impl ExtensionPoint for Recording {
-        fn id(&self) -> &'static str {
-            self.id
-        }
-        fn placement(&self) -> Placement {
-            Placement::Ui
-        }
-        fn prepare(&self, _pkg: &Package, decl: toml::Value) -> Result<Prepared, String> {
-            let name = decl.get("name").and_then(|v| v.as_str()).ok_or("missing name")?.to_owned();
-            let fail = decl.get("fail").and_then(|v| v.as_bool()).unwrap_or(false);
-            let (live, commits) = (self.live.clone(), self.commits.clone());
-            let label = name.clone();
-            let mut p = Prepared::new(label, move || {
-                commits.fetch_add(1, Ordering::SeqCst);
-                if fail {
-                    return Err("boom".into());
-                }
-                live.lock().push(name.clone());
-                Ok(Disposable::new(move || live.lock().retain(|n| *n != name)))
-            });
-            if let Some(f) = decl.get("file").and_then(|v| v.as_str()) {
-                p = p.file(f);
-            }
-            if decl.get("key").and_then(|v| v.as_bool()).unwrap_or(false) {
-                p = p.key("k");
-            }
-            Ok(p)
-        }
-    }
-
-    fn setup() -> (ExtensionRegistry, Arc<Mutex<Vec<String>>>) {
-        let reg = ExtensionRegistry::new();
-        let live = Arc::new(Mutex::new(Vec::new()));
-        let commits = Arc::new(AtomicUsize::new(0));
-        reg.register(Arc::new(Recording { id: "things", live: live.clone(), commits: commits.clone() })).unwrap();
-        reg.register(Arc::new(Recording { id: "others", live: live.clone(), commits })).unwrap();
-        (reg, live)
-    }
-
-    fn pkg(contributes: &str) -> Package {
-        let src = format!("id = \"p\"\nname = \"P\"\nversion = \"1.0.0\"\nengines.openidea = \"^1.0\"\n{contributes}");
-        Package::new(Manifest::parse(&src).unwrap(), PathBuf::from("/nonexistent"))
-    }
-
-    #[test]
-    fn commits_and_disposes_per_plugin() {
-        let (reg, live) = setup();
-        assert!(
-            reg.register(Arc::new(Recording { id: "things", live: live.clone(), commits: Default::default() }))
-                .is_err()
-        );
-        let p = pkg(
-            "[[contributes.things]]\nname = \"a\"\nfile = \"x.json\"\n[[contributes.things]]\nname = \"b\"\n[contributes.others]\nname = \"c\"",
-        );
-        let set = reg.prepare(&p).unwrap();
-        assert_eq!(set.len(), 3);
-        assert_eq!(set.files, [PathBuf::from("x.json")]);
-        assert!(live.lock().is_empty(), "prepare has no side effects");
-        reg.commit(set).unwrap();
-        assert_eq!(*live.lock(), ["c", "a", "b"]);
-        assert_eq!(reg.count("p", "things"), 2);
-        assert_eq!(reg.contributions("p").len(), 3);
-        assert!(reg.dispose_plugin("p"));
-        assert!(live.lock().is_empty());
-    }
-
-    #[test]
-    fn a_failed_commit_rolls_back() {
-        let (reg, live) = setup();
-        let p = pkg("[[contributes.things]]\nname = \"a\"\n[[contributes.things]]\nname = \"b\"\nfail = true");
-        let err = reg.commit(reg.prepare(&p).unwrap()).unwrap_err();
-        assert!(err.contains("boom"));
-        assert!(live.lock().is_empty(), "a was undone");
-        assert!(reg.contributions("p").is_empty());
-    }
-
-    #[test]
-    fn invalid_declarations_fail_prepare_and_unknown_points_warn() {
-        let (reg, _) = setup();
-        let err = reg.prepare(&pkg("[[contributes.things]]\nnope = 1")).unwrap_err();
-        assert_eq!(err, "contributes.things[0]: missing name");
-        let set =
-            reg.prepare(&pkg("[[contributes.futureThing]]\nx = 1\n[[contributes.things]]\nname = \"a\"")).unwrap();
-        assert_eq!(set.len(), 1);
-        assert_eq!(set.warnings.len(), 1);
-        assert!(set.warnings[0].contains("futureThing"));
-    }
-}

crates/ide-extension/src/ui.rs

@@ -1,247 +0,0 @@
-//! UI contributions: validated declarations projected to the client.
-//!
-//! A `Ui` extension point validates a declaration completely in Rust and
-//! commits it as JSON into the [`UiStore`]; the client receives the store's
-//! snapshot and projects each item onto an existing `register*` function
-//! (`defineUiPoint` in `src/features/plugins/projection.ts`). Large payloads
-//! (icon SVGs) go into the store's assets and are fetched on demand.
-
-use crate::index::ContributionIndex;
-use crate::point::{Disposable, ExtensionPoint, Package, Placement, Prepared};
-use parking_lot::RwLock;
-use serde::{Deserialize, Serialize};
-use specta::Type;
-use std::collections::BTreeMap;
-use std::path::PathBuf;
-use std::sync::Arc;
-use std::sync::atomic::{AtomicU64, Ordering};
-
-/// One projected declaration.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Type)]
-#[serde(rename_all = "camelCase")]
-pub struct UiContribution {
-    pub plugin_id: String,
-    /// Extension point id (`commands`, `iconThemes`, …).
-    pub point: String,
-    /// Stable within (plugin, point): the client keys its registrations on it.
-    pub key: String,
-    /// The validated declaration, shaped by the point.
-    #[specta(type = specta_typescript::Unknown)]
-    pub decl: serde_json::Value,
-}
-
-struct Item {
-    seq: u64,
-    contribution: UiContribution,
-}
-
-/// Committed UI contributions of all plugins.
-#[derive(Default)]
-pub struct UiStore {
-    items: RwLock<Vec<Item>>,
-    /// (plugin, asset id) → content.
-    assets: RwLock<BTreeMap<(String, String), Arc<str>>>,
-    seq: AtomicU64,
-    revision: AtomicU64,
-    index: RwLock<Option<Arc<ContributionIndex>>>,
-}
-
-impl UiStore {
-    pub fn new() -> Arc<Self> {
-        Arc::new(Self::default())
-    }
-
-    /// Adds an item; the returned disposable removes it.
-    pub fn insert(self: &Arc<Self>, contribution: UiContribution) -> Disposable {
-        let seq = self.seq.fetch_add(1, Ordering::Relaxed);
-        self.items.write().push(Item { seq, contribution });
-        self.revision.fetch_add(1, Ordering::Release);
-        let store = Arc::downgrade(self);
-        Disposable::new(move || {
-            if let Some(store) = store.upgrade() {
-                store.items.write().retain(|i| i.seq != seq);
-                store.revision.fetch_add(1, Ordering::Release);
-            }
-        })
-    }
-
-    /// Stores assets of a plugin (ids are unique per plugin; later ones replace).
-    pub fn insert_assets(self: &Arc<Self>, plugin: &str, assets: Vec<(String, String)>) -> Disposable {
-        let keys: Vec<(String, String)> = assets.iter().map(|(id, _)| (plugin.to_owned(), id.clone())).collect();
-        {
-            let mut map = self.assets.write();
-            for (id, content) in assets {
-                map.insert((plugin.to_owned(), id), Arc::from(content));
-            }
-        }
-        let store = Arc::downgrade(self);
-        Disposable::new(move || {
-            if let Some(store) = store.upgrade() {
-                let mut map = store.assets.write();
-                for k in keys {
-                    map.remove(&k);
-                }
-            }
-        })
-    }
-
-    pub fn asset(&self, plugin: &str, id: &str) -> Option<Arc<str>> {
-        self.assets.read().get(&(plugin.to_owned(), id.to_owned())).cloned()
-    }
-
-    /// Assets of `plugin` whose id starts with `prefix`.
-    pub fn assets_with_prefix(&self, plugin: &str, prefix: &str) -> Vec<(String, Arc<str>)> {
-        self.assets
-            .read()
-            .range((plugin.to_owned(), prefix.to_owned())..)
-            .take_while(|((p, id), _)| p == plugin && id.starts_with(prefix))
-            .map(|((_, id), v)| (id.clone(), v.clone()))
-            .collect()
-    }
-
-    /// Where [`UiPoint`]s keep validated declarations of installed packages.
-    pub fn set_index(&self, index: Option<Arc<ContributionIndex>>) {
-        *self.index.write() = index;
-    }
-
-    /// Bumped on every change: clients compare it to skip re-projection.
-    pub fn revision(&self) -> u64 {
-        self.revision.load(Ordering::Acquire)
-    }
-
-    pub fn snapshot(&self) -> Vec<UiContribution> {
-        self.items.read().iter().map(|i| i.contribution.clone()).collect()
-    }
-
-    /// Items of one point, optionally of one plugin.
-    pub fn items(&self, point: &str, plugin: Option<&str>) -> Vec<UiContribution> {
-        self.items
-            .read()
-            .iter()
-            .filter(|i| i.contribution.point == point && plugin.is_none_or(|p| i.contribution.plugin_id == p))
-            .map(|i| i.contribution.clone())
-            .collect()
-    }
-}
-
-/// What a [`UiPoint`]'s validator produces for one declaration.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct UiDecl {
-    pub key: String,
-    pub label: String,
-    pub json: serde_json::Value,
-    /// Package files referenced (copied on install).
-    pub files: Vec<PathBuf>,
-    /// Large validated payloads fetched separately by the client.
-    pub assets: Vec<(String, String)>,
-}
-
-impl UiDecl {
-    pub fn new(key: impl Into<String>, label: impl Into<String>, json: serde_json::Value) -> Self {
-        Self { key: key.into(), label: label.into(), json, files: Vec::new(), assets: Vec::new() }
-    }
-}
-
-type Validate = dyn Fn(&Package, toml::Value) -> Result<UiDecl, String> + Send + Sync;
-
-/// A `Ui` extension point defined by a validator: committing stores the
-/// validated JSON (and assets) in the [`UiStore`]. Most UI contribution types
-/// (menus, keybindings, status bar items, icon themes) are one of these.
-pub struct UiPoint {
-    id: &'static str,
-    store: Arc<UiStore>,
-    validate: Box<Validate>,
-}
-
-impl UiPoint {
-    pub fn new(
-        id: &'static str,
-        store: Arc<UiStore>,
-        validate: impl Fn(&Package, toml::Value) -> Result<UiDecl, String> + Send + Sync + 'static,
-    ) -> Self {
-        Self { id, store, validate: Box::new(validate) }
-    }
-}
-
-impl ExtensionPoint for UiPoint {
-    fn id(&self) -> &'static str {
-        self.id
-    }
-
-    fn placement(&self) -> Placement {
-        Placement::Ui
-    }
-
-    fn prepare(&self, pkg: &Package, decl: toml::Value) -> Result<Prepared, String> {
-        let index = pkg.digest.as_ref().and_then(|_| self.store.index.read().clone());
-        let ui = match index.as_ref().and_then(|i| i.get(pkg, self.id, &decl)) {
-            Some(ui) => ui,
-            None => match &index {
-                Some(i) => {
-                    let ui = (self.validate)(pkg, decl.clone())?;
-                    i.put(pkg, self.id, &decl, &ui);
-                    ui
-                }
-                None => (self.validate)(pkg, decl)?,
-            },
-        };
-        let UiDecl { key, label, json, files, assets } = ui;
-        let store = self.store.clone();
-        let contribution =
-            UiContribution { plugin_id: pkg.id().to_owned(), point: self.id.to_owned(), key: key.clone(), decl: json };
-        let plugin = pkg.id().to_owned();
-        let mut prepared = Prepared::new(label, move || {
-            let item = store.insert(contribution);
-            if assets.is_empty() {
-                return Ok(item);
-            }
-            let assets = store.insert_assets(&plugin, assets);
-            Ok(Disposable::new(move || {
-                item.dispose();
-                assets.dispose();
-            }))
-        })
-        .key(key);
-        prepared.files = files;
-        Ok(prepared)
-    }
-}
-
-/// TOML declaration → JSON for the client.
-pub fn to_json(v: &toml::Value) -> serde_json::Value {
-    serde_json::to_value(v).unwrap_or(serde_json::Value::Null)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::manifest::Manifest;
-    use crate::registry::ExtensionRegistry;
-
-    #[test]
-    fn ui_point_projects_into_the_store() {
-        let store = UiStore::new();
-        let reg = ExtensionRegistry::new();
-        reg.register(Arc::new(UiPoint::new("badges", store.clone(), |_pkg, decl| {
-            let text = decl.get("text").and_then(|v| v.as_str()).ok_or("missing text")?.to_owned();
-            let mut d = UiDecl::new(text.clone(), text.clone(), serde_json::json!({ "text": text }));
-            d.assets.push((format!("badge/{text}"), "<svg/>".into()));
-            Ok(d)
-        })))
-        .unwrap();
-        let src = "id = \"p\"\nname = \"P\"\nversion = \"1.0.0\"\nengines.openidea = \"^1.0\"\n\
-                   [[contributes.badges]]\ntext = \"hi\"";
-        let pkg = Package::new(Manifest::parse(src).unwrap(), PathBuf::from("/x"));
-        let rev = store.revision();
-        reg.commit(reg.prepare(&pkg).unwrap()).unwrap();
-        assert!(store.revision() > rev);
-        let items = store.items("badges", Some("p"));
-        assert_eq!(items.len(), 1);
-        assert_eq!(items[0].decl["text"], "hi");
-        assert_eq!(store.asset("p", "badge/hi").as_deref(), Some("<svg/>"));
-        assert_eq!(store.assets_with_prefix("p", "badge/").len(), 1);
-        reg.dispose_plugin("p");
-        assert!(store.snapshot().is_empty());
-        assert!(store.asset("p", "badge/hi").is_none());
-    }
-}

crates/ide-extension/src/when.rs

@@ -1,136 +0,0 @@
-//! Syntax check for `when` clauses in UI declarations. The client evaluates
-//! them (`src/platform/context.ts`); validating here keeps the client's
-//! projection from failing. Grammar (same as the client):
-//!
-//! ```text
-//! expr := or ; or := and ("||" and)* ; and := unary ("&&" unary)*
-//! unary := "!" unary | "(" expr ")" | cmp ; cmp := key (("==" | "!=") value)?
-//! ```
-
-const MAX_LEN: usize = 512;
-
-#[derive(Debug, PartialEq)]
-enum Tok<'a> {
-    Id(&'a str),
-    Str,
-    Op(&'a str),
-}
-
-fn tokenize(src: &str) -> Result<Vec<Tok<'_>>, String> {
-    let mut out = Vec::new();
-    let b = src.as_bytes();
-    let mut i = 0;
-    while i < b.len() {
-        let c = b[i] as char;
-        if c.is_whitespace() {
-            i += 1;
-        } else if ["&&", "||", "==", "!="].iter().any(|op| src[i..].starts_with(op)) {
-            out.push(Tok::Op(&src[i..i + 2]));
-            i += 2;
-        } else if matches!(c, '!' | '(' | ')') {
-            out.push(Tok::Op(&src[i..i + 1]));
-            i += 1;
-        } else if c == '\'' || c == '"' {
-            let end = src[i + 1..].find(c).ok_or_else(|| format!("unterminated string in when clause: {src}"))?;
-            out.push(Tok::Str);
-            i += end + 2;
-        } else {
-            let len = src[i..]
-                .find(|ch: char| !(ch.is_alphanumeric() || matches!(ch, '_' | '.' | '-' | ':' | '/')))
-                .unwrap_or(src.len() - i);
-            if len == 0 {
-                return Err(format!("unexpected '{c}' in when clause: {src}"));
-            }
-            out.push(Tok::Id(&src[i..i + len]));
-            i += len;
-        }
-    }
-    Ok(out)
-}
-
-/// Checks a `when` clause; empty means "always".
-pub fn validate_when(src: &str) -> Result<(), String> {
-    if src.len() > MAX_LEN {
-        return Err(format!("when clause longer than {MAX_LEN} bytes"));
-    }
-    if src.trim().is_empty() {
-        return Ok(());
-    }
-    let toks = tokenize(src)?;
-    let mut p = 0;
-    parse_or(&toks, &mut p, src)?;
-    if p != toks.len() {
-        return Err(format!("unexpected token in when clause: {src}"));
-    }
-    Ok(())
-}
-
-fn parse_or(t: &[Tok], p: &mut usize, src: &str) -> Result<(), String> {
-    parse_and(t, p, src)?;
-    while t.get(*p) == Some(&Tok::Op("||")) {
-        *p += 1;
-        parse_and(t, p, src)?;
-    }
-    Ok(())
-}
-
-fn parse_and(t: &[Tok], p: &mut usize, src: &str) -> Result<(), String> {
-    parse_unary(t, p, src)?;
-    while t.get(*p) == Some(&Tok::Op("&&")) {
-        *p += 1;
-        parse_unary(t, p, src)?;
-    }
-    Ok(())
-}
-
-fn parse_unary(t: &[Tok], p: &mut usize, src: &str) -> Result<(), String> {
-    match t.get(*p) {
-        Some(Tok::Op("!")) => {
-            *p += 1;
-            parse_unary(t, p, src)
-        }
-        Some(Tok::Op("(")) => {
-            *p += 1;
-            parse_or(t, p, src)?;
-            if t.get(*p) != Some(&Tok::Op(")")) {
-                return Err(format!("missing ')' in when clause: {src}"));
-            }
-            *p += 1;
-            Ok(())
-        }
-        Some(Tok::Id(_)) => {
-            *p += 1;
-            if matches!(t.get(*p), Some(Tok::Op("==" | "!="))) {
-                *p += 1;
-                match t.get(*p) {
-                    Some(Tok::Id(_) | Tok::Str) => *p += 1,
-                    _ => return Err(format!("missing value after comparison in when clause: {src}")),
-                }
-            }
-            Ok(())
-        }
-        _ => Err(format!("expected a context key in when clause: {src}")),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::validate_when;
-
-    #[test]
-    fn accepts_the_client_grammar() {
-        for ok in [
-            "",
-            "editorFocus",
-            "editorLang == rust",
-            "editorLang != 'rust' && !readOnly",
-            "(a || b) && toolWindow.project.active",
-            "resourceScheme == file:/x",
-        ] {
-            assert!(validate_when(ok).is_ok(), "{ok}");
-        }
-        for bad in ["a &&", "(a", "a == ", "== a", "a b", "a $ b", "'x", "!()"] {
-            assert!(validate_when(bad).is_err(), "{bad}");
-        }
-    }
-}

crates/ide-fonts/Cargo.toml

@@ -7,11 +7,10 @@ license.workspace = true
 
 [dependencies]
 serde.workspace = true
-serde_json.workspace = true
 specta.workspace = true
 
 [target.'cfg(target_os = "macos")'.dependencies]
-objc2-core-foundation = { version = "0.3", default-features = false, features = ["std", "CFArray", "CFDictionary", "CFNumber", "CFString", "CFURL"] }
+objc2-core-foundation = { version = "0.3", default-features = false, features = ["std", "CFArray", "CFDictionary", "CFNumber", "CFString"] }
 objc2-core-text = { version = "0.3", default-features = false, features = ["std", "CTFontCollection", "CTFontDescriptor", "CTFontTraits"] }
 
 [target.'cfg(windows)'.dependencies]

crates/ide-fonts/src/lib.rs

@@ -1,16 +1,16 @@
 //! The font families installed on this machine, for the font pickers in
 //! Settings (editor, typography fallback, terminal, UI font).
 //!
-//! Each platform asks the native font system for installed families: CoreText on
+//! Each platform asks the font system the WebView itself resolves CSS
+//! `font-family` names against, so every listed name renders: CoreText on
 //! macOS, DirectWrite on Windows, fontconfig (`fc-list`) on Linux and the BSDs.
-//! The list is read on first use and cached until explicitly refreshed; the
-//! query can take a few hundred milliseconds, so callers run it off the UI and
-//! command threads.
+//! The list is read once per run and cached; the first read can take a few
+//! hundred milliseconds, so callers run it off the UI and command threads.
 
 use serde::{Deserialize, Serialize};
 use specta::Type;
 use std::collections::BTreeMap;
-use std::sync::{Arc, Mutex};
+use std::sync::OnceLock;
 
 /// One installed family. `monospaced` is the font system's own flag (fixed
 /// pitch; on Linux also fontconfig's dual-width CJK monospace).
@@ -21,23 +21,10 @@ pub struct FontFamily {
     pub monospaced: bool,
 }
 
-type Cache = Mutex<Option<Arc<[FontFamily]>>>;
-
-/// The installed families, sorted case-insensitively, read on first use and
-/// re-queried when `refresh` is true.
-pub fn families(refresh: bool) -> Arc<[FontFamily]> {
-    static CACHE: Cache = Mutex::new(None);
-    cached(&CACHE, refresh, imp::list)
-}
-
-fn cached(cache: &Cache, refresh: bool, list: impl FnOnce(bool) -> Vec<(String, bool)>) -> Arc<[FontFamily]> {
-    let mut guard = cache.lock().unwrap_or_else(|e| e.into_inner());
-    if !refresh && let Some(families) = guard.as_ref() {
-        return Arc::clone(families);
-    }
-    let families: Arc<[FontFamily]> = normalize(list(refresh)).into();
-    *guard = Some(Arc::clone(&families));
-    families
+/// The installed families, sorted case-insensitively, read on first use.
+pub fn families() -> &'static [FontFamily] {
+    static CACHE: OnceLock<Vec<FontFamily>> = OnceLock::new();
+    CACHE.get_or_init(|| normalize(imp::list()))
 }
 
 /// Merges the per-face records a font system reports into one entry per
@@ -83,166 +70,16 @@ pub fn parse_fc_list(output: &str) -> Vec<(String, bool)> {
         .collect()
 }
 
-/// Binary font bundle: little-endian u32 JSON-header length, a face metadata
-/// array, then raw font bytes. Paths never cross IPC; only CoreText-enumerated
-/// files under user font directories can be read, selected by family name.
-/// Includes only the nearest regular/bold faces and their optional italics.
-pub fn user_font_data(family: &str) -> std::io::Result<Vec<u8>> {
-    #[cfg(target_os = "macos")]
-    {
-        let entries = imp::user_faces();
-        bundle_family(family, &entries)
-    }
-    #[cfg(not(target_os = "macos"))]
-    {
-        let _ = family;
-        Err(std::io::Error::new(std::io::ErrorKind::Unsupported, "User font loading is macOS only"))
-    }
-}
-
-#[cfg(any(target_os = "macos", test))]
-#[derive(Debug)]
-struct UserFace {
-    family: String,
-    path: std::path::PathBuf,
-    weight: u16,
-    italic: bool,
-}
-
-#[cfg(any(target_os = "macos", test))]
-fn user_font_path(path: &std::path::Path, roots: &[std::path::PathBuf]) -> Option<std::path::PathBuf> {
-    let path = path.canonicalize().ok()?;
-    roots.iter().any(|root| path.starts_with(root)).then_some(path)
-}
-
-#[cfg(any(target_os = "macos", test))]
-fn family_faces<'a>(family: &str, entries: &'a [UserFace]) -> Vec<&'a UserFace> {
-    let mut selected: Vec<&UserFace> = Vec::new();
-    for italic in [false, true] {
-        for weight in [400u16, 700] {
-            let closest = entries
-                .iter()
-                .filter(|e| e.family.eq_ignore_ascii_case(family.trim()) && e.italic == italic)
-                .min_by_key(|e| (e.weight.abs_diff(weight), e.weight, &e.path));
-            if let Some(face) = closest
-                && !selected.iter().any(|f| std::ptr::eq(*f, face))
-            {
-                selected.push(face);
-            }
-        }
-    }
-    selected
-}
-
-#[cfg(any(target_os = "macos", test))]
-fn bundle_family(family: &str, entries: &[UserFace]) -> std::io::Result<Vec<u8>> {
-    #[derive(Serialize)]
-    struct Face {
-        weight: u16,
-        style: &'static str,
-        offset: usize,
-        length: usize,
-    }
-    let mut faces = Vec::new();
-    let mut data = Vec::new();
-    let mut files = BTreeMap::new();
-    // Bound large CJK families to regular/bold and their nearest italic faces.
-    for entry in family_faces(family, entries) {
-        // Reject a file replaced by a symlink after enumeration.
-        if entry.path.canonicalize()? != entry.path {
-            return Err(std::io::Error::new(std::io::ErrorKind::PermissionDenied, "Font file changed"));
-        }
-        let (offset, length) = if let Some(range) = files.get(&entry.path) {
-            *range
-        } else {
-            let bytes = std::fs::read(&entry.path)?;
-            let range = (data.len(), bytes.len());
-            data.extend(bytes);
-            files.insert(entry.path.clone(), range);
-            range
-        };
-        faces.push(Face {
-            weight: entry.weight,
-            style: if entry.italic { "italic" } else { "normal" },
-            offset,
-            length,
-        });
-    }
-    if faces.is_empty() {
-        return Err(std::io::Error::new(std::io::ErrorKind::NotFound, "No installed user font family"));
-    }
-    let header = serde_json::to_vec(&faces)?;
-    let mut out = (header.len() as u32).to_le_bytes().to_vec();
-    out.extend(header);
-    out.extend(data);
-    Ok(out)
-}
-
 #[cfg(target_os = "macos")]
 mod imp {
-    use objc2_core_foundation::{CFArray, CFDictionary, CFNumber, CFString, CFType, CFURL};
+    use objc2_core_foundation::{CFArray, CFDictionary, CFNumber, CFString, CFType};
     use objc2_core_text::{
         CTFontCollection, CTFontDescriptor, CTFontSymbolicTraits, kCTFontFamilyNameAttribute, kCTFontSymbolicTrait,
-        kCTFontTraitsAttribute, kCTFontURLAttribute, kCTFontWeightTrait,
+        kCTFontTraitsAttribute,
     };
 
-    pub(crate) fn user_faces() -> Vec<super::UserFace> {
-        let mut roots = vec![std::path::PathBuf::from("/Library/Fonts")];
-        if let Some(home) = std::env::var_os("HOME") {
-            roots.push(std::path::PathBuf::from(home).join("Library/Fonts"));
-        }
-        let roots: Vec<_> = roots.into_iter().filter_map(|r| r.canonicalize().ok()).collect();
-        // SAFETY: CoreText descriptors carry documented CFString, CFURL and trait dictionary values.
-        unsafe {
-            let collection = CTFontCollection::from_available_fonts(None);
-            let Some(descriptors) = collection.matching_font_descriptors() else { return Vec::new() };
-            let mut seen = std::collections::BTreeSet::new();
-            descriptors
-                .cast_unchecked::<CTFontDescriptor>()
-                .iter()
-                .filter_map(|d| {
-                    let family = d.attribute(kCTFontFamilyNameAttribute)?.downcast::<CFString>().ok()?.to_string();
-                    let path = d.attribute(kCTFontURLAttribute)?.downcast::<CFURL>().ok()?.to_file_path()?;
-                    let path = super::user_font_path(&path, &roots)?;
-                    let traits = d.attribute(kCTFontTraitsAttribute)?.downcast::<CFDictionary>().ok()?;
-                    let traits = traits.cast_unchecked::<CFString, CFType>();
-                    let symbolic = traits
-                        .get(kCTFontSymbolicTrait)
-                        .and_then(|n| n.downcast::<CFNumber>().ok())
-                        .and_then(|n| n.as_i64())
-                        .unwrap_or(0) as u32;
-                    let weight = traits
-                        .get(kCTFontWeightTrait)
-                        .and_then(|n| n.downcast::<CFNumber>().ok())
-                        .and_then(|n| n.as_f64())
-                        .unwrap_or(0.0);
-                    // CoreText's normalized weight values corresponding to CSS's nine standard weights.
-                    let weight = [
-                        (-0.8, 100),
-                        (-0.6, 200),
-                        (-0.4, 300),
-                        (0.0, 400),
-                        (0.23, 500),
-                        (0.3, 600),
-                        (0.4, 700),
-                        (0.56, 800),
-                        (0.62, 900),
-                    ]
-                    .into_iter()
-                    .min_by(|(a, _), (b, _)| (weight - a).abs().total_cmp(&(weight - b).abs()))?
-                    .1;
-                    let italic = symbolic & CTFontSymbolicTraits::TraitItalic.0 != 0;
-                    if !seen.insert((family.clone(), path.clone(), weight, italic)) {
-                        return None;
-                    }
-                    Some(super::UserFace { family, path, weight, italic })
-                })
-                .collect()
-        }
-    }
-
     /// Every face CoreText makes available to this process, as (family, fixed pitch).
-    pub(crate) fn list(_refresh: bool) -> Vec<(String, bool)> {
+    pub(crate) fn list() -> Vec<(String, bool)> {
         // SAFETY: CoreText's documented types: the matching descriptors array
         // holds CTFontDescriptors and the traits dictionary maps CFString keys.
         unsafe {
@@ -279,15 +116,15 @@ mod imp {
 
     /// The system font collection's families, named in English when the
     /// family has an English name (what CSS matches), else its first name.
-    pub(crate) fn list(refresh: bool) -> Vec<(String, bool)> {
+    pub(crate) fn list() -> Vec<(String, bool)> {
         // SAFETY: plain DirectWrite COM calls on interfaces we own.
-        unsafe { read(refresh) }.unwrap_or_default()
+        unsafe { read() }.unwrap_or_default()
     }
 
-    unsafe fn read(refresh: bool) -> windows::core::Result<Vec<(String, bool)>> {
+    unsafe fn read() -> windows::core::Result<Vec<(String, bool)>> {
         let factory: IDWriteFactory = unsafe { DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED) }?;
         let mut collection = None;
-        unsafe { factory.GetSystemFontCollection(&mut collection, refresh) }?;
+        unsafe { factory.GetSystemFontCollection(&mut collection, false) }?;
         let Some(collection) = collection else {
             return Ok(Vec::new());
         };
@@ -334,7 +171,7 @@ mod imp {
 
     /// fontconfig's view, which WebKitGTK resolves names with. Empty when
     /// `fc-list` isn't installed.
-    pub(crate) fn list(_refresh: bool) -> Vec<(String, bool)> {
+    pub(crate) fn list() -> Vec<(String, bool)> {
         Command::new("fc-list")
             .args(["-f", "%{family[0]}\t%{spacing}\n"])
             .stdin(Stdio::null())
@@ -349,7 +186,7 @@ mod imp {
 
 #[cfg(not(any(unix, windows)))]
 mod imp {
-    pub(crate) fn list(_refresh: bool) -> Vec<(String, bool)> {
+    pub(crate) fn list() -> Vec<(String, bool)> {
         Vec::new()
     }
 }
@@ -357,93 +194,6 @@ mod imp {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::sync::atomic::{AtomicUsize, Ordering};
-
-    #[test]
-    fn selects_only_regular_bold_and_matching_italics_from_dense_families() {
-        let entries: Vec<_> = [false, true]
-            .into_iter()
-            .flat_map(|italic| {
-                (100..=900).step_by(100).map(move |weight| UserFace {
-                    family: "CJK".into(),
-                    path: format!("{weight}-{italic}.ttf").into(),
-                    weight,
-                    italic,
-                })
-            })
-            .collect();
-        let selected = family_faces(" cjk ", &entries);
-        assert_eq!(
-            selected.iter().map(|f| (f.weight, f.italic)).collect::<Vec<_>>(),
-            [(400, false), (700, false), (400, true), (700, true),]
-        );
-        assert!(family_faces("unknown", &entries).is_empty());
-    }
-
-    #[test]
-    fn selects_nearest_available_weights_once_with_optional_italics() {
-        let entries: Vec<_> = [(300, false), (500, false), (800, false), (500, true)]
-            .into_iter()
-            .map(|(weight, italic)| UserFace {
-                family: "Sparse".into(),
-                path: format!("{weight}-{italic}.ttf").into(),
-                weight,
-                italic,
-            })
-            .collect();
-        let selected = family_faces("Sparse", &entries);
-        assert_eq!(
-            selected.iter().map(|f| (f.weight, f.italic)).collect::<Vec<_>>(),
-            [(300, false), (800, false), (500, true),]
-        );
-        assert_eq!(family_faces("Sparse", &entries[..1]).len(), 1);
-    }
-
-    #[test]
-    fn bundle_only_reads_enumerated_family_faces() {
-        let root = std::env::current_dir().unwrap().join(format!("../../.font-bundle-test-{}", std::process::id()));
-        std::fs::create_dir_all(&root).unwrap();
-        let root = root.canonicalize().unwrap();
-        let regular = root.join("regular.ttf");
-        let bold = root.join("bold.ttf");
-        std::fs::write(&regular, [1, 2, 3]).unwrap();
-        std::fs::write(&bold, [4, 5]).unwrap();
-        let entries = [
-            UserFace { family: "Test Nerd Font".into(), path: regular.clone(), weight: 400, italic: false },
-            UserFace { family: "Test Nerd Font".into(), path: bold, weight: 700, italic: false },
-            // A non-selected face is never opened, even if its file has disappeared.
-            UserFace { family: "Test Nerd Font".into(), path: root.join("thin.ttf"), weight: 100, italic: false },
-        ];
-        let result = bundle_family("test nerd font", &entries).unwrap();
-        let len = u32::from_le_bytes(result[..4].try_into().unwrap()) as usize;
-        let faces: serde_json::Value = serde_json::from_slice(&result[4..4 + len]).unwrap();
-        assert_eq!(faces[0]["weight"], 400);
-        assert_eq!(faces[1]["weight"], 700);
-        assert_eq!(faces.as_array().unwrap().len(), 2);
-        assert_eq!(&result[4 + len..], &[1, 2, 3, 4, 5]);
-        // Existing files are not inputs: neither paths nor unenumerated families grant access.
-        assert!(bundle_family(regular.to_str().unwrap(), &entries).is_err());
-        assert!(bundle_family("Unenumerated", &entries).is_err());
-        assert!(user_font_path(&regular, &[]).is_none());
-        assert!(user_font_path(&regular, std::slice::from_ref(&root)).is_some());
-        // Multiple selected descriptors in a collection still transfer the file only once.
-        let shared = [
-            UserFace { family: "Collection".into(), path: regular.clone(), weight: 400, italic: false },
-            UserFace { family: "Collection".into(), path: regular, weight: 700, italic: false },
-        ];
-        let result = bundle_family("Collection", &shared).unwrap();
-        let len = u32::from_le_bytes(result[..4].try_into().unwrap()) as usize;
-        let faces: serde_json::Value = serde_json::from_slice(&result[4..4 + len]).unwrap();
-        assert_eq!(faces[0]["offset"], faces[1]["offset"]);
-        assert_eq!(&result[4 + len..], &[1, 2, 3]);
-        #[cfg(unix)]
-        {
-            let link = root.join("outside.ttf");
-            std::os::unix::fs::symlink(std::env::current_exe().unwrap(), &link).unwrap();
-            assert!(user_font_path(&link, std::slice::from_ref(&root)).is_none());
-        }
-        std::fs::remove_dir_all(root).unwrap();
-    }
 
     fn fam(name: &str, monospaced: bool) -> FontFamily {
         FontFamily { name: name.into(), monospaced }
@@ -493,38 +243,12 @@ mod tests {
         );
     }
 
-    #[test]
-    fn caches_until_refresh_requested() {
-        let cache = Mutex::new(None);
-        let calls = AtomicUsize::new(0);
-        let lister = |refresh: bool| {
-            let n = calls.fetch_add(1, Ordering::SeqCst);
-            vec![(format!("Font {n} (refresh={refresh})"), n.is_multiple_of(2))]
-        };
-
-        let first = cached(&cache, false, lister);
-        assert_eq!(&*first, &[fam("Font 0 (refresh=false)", true)]);
-        assert_eq!(calls.load(Ordering::SeqCst), 1);
-
-        let second = cached(&cache, false, lister);
-        assert!(Arc::ptr_eq(&first, &second));
-        assert_eq!(calls.load(Ordering::SeqCst), 1);
-
-        let refreshed = cached(&cache, true, lister);
-        assert_eq!(&*refreshed, &[fam("Font 1 (refresh=true)", false)]);
-        assert_eq!(calls.load(Ordering::SeqCst), 2);
-
-        let after_refresh = cached(&cache, false, lister);
-        assert!(Arc::ptr_eq(&refreshed, &after_refresh));
-        assert_eq!(calls.load(Ordering::SeqCst), 2);
-    }
-
     /// The real font system: every desktop OS ships some fonts, at least one
     /// of them monospaced, and the list comes back sorted without duplicates.
     #[cfg(any(target_os = "macos", windows))]
     #[test]
     fn lists_installed_families() {
-        let list = families(false);
+        let list = families();
         assert!(list.len() > 20, "only {} families", list.len());
         assert!(list.iter().any(|f| f.monospaced));
         assert!(list.iter().any(|f| !f.monospaced));
@@ -536,6 +260,5 @@ mod tests {
             assert!(menlo.monospaced);
             assert!(list.iter().any(|f| f.name == "Helvetica Neue" && !f.monospaced));
         }
-        assert_eq!(&*families(true), &*list);
     }
 }